Added Terra Luna Classic coin.

Fixed Terra Luna 2.0. Refreshed coin lists.
hwki · Oct 10, 2022 · eb86d24 · eb86d24
1 parent e3c5a7b
commit eb86d24
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 7 deletions.
diff --git a/bitcoin/build.gradle b/bitcoin/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.brentpanther.bitcoinwidget"
         minSdk 23
         targetSdk 33
-        versionCode 303
-        versionName "8.2.6"
+        versionCode 304
+        versionName "8.2.7"
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -72,7 +72,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.fragment:fragment-ktx:1.5.2'
+    implementation 'androidx.fragment:fragment-ktx:1.5.3'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.5.2'
     implementation 'androidx.navigation:navigation-ui-ktx:2.5.2'

diff --git a/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/Coin.kt b/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/Coin.kt
@@ -88,6 +88,7 @@ enum class Coin(val coinName: String, vararg val themes: IconTheme) : Parcelable
     },
     LTO("LTO Network", IconTheme(SOLID, ic_lto)),
     LUNA("Terra", IconTheme(SOLID, ic_luna)),
+    LUNC("Terra Luna Classic", IconTheme(SOLID, ic_lunc)),
     MANA("Decentraland", IconTheme(SOLID, ic_mana)),
     MATIC("Polygon", IconTheme(SOLID, ic_matic)),
     MCO("MCO", IconTheme(SOLID, ic_mco, ic_mco_white)),

diff --git a/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/exchange/Exchange.kt b/bitcoin/src/main/java/com/brentpanther/bitcoinwidget/exchange/Exchange.kt
@@ -317,7 +317,8 @@ enum class Exchange(val exchangeName: String, shortName: String? = null) {
                 "LSK" to "lisk",
                 "LTC" to "litecoin",
                 "LTO" to "lto-network",
-                "LUNA" to "terra-luna",
+                "LUNA" to "terra-luna-2",
+                "LUNC" to "terra-luna",
                 "MANA" to "decentraland",
                 "MATIC" to "matic-network",
                 "MCO" to "monaco",

diff --git a/bitcoin/src/main/res/drawable-nodpi/ic_luna.png b/bitcoin/src/main/res/drawable-nodpi/ic_luna.png
diff --git a/bitcoin/src/main/res/drawable-nodpi/ic_lunc.png b/bitcoin/src/main/res/drawable-nodpi/ic_lunc.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/raw/othercoins.json b/bitcoin/src/main/res/raw/othercoins.json
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,12 @@ import com.jayway.jsonpath.JsonPath
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.junit.Test
+import java.security.SecureRandom
+import java.security.cert.X509Certificate
 import java.util.*
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManager
+import javax.net.ssl.X509TrustManager
 
 class GenerateSupportedCoinsJson {
 
@@ -211,7 +216,24 @@ class GenerateSupportedCoinsJson {
 
     private fun parseKeys(url: String, path: String) = (JsonPath.read(get(url), path) as Map<String, *>).keys.map { it }
     private fun parse(url: String, path: String) = JsonPath.read(get(url), path) as List<String>
-    private fun get(value: String): String = OkHttpClient().newCall(Request.Builder().url(value).build()).execute().body!!.string()
+    private fun get(value: String): String = OkHttpClient.Builder().ignoreAllSSLErrors().build().newCall(Request.Builder().url(value).build()).execute().body!!.string()
+
+    fun OkHttpClient.Builder.ignoreAllSSLErrors(): OkHttpClient.Builder {
+        val naiveTrustManager = object : X509TrustManager {
+            override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
+            override fun checkClientTrusted(certs: Array<X509Certificate>, authType: String) = Unit
+            override fun checkServerTrusted(certs: Array<X509Certificate>, authType: String) = Unit
+        }
+
+        val insecureSocketFactory = SSLContext.getInstance("TLSv1.2").apply {
+            val trustAllCerts = arrayOf<TrustManager>(naiveTrustManager)
+            init(null, trustAllCerts, SecureRandom())
+        }.socketFactory
+
+        sslSocketFactory(insecureSocketFactory, naiveTrustManager)
+        hostnameVerifier { _, _ -> true }
+        return this
+    }
 
     //endregion
 

diff --git a/fastlane/metadata/android/en-US/changelogs/304.txt b/fastlane/metadata/android/en-US/changelogs/304.txt
@@ -0,0 +1,3 @@
+Added Terra Luna Classic coin.
+Fixed Terra Luna 2.0.
+Refreshed coin lists.