Add support for kDrive

Infomaniak · Nov 24, 2023 · 946db88 · 946db88
1 parent 5ee9c05
commit 946db88
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/Stores/src/fdroid/java/com.infomaniak.lib.stores/StoreUtils.kt b/Stores/src/fdroid/java/com.infomaniak.lib.stores/StoreUtils.kt
@@ -29,19 +29,26 @@ import kotlinx.coroutines.withContext
 
 object StoreUtils {
 
+    //region legacy App update
+    // TODO: Remove this when Ui for kDrive in app update will be made
+    fun FragmentActivity.checkUpdateIsAvailable(appId: String, versionCode: Int, onResult: (updateIsAvailable: Boolean) -> Unit) {
+        checkUpdateIsAvailable(appId = appId, versionCode = versionCode, inAppResultLauncher = null, onFDroidResult = onResult)
+    }
+    //endRegion
+
     //region In-App Update
     fun initAppUpdateManager(context: Context, onInstall: () -> Unit) = Unit
 
     fun FragmentActivity.checkUpdateIsAvailable(
         appId: String,
         versionCode: Int,
-        inAppResultLauncher: ActivityResultLauncher<IntentSenderRequest>,
+        inAppResultLauncher: ActivityResultLauncher<IntentSenderRequest>?,
         onFDroidResult: (updateIsAvailable: Boolean) -> Unit,
     ) {
         lifecycleScope.launch {
             val lastVersionCode = FdroidApiTools().getLastRelease(appId)
 
-            withContext(Dispatchers.Main) { onResult(versionCode < lastVersionCode) }
+            withContext(Dispatchers.Main) { onFDroidResult(versionCode < lastVersionCode) }
         }
     }
 

diff --git a/Stores/src/standard/java/com.infomaniak.lib.stores/StoreUtils.kt b/Stores/src/standard/java/com.infomaniak.lib.stores/StoreUtils.kt
@@ -49,6 +49,18 @@ object StoreUtils {
         }
     }
 
+    //region legacy App update
+    // TODO: Remove this when Ui for kDrive in app update will be made
+    fun FragmentActivity.checkUpdateIsAvailable(appId: String, versionCode: Int, onResult: (updateIsAvailable: Boolean) -> Unit) {
+        AppUpdateManagerFactory.create(this).appUpdateInfo.addOnSuccessListener { appUpdateInfo ->
+            val updateIsAvailable = appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
+                    appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.FLEXIBLE)
+
+            onResult(updateIsAvailable)
+        }
+    }
+    //endRegion
+
     //region In-App Update
     fun initAppUpdateManager(context: Context, onInstall: () -> Unit) {
         appUpdateManager = AppUpdateManagerFactory.create(context)
@@ -58,14 +70,14 @@ object StoreUtils {
     fun checkUpdateIsAvailable(
         appId: String,
         versionCode: Int,
-        inAppResultLauncher: ActivityResultLauncher<IntentSenderRequest>,
+        inAppResultLauncher: ActivityResultLauncher<IntentSenderRequest>?,
         onFdroidResult: (updateIsAvailable: Boolean) -> Unit,
     ) {
         appUpdateManager.appUpdateInfo.addOnSuccessListener { appUpdateInfo ->
             if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE
                 && appUpdateInfo.isUpdateTypeAllowed(UPDATE_TYPE)
             ) {
-                startUpdateFlow(appUpdateInfo, inAppResultLauncher)
+                inAppResultLauncher?.let { startUpdateFlow(appUpdateInfo, it) }
             }
         }
     }