Synchronize periodically only if there are changes to be synchronized

AndBible · Jun 7, 2023 · d4b6de4 · d4b6de4
1 parent 5295871
commit d4b6de4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/app/src/main/java/net/bible/android/view/activity/page/MainBibleActivity.kt b/app/src/main/java/net/bible/android/view/activity/page/MainBibleActivity.kt
@@ -1293,10 +1293,12 @@ class MainBibleActivity : CustomTitlebarActivityBase() {
             Log.i(TAG, "Periodic sync starting")
             try {
                 while (true) {
-                    Log.i(TAG, "Performing periodic sync")
                     windowRepository.saveIntoDb(false)
-                    DeviceSynchronize.start()
-                    DeviceSynchronize.waitUntilFinished()
+                    if(DeviceSynchronize.hasChanges()) {
+                        Log.i(TAG, "Performing periodic sync")
+                        DeviceSynchronize.start()
+                        DeviceSynchronize.waitUntilFinished()
+                    }
                     delay(CommonUtils.settings.getLong("gdrive_sync_interval", 60L) * 1000)
                 }
             } catch (e: StopSync) {

diff --git a/app/src/main/java/net/bible/service/devicesync/DatabaseSync.kt b/app/src/main/java/net/bible/service/devicesync/DatabaseSync.kt
@@ -90,6 +90,11 @@ class SyncableDatabaseDefinition<T: SyncableRoomDatabase>(
         }
     }
 
+    val hasChanges: Boolean get() {
+        val lastSynchronized = dao.getLong(LAST_SYNCHRONIZED_KEY)?: 0
+        return dao.countNewLogEntries(lastSynchronized, deviceId) > 0
+    }
+
     val categoryName get() = category.name.lowercase()
     val dao get() = localDb.syncDao()
     val writableDb get() = localDb.openHelper.writableDatabase

diff --git a/app/src/main/java/net/bible/service/devicesync/DeviceSynchronize.kt b/app/src/main/java/net/bible/service/devicesync/DeviceSynchronize.kt
@@ -380,5 +380,11 @@ object DeviceSynchronize {
         file.delete()
     }
 
+    suspend fun hasChanges(): Boolean =
+        DatabaseContainer.dbDefFactories.asyncMap {
+            val dbDef = it.invoke()
+            dbDef.category.enabled && dbDef.hasChanges
+        }.any { it }
+
     const val TAG = "GoogleDrive"
 }