Show proper error message on quota error when sharing file to app Closes

#214 Upping versionCode to 134
zotero · Feb 13, 2025 · 2dcbed8 · 2dcbed8
1 parent 58b18a7
commit 2dcbed8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/app/src/main/java/org/zotero/android/screens/share/ShareErrorProcessor.kt b/app/src/main/java/org/zotero/android/screens/share/ShareErrorProcessor.kt
@@ -8,6 +8,7 @@ import org.zotero.android.database.requests.ReadGroupDbRequest
 import org.zotero.android.sync.LibraryIdentifier
 import org.zotero.android.sync.Parsing
 import org.zotero.android.sync.SchemaError
+import org.zotero.android.sync.SyncActionError
 import org.zotero.android.translator.data.AttachmentState
 import org.zotero.android.translator.data.TranslationWebViewError
 import org.zotero.android.uicomponents.Strings
@@ -153,6 +154,11 @@ class ShareErrorProcessor @Inject constructor(
                 if (error is TranslationWebViewError) {
                     return AttachmentState.Error.webViewError(error)
                 }
+                if (error is SyncActionError.authorizationFailed) {
+                    if (libraryId != null) {
+                        return AttachmentState.Error.quotaLimit(libraryId)
+                    }
+                }
             }
 
             is CustomResult.GeneralError.NetworkError -> {

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
@@ -111,6 +111,7 @@ internal class ShareViewModel @Inject constructor(
     private lateinit var selectedCollectionId: CollectionIdentifier
     private lateinit var selectedLibraryId: LibraryIdentifier
     private lateinit var attachmentKey: String
+    private var wasAttachmentUploaded: Boolean = false
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEvent(tagPickerResult: TagPickerResult) {
@@ -387,7 +388,7 @@ internal class ShareViewModel @Inject constructor(
 
     private fun finishSync(successful: Boolean) {
         Timber.i("ShareViewModel: finishSync success = $successful")
-        if (!successful) {
+        if (!successful && wasAttachmentUploaded) {
             updateState {
                 copy(collectionPickerState = CollectionPickerState.failed)
             }
@@ -979,6 +980,7 @@ internal class ShareViewModel @Inject constructor(
                 zipMimetype = this.zipMimetype,
                 processUploadToZoteroException = ::processUploadToZoteroException,
                 onBack = {
+                    wasAttachmentUploaded = true
                     maybeSaveCachedDataInPdfWorker()
                 })
         } else {
@@ -988,6 +990,7 @@ internal class ShareViewModel @Inject constructor(
                 defaultMimetype = this.defaultMimetype,
                 processUploadToZoteroException = ::processUploadToZoteroException,
                 onBack = {
+                    wasAttachmentUploaded = true
                     maybeSaveCachedDataInPdfWorker()
                 }
             )
@@ -1005,7 +1008,9 @@ internal class ShareViewModel @Inject constructor(
                 tags = tags
             )
         } else {
-            triggerEffect(ShareViewEffect.NavigateBack)
+            if (wasAttachmentUploaded) {
+                triggerEffect(ShareViewEffect.NavigateBack)
+            }
         }
 
 
@@ -1016,7 +1021,8 @@ internal class ShareViewModel @Inject constructor(
         error: CustomResult.GeneralError,
         data: UploadData
     ) {
-
+        wasAttachmentUploaded = false
+        maybeSaveCachedDataInPdfWorker()
         updateState {
             copy(
                 attachmentState = AttachmentState.failed(
@@ -1065,7 +1071,9 @@ internal class ShareViewModel @Inject constructor(
                 updateState { copy(retrieveMetadataState = RetrieveMetadataState.failed(update.errorMessage)) }
             }
             is PdfWorkerController.Update.recognizedAndSaved -> {
-                triggerEffect(ShareViewEffect.NavigateBack)
+                if (wasAttachmentUploaded) {
+                    triggerEffect(ShareViewEffect.NavigateBack)
+                }
             }
             is PdfWorkerController.Update.recognizedAndKeptInMemory -> {
                 updateState {

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