Disable sync only until update

AndBible · Aug 19, 2023 · 7085523 · 7085523
1 parent 7b5498c
commit 7085523
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/src/main/java/net/bible/service/cloudsync/CloudSync.kt b/app/src/main/java/net/bible/service/cloudsync/CloudSync.kt
@@ -358,6 +358,7 @@ object CloudSync {
             DatabaseContainer.databaseAccessorFactories.asyncMap {
                 val dbDef = it.invoke()
                 if(!dbDef.category.enabled) return@asyncMap
+                if(dbDef.dao.getLong("disabledForVersion") == dbDef.version.toLong()) return@asyncMap
                 try {
                     initializeSync(dbDef)
                 } catch (e: CancelStartedSync) {
@@ -392,7 +393,7 @@ object CloudSync {
                     Log.e(TAG, "downloadAndApplyNewPatches failed due to IOException", e)
                 } catch (e: IncompatiblePatchVersion) {
                     ABEventBus.post(BibleApplication.ErrorNotificationEvent(cantFetchString(dbDef.category.contentDescription), showReportButton = false))
-                    dbDef.category.enabled = false
+                    dbDef.dao.setConfig("disabledForVersion", dbDef.version.toLong())
                     return@asyncMap
                 } catch (e: Exception) {
                     Log.e(TAG, "downloadAndApplyNewPatches failed due to error", e)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1137,7 +1137,7 @@
     <string name="are_you_sure_reset_cloud">This will reset your cloud database for %s with the content that you have in this device.</string>
     <string name="sync_cant_fetch">The version of database or patch file stored in Cloud is higher than the one supported by this app. </string>
     <string name="sync_disabling">Disabling synchronizing for %s for now.</string>
-    <string name="sync_update_app">Please update the app and then re-enable synchronization.</string>
+    <string name="sync_update_app">Please update the app to continue synchronization.</string>
     <string name="sign_in_failed">Signing in to synchronization backend service failed.</string>
     <string name="disabling_sync">Disabling cloud synchronizing. You must re-enable manually after restore.</string>
     <string name="report">Report</string>