Fix for infinite spinner for collections on some devices on ShareScreen

Upping versionCode to 72.
zotero · Jun 4, 2024 · 2729ce0 · 2729ce0
1 parent 57d8fad
commit 2729ce0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/app/src/main/java/org/zotero/android/screens/share/ShareViewModel.kt b/app/src/main/java/org/zotero/android/screens/share/ShareViewModel.kt
@@ -53,11 +53,9 @@ import org.zotero.android.sync.Collection
 import org.zotero.android.sync.CollectionIdentifier
 import org.zotero.android.sync.DateParser
 import org.zotero.android.sync.KeyGenerator
-import org.zotero.android.sync.Libraries
 import org.zotero.android.sync.Library
 import org.zotero.android.sync.LibraryIdentifier
 import org.zotero.android.sync.SchemaController
-import org.zotero.android.sync.SyncKind
 import org.zotero.android.sync.SyncObject
 import org.zotero.android.sync.SyncObservableEventStream
 import org.zotero.android.sync.SyncScheduler
@@ -129,13 +127,17 @@ internal class ShareViewModel @Inject constructor(
         selectedLibraryId = fileStore.getSelectedLibrary()
         attachmentKey = KeyGenerator.newKey()
         setupObservers()
+        finishSync(true)
         ioCoroutineScope.launch {
             try {
-                syncScheduler.startSyncController(
-                    type = SyncKind.collectionsOnly,
-                    libraries = Libraries.all,
-                    retryAttempt = 0
-                )
+                // There should not be a need to do a dedicated collections sync here
+                // and wait for it's completion as for large number of collections it could take a lot of time,
+                // let's use already synced collections for selection.
+//                syncScheduler.startSyncController(
+//                    type = SyncKind.collectionsOnly,
+//                    libraries = Libraries.all,
+//                    retryAttempt = 0
+//                )
                 val attachment = shareRawAttachmentLoader.getLoadedAttachmentResult()
                 process(attachment)
             } catch (e: Exception) {
@@ -153,11 +155,11 @@ internal class ShareViewModel @Inject constructor(
     }
 
     private fun setupObservers() {
-        syncObservableEventStream.flow()
-            .onEach { data ->
-                finishSync(successful = (data == null))
-            }
-            .launchIn(viewModelScope)
+//        syncObservableEventStream.flow()
+//            .onEach { data ->
+//                finishSync(successful = (data == null))
+//            }
+//            .launchIn(viewModelScope)
 
         translatorActionEventStream.flow()
             .onEach { event ->

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