Fixed a bug preventing data from being loaded for certain exchanges a…

…nd coins.
hwki · Aug 1, 2021 · 23d51bc · 23d51bc
1 parent 365eac1
commit 23d51bc
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 11 deletions.
diff --git a/SimpleBitcoinWidget.iml b/SimpleBitcoinWidget.iml
@@ -3,12 +3,11 @@
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
         <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />

diff --git a/bitcoin/build.gradle b/bitcoin/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.brentpanther.bitcoinwidget"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 264
-        versionName "7.4.5"
+        versionCode 265
+        versionName "7.4.6"
     }
 
     buildTypes {

diff --git a/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/Exchange.kt b/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/Exchange.kt
@@ -743,7 +743,7 @@ internal enum class Exchange(val exchangeName: String, shortName: String? = null
     ZB("ZB") {
 
         override fun getValue(coin: String, currency: String): String {
-            val url = "http://api.zb.land/data/v1/ticker?market=${coin.lowercase(Locale.ROOT)}_${
+            val url = "https://api.zb.land/data/v1/ticker?market=${coin.lowercase(Locale.ROOT)}_${
                 currency.lowercase(Locale.ROOT)
             }"
             return getJsonObject(url).getAsJsonObject("ticker").get("last").asString

diff --git a/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/ExchangeData.kt b/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/ExchangeData.kt
@@ -97,7 +97,7 @@ open class ExchangeData(val coin: CoinEntry, json: InputStream) {
     }
 
     open fun getExchangeCoinName(exchange: String): String? {
-        return obj?.getExchangeCoinName(exchange, coin.name)
+        return obj?.getExchangeCoinName(exchange, coin.coin.name)
     }
 
     open fun getExchangeCurrencyName(exchange: String, currency: String): String? {

diff --git a/bitcoin/src/main/res/raw/cryptowidgetcoins.json b/bitcoin/src/main/res/raw/cryptowidgetcoins.json
diff --git a/bitcoin/src/main/res/values/strings.xml b/bitcoin/src/main/res/values/strings.xml
@@ -96,7 +96,7 @@
     </string-array>
     <string name="value_unknown" translatable="false">\u0020\u0020\u0020\?\u0020\u0020\u0020</string>
     <string name="value_exchange_removed" translatable="false">\u0020!\u0020</string>
-    <string name="json_last_modified" translatable="false">Tue, 06 Jul 2021 19:00:00 GMT</string>
+    <string name="json_last_modified" translatable="false">Sun, 01 Aug 2021 15:41:00 GMT</string>
     <string name="json_url" translatable="false">https://www.brentpanther.com/cryptowidgetcoins.json</string>
 
     <string name="dialog_update_title">Updating</string>

diff --git a/bitcoin/src/main/res/xml/network_security_config.xml b/bitcoin/src/main/res/xml/network_security_config.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
     <base-config cleartextTrafficPermitted="false"/>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">zb.live</domain>
-    </domain-config>
 </network-security-config>
diff --git a/fastlane/metadata/android/en-US/changelogs/265.txt b/fastlane/metadata/android/en-US/changelogs/265.txt
@@ -0,0 +1 @@
+Fixed a bug preventing data from being loaded for certain exchanges and coins.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed a bug preventing data from being loaded for certain exchanges and coins.