Fix check version

gemwalletcom · Oct 16, 2024 · 06c69d1 · 06c69d1
1 parent 58ab787
commit 06c69d1
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -37,7 +37,10 @@ extract-universal-apk:
 	./scripts/extract_aab_apk.sh
 
 release:
-	./gradlew clean buildCargoNdkGoogleRelease assembleGoogleRelease :app:bundleGoogleRelease
+	./gradlew clean :app:bundleGoogleRelease
+	./gradlew clean assembleUniversalRelease
+	./gradlew clean assembleHuaweiRelease
+	./gradlew clean assembleSolanaRelease
 
 localize:
 	@sh scripts/localize.sh android

diff --git a/app/src/main/java/com/gemwallet/android/di/ClientsModule.kt b/app/src/main/java/com/gemwallet/android/di/ClientsModule.kt
@@ -26,6 +26,7 @@ import com.wallet.core.primitives.Chain
 import com.wallet.core.primitives.Device
 import com.wallet.core.primitives.NameRecord
 import com.wallet.core.primitives.Node
+import com.wallet.core.primitives.Release
 import com.wallet.core.primitives.Subscription
 import com.wallet.core.primitives.SwapQuote
 import dagger.Module
@@ -103,6 +104,7 @@ object ClientsModule {
             .registerTypeAdapter(Transactions::class.java, GemApiClient.TransactionsSerializer())
             .registerTypeAdapter(NameRecord::class.java, GemApiClient.NameRecordDeserialize())
             .registerTypeAdapter(SwapQuote::class.java, GemApiClient.SwapQuoteDeserializer())
+            .registerTypeAdapter(Release::class.java, GemApiClient.ReleaseDeserialize())
             .registerTypeAdapter(AssetId::class.java, AssetIdSerializer())
             .create()
     }

diff --git a/app/src/main/java/com/gemwallet/android/services/GemApiClient.kt b/app/src/main/java/com/gemwallet/android/services/GemApiClient.kt
@@ -28,6 +28,8 @@ import com.wallet.core.primitives.NameRecord
 import com.wallet.core.primitives.Node
 import com.wallet.core.primitives.NodeState
 import com.wallet.core.primitives.Platform
+import com.wallet.core.primitives.PlatformStore
+import com.wallet.core.primitives.Release
 import com.wallet.core.primitives.Subscription
 import com.wallet.core.primitives.SwapApprovalData
 import com.wallet.core.primitives.SwapProvider
@@ -389,5 +391,25 @@ interface GemApiClient {
             )
         }
     }
+
+    class ReleaseDeserialize : JsonDeserializer<Release?> {
+        override fun deserialize(
+            json: JsonElement,
+            typeOfT: Type?,
+            context: JsonDeserializationContext?
+        ): Release? {
+            val jObj = json.asJsonObject
+            val version = jObj["version"].asString
+            val upgradeRequired = jObj["upgradeRequired"].asBoolean
+            val store = jObj["store"].asString
+            val platformStore = PlatformStore.entries.firstOrNull { it.string == store} ?: throw IllegalArgumentException()
+            return Release(
+                version = version,
+                store = platformStore,
+                upgradeRequired = upgradeRequired
+            )
+        }
+
+    }
 }
 
diff --git a/app/src/main/java/com/gemwallet/android/ui/AppViewModel.kt b/app/src/main/java/com/gemwallet/android/ui/AppViewModel.kt
@@ -57,9 +57,8 @@ class AppViewModel @Inject constructor(
         if (BuildConfig.DEBUG) {
             return@withContext
         }
-        val current = gemApiClient.getConfig().getOrNull()
-            ?.releases?.filter {
-                if (it.store == null) return@filter false
+        val response = gemApiClient.getConfig().getOrNull()
+        val current = response?.releases?.filter {
                 val versionFlavor = when (it.store) {
                     PlatformStore.GooglePlay -> "google"
                     PlatformStore.Fdroid -> "fdroid"
@@ -71,7 +70,8 @@ class AppViewModel @Inject constructor(
                 }
                 BuildConfig.FLAVOR == versionFlavor
             }
-            ?.firstOrNull()?.version ?: BuildConfig.VERSION_NAME
+            ?.firstOrNull()?.version ?: return@withContext
+
         val skipVersion = configRepository.getAppVersionSkip()
         if (current.compareTo(BuildConfig.VERSION_NAME) > 0 && skipVersion != current) {
             state.update {