Fix issue #92 in app update (#103)

getspherelabs · Oct 16, 2023 · 94af68d · 94af68d
2 parents 2181f62 + 4a85f32
commit 94af68d
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 0 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -53,6 +53,9 @@ android {
         implementation(libs.androidx.compose.foundation)
         implementation(libs.firebase.auth)
         implementation(libs.sentry)
+
+        implementation(libs.app.update)
+        implementation(libs.app.update.ktx)
     }
 }
 

diff --git a/androidApp/src/main/java/io/spherelabs/anypass/android/InAppUpdate.kt b/androidApp/src/main/java/io/spherelabs/anypass/android/InAppUpdate.kt
@@ -0,0 +1,60 @@
+package io.spherelabs.anypass.android
+
+import android.app.Activity
+import androidx.activity.ComponentActivity
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.fragment.app.FragmentActivity
+import com.google.android.play.core.appupdate.AppUpdateManagerFactory
+import com.google.android.play.core.appupdate.AppUpdateOptions
+import com.google.android.play.core.install.model.AppUpdateType
+import com.google.android.play.core.install.model.UpdateAvailability
+
+class InAppUpdate(
+    activity: FragmentActivity,
+    private val onUpdateFailed: () -> Unit
+) {
+
+    private val appUpdateManager by lazy {
+        AppUpdateManagerFactory.create(activity)
+    }
+    private val updateType = AppUpdateType.IMMEDIATE
+
+    private val inAppUpdateResultLauncher = activity.registerForActivityResult(
+        ActivityResultContracts.StartIntentSenderForResult()
+    ) { result ->
+        if (result.resultCode != Activity.RESULT_OK)
+            onUpdateFailed()
+    }
+
+    fun checkForUpdate() {
+        appUpdateManager.appUpdateInfo.addOnSuccessListener { info ->
+            val isUpdateAvailable = info.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE
+            val isUpdateAllowed = info.isUpdateTypeAllowed(updateType)
+
+            if (isUpdateAvailable && isUpdateAllowed) {
+                try {
+                    appUpdateManager.startUpdateFlowForResult(
+                        info,
+                        inAppUpdateResultLauncher,
+                        AppUpdateOptions.newBuilder(updateType).build()
+                    )
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        }
+    }
+
+    fun onResume() {
+        appUpdateManager.appUpdateInfo.addOnSuccessListener { info ->
+            if (info.updateAvailability() == UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS) {
+                appUpdateManager.startUpdateFlowForResult(
+                    info,
+                    inAppUpdateResultLauncher,
+                    AppUpdateOptions.newBuilder(updateType).build()
+                )
+            }
+        }
+    }
+
+}
diff --git a/androidApp/src/main/java/io/spherelabs/anypass/android/MainActivity.kt b/androidApp/src/main/java/io/spherelabs/anypass/android/MainActivity.kt
@@ -10,8 +10,13 @@ import androidx.fragment.app.FragmentActivity
 import io.spherelabs.anypass.MainView
 
 class MainActivity : FragmentActivity() {
+
+    private val inAppUpdate = InAppUpdate(activity = this, onUpdateFailed = { finish() })
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        inAppUpdate.checkForUpdate()
         setContent {
             MaterialTheme() {
                 Surface(
@@ -23,4 +28,10 @@ class MainActivity : FragmentActivity() {
 
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        inAppUpdate.onResume()
+    }
+
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -45,6 +45,7 @@ encoding-base32 = "2.0.0"
 buffer = "1.3.6"
 konsist = "0.13.0"
 spotify-ruler = "1.4.0"
+app-update = "2.1.0"
 
 [libraries]
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
@@ -106,6 +107,8 @@ crypto-macs-hmac-sha2 = { module = "org.kotlincrypto.macs:hmac-sha2", version.re
 encoding-base32 = { module = "io.matthewnelson.encoding:base32", version.ref = "encoding-base32" }
 buffer = { module = "com.ditchoom:buffer", version.ref = "buffer" }
 plugin-spotify-ruler = { module = "com.spotify.ruler:ruler-gradle-plugin", version.ref = "spotify-ruler" }
+app-update = { group = "com.google.android.play", name = "app-update", version.ref = "app-update"}
+app-update-ktx = { group = "com.google.android.play", name = "app-update-ktx", version.ref = "app-update"}
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }