Эх сурвалжийг харах

Use ErrorMessageAdapter

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 жил өмнө
parent
commit
6fc5a47b97

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

@@ -73,7 +73,6 @@ import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.operations.DownloadType
 import com.owncloud.android.operations.DownloadType
 import com.owncloud.android.operations.RemoveFileOperation
 import com.owncloud.android.operations.RemoveFileOperation
 import com.owncloud.android.operations.SynchronizeFileOperation
 import com.owncloud.android.operations.SynchronizeFileOperation
-import com.owncloud.android.operations.common.RemoteOperationHttpPhrase
 import com.owncloud.android.ui.activity.FileActivity
 import com.owncloud.android.ui.activity.FileActivity
 import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment
@@ -542,12 +541,7 @@ class PreviewMediaActivity :
     override fun onRemoteOperationFinish(operation: RemoteOperation<*>?, result: RemoteOperationResult<*>?) {
     override fun onRemoteOperationFinish(operation: RemoteOperation<*>?, result: RemoteOperationResult<*>?) {
         super.onRemoteOperationFinish(operation, result)
         super.onRemoteOperationFinish(operation, result)
         if (operation is RemoveFileOperation) {
         if (operation is RemoveFileOperation) {
-            val errorMessage = if (result?.httpPhrase == RemoteOperationHttpPhrase.Locked.value) {
-                getString(R.string.preview_media_unhandled_http_code_message)
-            } else {
-                ErrorMessageAdapter.getErrorCauseMessage(result, operation, resources)
-            }
-
+            val errorMessage = ErrorMessageAdapter.getErrorCauseMessage(result, operation, resources)
             DisplayUtils.showSnackMessage(this, errorMessage)
             DisplayUtils.showSnackMessage(this, errorMessage)
 
 
             val removedFile = operation.file
             val removedFile = operation.file

+ 5 - 3
app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java

@@ -30,11 +30,13 @@ import com.owncloud.android.operations.UnshareOperation;
 import com.owncloud.android.operations.UpdateSharePermissionsOperation;
 import com.owncloud.android.operations.UpdateSharePermissionsOperation;
 import com.owncloud.android.operations.UpdateShareViaLinkOperation;
 import com.owncloud.android.operations.UpdateShareViaLinkOperation;
 import com.owncloud.android.operations.UploadFileOperation;
 import com.owncloud.android.operations.UploadFileOperation;
+import com.owncloud.android.operations.common.RemoteOperationHttpPhrase;
 
 
 import org.apache.commons.httpclient.ConnectTimeoutException;
 import org.apache.commons.httpclient.ConnectTimeoutException;
 
 
 import java.io.File;
 import java.io.File;
 import java.net.SocketTimeoutException;
 import java.net.SocketTimeoutException;
+import java.util.Objects;
 
 
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
@@ -293,9 +295,9 @@ public final class ErrorMessageAdapter {
 
 
         } else {
         } else {
             if (result.getCode() == ResultCode.FORBIDDEN) {
             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 (Objects.equals(result.getHttpPhrase(), RemoteOperationHttpPhrase.Locked.getValue())) {
+                return res.getString(R.string.preview_media_unhandled_http_code_message);
             }
             }
         }
         }