Fixed a bug where the selected coin would appear in the currencies li…

…st (e.g. BTC/BTC).
hwki · Feb 27, 2022 · b375b94 · b375b94
1 parent 99e5efb
commit b375b94
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/bitcoin/build.gradle b/bitcoin/build.gradle
@@ -12,7 +12,7 @@ android {
         applicationId "com.brentpanther.bitcoinwidget"
         minSdk 23
         targetSdk 31
-        versionCode 296
+        versionCode 297
         versionName "8.2.2"
 
         javaCompileOptions {

diff --git a/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/exchange/ExchangeData.kt b/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/exchange/ExchangeData.kt
@@ -36,6 +36,7 @@ open class ExchangeData(val coinEntry: CoinEntry, json: InputStream) {
                 if (i2 >= 0) return@Comparator 1
                 o1.compareTo(o2)
             })
+            currencyNames.remove(coinEntry.symbol)
             return currencyNames.toTypedArray()
         }
 

diff --git a/bitcoin/src/test/java/com/brentpanther/bitcoinwidget/ExchangeTest.kt b/bitcoin/src/test/java/com/brentpanther/bitcoinwidget/ExchangeTest.kt
@@ -29,6 +29,7 @@ class ExchangeTest {
                         var currencyName = data.getExchangeCurrencyName(exchange, currency)
                         if (coinName == null) coinName = coin.getSymbol()
                         if (currencyName == null) currencyName = currency
+                        if (coinName == currencyName) continue
                         valueOf(exchange).getValue(coinName, currencyName)!!.toDouble()
                     } catch (e: Exception) {
                         System.err.println("Failure: $coin $exchange $currency: ${e.message}")

diff --git a/...metadata/android/en-US/changelogs/296.txt → ...metadata/android/en-US/changelogs/297.txt b/...metadata/android/en-US/changelogs/296.txt → ...metadata/android/en-US/changelogs/297.txt