diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
index 791c88f73c35..8fc60f0d2cc4 100644
--- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
@@ -541,7 +541,8 @@ 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 = ErrorMessageAdapter.getErrorCauseMessage(result, operation, resources)
+ DisplayUtils.showSnackMessage(this, errorMessage)
val removedFile = operation.file
val fileAvailable: Boolean = storageManager.fileExists(removedFile.fileId)
diff --git a/app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java b/app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java
index 8574f2846bfb..6795feb714e6 100644
--- a/app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java
+++ b/app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java
@@ -293,9 +293,9 @@ String getMessageForRemoveFileOperation(RemoteOperationResult result, Resources
} else {
if (result.getCode() == ResultCode.FORBIDDEN) {
- // Error --> No permissions
- return String.format(res.getString(R.string.forbidden_permissions),
- res.getString(R.string.forbidden_permissions_delete));
+ return String.format(res.getString(R.string.forbidden_permissions), res.getString(R.string.forbidden_permissions_delete));
+ } else if (result.getCode() == ResultCode.LOCKED) {
+ return res.getString(R.string.preview_media_unhandled_http_code_message);
}
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 80ed1b46b753..d038d774290e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -403,6 +403,8 @@
/InstantUpload
/AutoUpload
+ File is currently locked by another user or process and therefore not deletable. Please try again later.
+
Sorry
Image preview
Unable to show image
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index cd3684749bff..25a40c68c5af 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -5746,6 +5746,14 @@
+
+
+
+
+
+
+
+
@@ -9099,6 +9107,11 @@
+
+
+
+
+
@@ -9107,6 +9120,11 @@
+
+
+
+
+
@@ -9115,6 +9133,11 @@
+
+
+
+
+
@@ -10319,6 +10342,11 @@
+
+
+
+
+