Fixed Coindesk API.

hwki · hwki · commit d6f4139c73a8 · 2025-02-18T10:35:00.000-06:00
Migration from Fantom to Sonic
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/bitcoin/build.gradle.kts b/bitcoin/build.gradle.kts
@@ -15,8 +15,8 @@ android {
         applicationId = "com.brentpanther.bitcoinwidget"
         minSdk = 23
         targetSdk = 35
-        versionCode = 337
-        versionName = "8.6.2"
+        versionCode = 338
+        versionName = "8.6.3"
     }
 
     buildFeatures {
diff --git a/bitcoin/src/fdroid/java/com/brentpanther/bitcoinwidget/ui/home/AdditionalGlobalSettings.kt b/bitcoin/src/fdroid/java/com/brentpanther/bitcoinwidget/ui/home/AdditionalGlobalSettings.kt
@@ -9,7 +9,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import com.brentpanther.bitcoinwidget.R
 import com.brentpanther.bitcoinwidget.ui.settings.SettingsButton
@@ -31,8 +30,8 @@ fun AdditionalSettings() {
         },
         onClick = {
             try {
-                ContextCompat.startActivity(context, Intent(Intent.ACTION_VIEW, address), null)
-            } catch (e: ActivityNotFoundException) {
+                context.startActivity(Intent(Intent.ACTION_VIEW, address))
+            } catch (_: ActivityNotFoundException) {
                 Toast.makeText(context, donateError, Toast.LENGTH_SHORT).show()
             }
         }
diff --git a/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/Coin.kt b/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/Coin.kt
@@ -65,7 +65,6 @@ enum class Coin(val coinName: String, val coinGeckoId: String, private vararg va
     FIL("Filecoin", "filecoin", IconTheme(SOLID, ic_fil)),
     FIRO("Firo", "zcoin", IconTheme(SOLID, ic_firo, ic_firo_dark)),
     FLR("Flare", "flare-networks", IconTheme(SOLID, ic_flr)),
-    FTM("Fantom", "fantom", IconTheme(SOLID, ic_ftm)),
     FTT("FTX Token", "ftx-token", IconTheme(SOLID, ic_ftt)),
     GALA("Gala", "gala", IconTheme(SOLID, ic_gala, ic_gala_white)),
     GNO("Gnosis", "gnosis", IconTheme(SOLID, ic_gno_color)),
@@ -131,6 +130,7 @@ enum class Coin(val coinName: String, val coinGeckoId: String, private vararg va
     SNX("Synthetix Network Token", "havven", IconTheme(SOLID, ic_snx)),
     SOL("Solana", "solana", IconTheme(SOLID, ic_sol)),
     SOLO("Sologenic", "solo-coin", IconTheme(SOLID, ic_solo)),
+    S("Sonic", "sonic-3", IconTheme(SOLID, ic_s)),
     SPACE("MicrovisionChain", "microvisionchain", IconTheme(SOLID, ic_space)),
     STG("Stargate Finance", "stargate-finance", IconTheme(SOLID, ic_stg)),
     STORJ("Storj", "storj", IconTheme(SOLID, ic_storj)),
diff --git a/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/db/DataMigration.kt b/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/db/DataMigration.kt
@@ -16,9 +16,14 @@ object DataMigration {
         migrateBitcludeToEgera(db)
         migrateCoinbaseProToCoinbase(db)
         migrateOkCoinToOkx(db)
+        migrateFtmToSonic(db)
         fixRemovedExchanges(db)
     }
 
+    private fun migrateFtmToSonic(db: SupportSQLiteDatabase) {
+        db.execSQL("UPDATE Widget SET coin = 'S' WHERE coin = 'FTM'")
+    }
+
     private fun migrateKaspaToKas(db: SupportSQLiteDatabase) {
         db.execSQL("UPDATE Widget SET coin = 'KAS' WHERE coin = 'KASPA'")
     }
diff --git a/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/exchange/Exchange.kt b/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/exchange/Exchange.kt
@@ -211,8 +211,8 @@ enum class Exchange(val exchangeName: String, shortName: String? = null) {
     COINDESK("Coindesk") {
 
         override fun getValue(coin: String, currency: String): String? {
-            val url = "https://api.coindesk.com/v1/bpi/currentprice/$currency.json"
-            return getJsonObject(url)["bpi"]?.jsonObject?.get(currency)?.jsonObject?.get("rate_float").asString
+            val url = "https://min-api.cryptocompare.com/data/price?fsym=$coin&tsyms=$currency"
+            return getJsonObject(url)[currency]?.asString
         }
     },
     COINGECKO("CoinGecko") {
diff --git a/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/ui/BannersViewModel.kt b/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/ui/BannersViewModel.kt
@@ -6,7 +6,6 @@ import android.os.Build
 import android.os.PowerManager
 import androidx.compose.runtime.mutableStateListOf
 import androidx.core.content.edit
-import androidx.core.net.ConnectivityManagerCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.brentpanther.bitcoinwidget.WidgetApplication
@@ -28,7 +27,7 @@ class BannersViewModel : ViewModel() {
             val connectivityManager = application.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
             val restrictBackgroundStatus = connectivityManager.restrictBackgroundStatus
             if (restrictBackgroundStatus == ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED &&
-                ConnectivityManagerCompat.isActiveNetworkMetered(connectivityManager) &&
+                connectivityManager.isActiveNetworkMetered &&
                 !isDismissed(application, "data")) {
                 visibleBanners.add("data")
             }
diff --git a/bitcoin/src/main/res/drawable-nodpi/ic_ftm.png b/bitcoin/src/main/res/drawable-nodpi/ic_ftm.png
diff --git a/bitcoin/src/main/res/drawable-nodpi/ic_s.png b/bitcoin/src/main/res/drawable-nodpi/ic_s.png
diff --git a/bitcoin/src/main/res/raw/cryptowidgetcoins_v2.json b/bitcoin/src/main/res/raw/cryptowidgetcoins_v2.json
diff --git a/bitcoin/src/main/res/values/strings.xml b/bitcoin/src/main/res/values/strings.xml
@@ -98,7 +98,7 @@
         <item>ISO</item>
         <item>NONE</item>
     </string-array>
-    <string name="json_last_modified" translatable="false">Tue, 07 Jan 2025 02:28:34 GMT</string>
+    <string name="json_last_modified" translatable="false">Tue, 18 Feb 2025 16:28:11 GMT</string>
     <string name="json_url" translatable="false">https://www.brentpanther.com/cryptowidgetcoins_v2.json</string>
 
     <string name="error_restricted_battery_saver">Unable to refresh, Battery Saver is on</string>
diff --git a/bitcoin/src/playstore/java/com/brentpanther/bitcoinwidget/ui/home/AdditionalGlobalSettings.kt b/bitcoin/src/playstore/java/com/brentpanther/bitcoinwidget/ui/home/AdditionalGlobalSettings.kt
@@ -8,7 +8,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import com.brentpanther.bitcoinwidget.R
 import com.brentpanther.bitcoinwidget.ui.settings.SettingsButton
@@ -26,7 +25,7 @@ fun AdditionalSettings() {
         onClick = {
             try {
                 val uri = "http://play.google.com/store/apps/details?id=${context.packageName}".toUri()
-                ContextCompat.startActivity(context, Intent(Intent.ACTION_VIEW, uri), null)
+                context.startActivity(Intent(Intent.ACTION_VIEW, uri))
             } catch (_: ActivityNotFoundException) {
             }
         }
diff --git a/bitcoin/src/test/java/com/brentpanther/bitcoinwidget/GenerateSupportedCoinsJson.kt b/bitcoin/src/test/java/com/brentpanther/bitcoinwidget/GenerateSupportedCoinsJson.kt
@@ -7,7 +7,6 @@ import com.brentpanther.bitcoinwidget.exchange.ExchangeData.JsonExchangeObject
 import com.brentpanther.bitcoinwidget.exchange.ExchangeHelper.asString
 import com.jayway.jsonpath.JsonPath
 import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.decodeFromStream
@@ -409,8 +408,25 @@ class GenerateSupportedCoinsJson {
     }
 
     private fun coindesk(): List<String> {
-        val currencies = parse("https://api.coindesk.com/v1/bpi/supported-currencies.json", "$[*].currency")
-        return currencies.map { "BTC_$it" }
+        val coinLists = Coin.entries.map { it.name }.chunked(50)
+        val coins = mutableListOf<String>()
+        val currencies = mutableListOf<String>()
+        coinLists.forEach { coinList ->
+            val url = "https://min-api.cryptocompare.com/data/pricemulti?fsyms=${coinList.joinToString(",")}&tsyms=USD"
+            val response = parseKeys(url, "$")
+            coins.addAll(response)
+        }
+        val currencyLists = Currency.getAvailableCurrencies().map { it.currencyCode }.sorted().chunked(25)
+        currencyLists.forEach { currencyList ->
+            val url = "https://min-api.cryptocompare.com/data/pricemulti?fsyms=BTC&tsyms=${currencyList.joinToString(",")}"
+            val response = parseKeys(url, "$.BTC")
+            currencies.addAll(response)
+        }
+        return coins.flatMap { coin ->
+            currencies.map { currency ->
+                "${coin}_$currency"
+            }
+        }
     }
 
     private fun coingecko(): List<String> {
diff --git a/fastlane/metadata/android/en-US/changelogs/338.txt b/fastlane/metadata/android/en-US/changelogs/338.txt
@@ -0,0 +1,2 @@
+Fixed Coindesk.
+Migrated Fantom (FTM) to Sonic (S).
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,19 +1,19 @@
 [versions]
-agp = "8.7.3"
-activityKtx = "1.9.3"
+agp = "8.8.1"
+activityKtx = "1.10.0"
 coil = "2.7.0"
-compose = "2024.12.01"
+compose = "2025.02.00"
 coreKtx = "1.15.0"
 jsonPath = "2.9.0"
 junit = "4.13.2"
-kotlin = "2.0.21"
-ksp = "2.0.21-1.0.25"
+kotlin = "2.1.10"
+ksp = "2.1.10-1.0.30"
 lifecycle = "2.8.7"
-navigation = "2.8.5"
+navigation = "2.8.7"
 okhttp = "4.12.0"
 preferences = "1.2.1"
 room = "2.6.1"
-serialization = "1.7.3"
+serialization = "1.8.0"
 work = "2.10.0"
 
 [libraries]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,14 @@ object DataMigration {`
`16`	`16`	`migrateBitcludeToEgera(db)`
`17`	`17`	`migrateCoinbaseProToCoinbase(db)`
`18`	`18`	`migrateOkCoinToOkx(db)`
	`19`	`+ migrateFtmToSonic(db)`
`19`	`20`	`fixRemovedExchanges(db)`
`20`	`21`	`}`
`21`	`22`
	`23`	`+ private fun migrateFtmToSonic(db: SupportSQLiteDatabase) {`
	`24`	`+ db.execSQL("UPDATE Widget SET coin = 'S' WHERE coin = 'FTM'")`
	`25`	`+ }`
	`26`	`+`
`22`	`27`	`private fun migrateKaspaToKas(db: SupportSQLiteDatabase) {`
`23`	`28`	`db.execSQL("UPDATE Widget SET coin = 'KAS' WHERE coin = 'KASPA'")`
`24`	`29`	`}`