Browse Source

Give better feedback to the user for UNHANDLED_HTTP_CODE

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 year ago
parent
commit
a53bd41757

+ 7 - 1
app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt

@@ -541,7 +541,13 @@ class PreviewMediaActivity :
     override fun onRemoteOperationFinish(operation: RemoteOperation<*>?, result: RemoteOperationResult<*>?) {
         super.onRemoteOperationFinish(operation, result)
         if (operation is RemoveFileOperation) {
-            DisplayUtils.showSnackMessage(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, resources))
+            val errorMessage = if (result?.code == RemoteOperationResult.ResultCode.UNHANDLED_HTTP_CODE) {
+                getString(R.string.preview_media_unhandled_http_code_message)
+            } else {
+                ErrorMessageAdapter.getErrorCauseMessage(result, operation, resources)
+            }
+
+            DisplayUtils.showSnackMessage(this, errorMessage)
 
             val removedFile = operation.file
             val fileAvailable: Boolean = storageManager.fileExists(removedFile.fileId)

+ 2 - 0
app/src/main/res/values/strings.xml

@@ -403,6 +403,8 @@
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="auto_upload_path">/AutoUpload</string>
 
+    <string name="preview_media_unhandled_http_code_message">File is currently locked by another user or process and therefore not deletable.</string>
+
     <string name="preview_sorry">Sorry</string>
     <string name="preview_image_description">Image preview</string>
     <string name="preview_image_error_unknown_format">Unable to show image</string>