Fixing items added to a group sometimes not getting synced until an a…

…pp restart. Doing a realm.refresh() to sync Realm Instances after certain database operations. Upping versionCode to 77
zotero · Jun 20, 2024 · 5510710 · 5510710
1 parent ca9e8bc
commit 5510710
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 21 deletions.
diff --git a/app/src/main/java/org/zotero/android/database/RealmDbStorage.kt b/app/src/main/java/org/zotero/android/database/RealmDbStorage.kt
@@ -50,7 +50,7 @@ class RealmDbStorage(val config: RealmConfiguration) {
         val result = coordinator.perform(request = request)
 
         if (invalidateRealm) {
-            coordinator.invalidate()
+            coordinator.refresh()
         }
 
         return result
@@ -59,13 +59,13 @@ class RealmDbStorage(val config: RealmConfiguration) {
     fun perform(request: DbRequest) {
         val coordinator = RealmDbCoordinator().init(config)
         coordinator.perform(request = request)
-        coordinator.invalidate()
+        coordinator.refresh()
     }
 
     fun perform(requests: List<DbRequest>) {
         val coordinator = RealmDbCoordinator().init(config)
         coordinator.perform(requests)
-        coordinator.invalidate()
+        coordinator.refresh()
     }
 }
 
@@ -138,9 +138,4 @@ class RealmDbCoordinator {
         realm.refresh()
     }
 
-    fun invalidate() {
-//        realm.invalidate()
-    }
-
-
 }
diff --git a/app/src/main/java/org/zotero/android/screens/filter/FilterViewModel.kt b/app/src/main/java/org/zotero/android/screens/filter/FilterViewModel.kt
@@ -328,7 +328,7 @@ internal class FilterViewModel @Inject constructor(
 //                    }
                 }
 
-                coordinator.invalidate()
+                coordinator.refresh()
                 if (!viewState.searchTerm.isEmpty()) {
                     // Perform search filter if needed
                     snapshot = sorted

diff --git a/app/src/main/java/org/zotero/android/screens/share/ShareItemSubmitter.kt b/app/src/main/java/org/zotero/android/screens/share/ShareItemSubmitter.kt
@@ -73,7 +73,7 @@ class ShareItemSubmitter @Inject constructor(
             parameters = item.updateParameters?.toMutableMap() ?: mutableMapOf()
             changeUuids = mutableMapOf(item.key to item.changes.map { it.identifier })
 
-            coordinator.invalidate()
+            coordinator.refresh()
         }
 
         return parameters to changeUuids
@@ -118,7 +118,7 @@ class ShareItemSubmitter @Inject constructor(
                 .findFirst()?.value?.toLongOrNull()
             md5 = attachment.fields.where().key(FieldKeys.Item.Attachment.md5).findFirst()?.value
 
-            coordinator.invalidate()
+            coordinator.refresh()
         }
         if (mtime == null) {
             throw AttachmentState.Error.mtimeMissing
@@ -172,7 +172,7 @@ class ShareItemSubmitter @Inject constructor(
                 .findFirst()?.value?.toLongOrNull()
             md5 = attachment.fields.where().key(FieldKeys.Item.Attachment.md5).findFirst()?.value
 
-            coordinator.invalidate()
+            coordinator.refresh()
         }
 
         mtime ?: throw AttachmentState.Error.mtimeMissing

diff --git a/app/src/main/java/org/zotero/android/sync/AttachmentFileCleanupController.kt b/app/src/main/java/org/zotero/android/sync/AttachmentFileCleanupController.kt
@@ -138,7 +138,7 @@ class AttachmentFileCleanupController @Inject constructor(
                 }
 
                 coordinator.perform(request = MarkAllFilesAsNotDownloadedDbRequest())
-                coordinator.invalidate()
+                coordinator.refresh()
             }
 
             val deletedIndividually = delete(libraryIds, forUpload = forUpload)
@@ -203,7 +203,7 @@ class AttachmentFileCleanupController @Inject constructor(
                     )
                 )
 
-                coordinator.invalidate()
+                coordinator.refresh()
             }
 
             for (key in toDelete) {
@@ -246,7 +246,7 @@ class AttachmentFileCleanupController @Inject constructor(
                         downloaded = false
                     )
                 )
-                coordinator.invalidate()
+                coordinator.refresh()
                 canDelete = true
             }
             if (canDelete) {
@@ -270,7 +270,7 @@ class AttachmentFileCleanupController @Inject constructor(
 
                 coordinator.perform(request = MarkLibraryFilesAsNotDownloadedDbRequest(libraryId = libraryId))
 
-                coordinator.invalidate()
+                coordinator.refresh()
             }
 
             val deletedIndividually =

diff --git a/app/src/main/java/org/zotero/android/sync/syncactions/RevertLibraryFilesSyncAction.kt b/app/src/main/java/org/zotero/android/sync/syncactions/RevertLibraryFilesSyncAction.kt
@@ -72,7 +72,7 @@ class RevertLibraryFilesSyncAction(
             )
             changedFilenames =
                 coordinator.perform(request = request).changedFilenames.toMutableList()
-            coordinator.invalidate()
+            coordinator.refresh()
         }
 
         Timber.e("RevertLibraryFilesSyncAction: rename local files to match file names")

diff --git a/app/src/main/java/org/zotero/android/sync/syncactions/RevertLibraryUpdatesSyncAction.kt b/app/src/main/java/org/zotero/android/sync/syncactions/RevertLibraryUpdatesSyncAction.kt
@@ -120,7 +120,7 @@ class RevertLibraryUpdatesSyncAction(
                 failedCollections = collections.second.toMutableList()
                 failedSearches = searches.second.toMutableList()
                 failedItems = items.second.toMutableList()
-                coordinator.invalidate()
+                coordinator.refresh()
             }
 
             renameExistingFiles(changes = changes, libraryId = this.libraryId)

diff --git a/app/src/main/java/org/zotero/android/sync/syncactions/SubmitDeletionSyncAction.kt b/app/src/main/java/org/zotero/android/sync/syncactions/SubmitDeletionSyncAction.kt
@@ -112,7 +112,7 @@ class SubmitDeletionSyncAction(
                     }
                 }
                 coordinator.perform(requests)
-                coordinator.invalidate()
+                coordinator.refresh()
             }
             return didCreateDeletions
         } catch (error: Exception) {

diff --git a/app/src/main/java/org/zotero/android/sync/syncactions/SyncVersionsSyncAction.kt b/app/src/main/java/org/zotero/android/sync/syncactions/SyncVersionsSyncAction.kt
@@ -168,7 +168,7 @@ class SyncVersionsSyncAction(
             )
             identifiers = coordinator.perform(request = request).toMutableList()
 
-            coordinator.invalidate()
+            coordinator.refresh()
         })
         return Pair(newVersion, identifiers)
     }

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,7 +4,7 @@ object BuildConfig {
     const val compileSdkVersion = 34
     const val targetSdk = 33
 
-    val versionCode = 76 // Must be updated on every build
+    val versionCode = 77 // Must be updated on every build
     val version = Version(
         major = 1,
         minor = 0,