Fixing a bug in itemChangesWithoutDeletions predicate that led to an …

…incorrect items being selected for upload during a group sync. Fixing an error in WebSocket message parsing for group updates. Upping versionCode to 75
zotero · Jun 18, 2024 · b2e3d96 · b2e3d96
1 parent d46e16f
commit b2e3d96
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app/src/main/java/org/zotero/android/database/requests/Predicates.kt b/app/src/main/java/org/zotero/android/database/requests/Predicates.kt
@@ -55,9 +55,12 @@ fun <T> RealmQuery<T>.changesWithoutDeletions(libraryId: LibraryIdentifier): Rea
 }
 
 fun <T> RealmQuery<T>.itemChangesWithoutDeletions(libraryId: LibraryIdentifier): RealmQuery<T> {
-    val changePredicate = changed()
-        .or()
-        .attachmentChanged()
+    val changePredicate =
+        beginGroup()
+            .changed()
+            .or()
+            .attachmentChanged()
+            .endGroup()
     return changePredicate
         .and()
         .library(libraryId)

diff --git a/app/src/main/java/org/zotero/android/sync/LibraryIdentifier.kt b/app/src/main/java/org/zotero/android/sync/LibraryIdentifier.kt
@@ -53,7 +53,7 @@ sealed class LibraryIdentifier: java.io.Serializable  {
             if (apiPath.contains("groups") && lastSeparator != -1) {
                 val groupId = apiPath.substring(startIndex = lastSeparator + 1).toIntOrNull()
                 if (groupId != null) {
-                    LibraryIdentifier.group(groupId)
+                    return LibraryIdentifier.group(groupId)
                 }
             }
 

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 = 74 // Must be updated on every build
+    val versionCode = 75 // Must be updated on every build
     val version = Version(
         major = 1,
         minor = 0,