|
@@ -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
|