move to NextcloudKit

Signed-off-by: marinofaggiana <marino.faggiana@nextcloud.com>

iOSClient/Activity/NCActivityTableViewCell.swift

@@ -109,7 +109,7 @@ extension NCActivityTableViewCell: UICollectionViewDelegate {
                         (responder as? UIViewController)!.navigationController?.pushViewController(viewController, animated: true)
                     } else {
                         let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_trash_file_not_found_")
-                        NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+                        NCContentPresenter.shared.showError(error: error)
                     }
                 }
             }

iOSClient/Data/NCManageDatabase.swift

@@ -189,7 +189,7 @@ class NCManageDatabase: NSObject {
                     do {
                         #if !EXTENSION
                         let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_database_corrupt_")
-                        NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecondLong, type: NCContentPresenter.messageType.info, priority: .max)
+                        NCContentPresenter.shared.showError(error: error, priority: .max)
                         #endif
                         NKCommon.shared.writeLog("DATABASE CORRUPT: removed")
                         try FileManager.default.removeItem(at: databaseFileUrlPath)
@@ -213,7 +213,7 @@ class NCManageDatabase: NSObject {
                 do {
                     #if !EXTENSION
                     let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_database_corrupt_")
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecondLong, type: NCContentPresenter.messageType.info, priority: .max)
+                    NCContentPresenter.shared.showError(error: error, priority: .max)
                     #endif
                     NKCommon.shared.writeLog("DATABASE CORRUPT: removed")
                     try FileManager.default.removeItem(at: databaseFileUrlPath)

iOSClient/Diagnostics/NCCapabilitiesViewController.swift

@@ -181,7 +181,7 @@ class NCCapabilitiesViewController: UIViewController, UIDocumentInteractionContr
             updateCapabilities()
         } else {
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_no_capabilities_found_")
-            NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info, priority: .max)
+            NCContentPresenter.shared.showError(error: error, priority: .max)
 
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
                 self.dismiss(animated: true, completion: nil)

iOSClient/Extensions/UIAlertController+Extension.swift

@@ -40,7 +40,7 @@ extension UIAlertController {
                 if let completion = completion {
                     completion(error)
                 } else if error != .success {
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                 } // else: successful, no action
             }
         })

iOSClient/Favorites/NCFavorite.swift

@@ -84,7 +84,7 @@ class NCFavorite: NCCollectionViewCommon {
 
             NCNetworking.shared.listingFavoritescompletion(selector: NCGlobal.shared.selectorListingFavorite) { _, _, error in
                 if error != .success {
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                 }
 
                 DispatchQueue.main.async {

iOSClient/Login/NCAppConfigView.swift

@@ -64,17 +64,17 @@ class NCAppConfigView: UIViewController {
 
         guard let serverUrl = self.serverUrl else {
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "User Default, serverUrl not found")
-            NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+            NCContentPresenter.shared.showError(error: error)
             return
         }
         guard let username = self.username else {
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "User Default, username not found")
-            NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+            NCContentPresenter.shared.showError(error: error)
             return
         }
         guard let password = self.password else {
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "User Default, password not found")
-            NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+            NCContentPresenter.shared.showError(error: error)
             return
         }
 
@@ -92,7 +92,7 @@ class NCAppConfigView: UIViewController {
 
                     guard let tableAccount = NCManageDatabase.shared.setAccountActive(account) else {
                         let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "setAccountActive error")
-                        NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                        NCContentPresenter.shared.showError(error: error)
                         self.dismiss(animated: true, completion: nil)
                         return
                     }
@@ -102,7 +102,7 @@ class NCAppConfigView: UIViewController {
 
                     self.dismiss(animated: true) {}
                 } else {
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                 }
             }
         }

iOSClient/Login/NCLoginWeb.swift

@@ -94,7 +94,7 @@ class NCLoginWeb: UIViewController {
             loadWebPage(webView: webView!, url: url)
         } else {
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_login_url_error_")
-            NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error, priority: .max)
+            NCContentPresenter.shared.showError(error: error, priority: .max)
         }
     }
 

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1066,7 +1066,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         NCNetworking.shared.unifiedSearchFilesProvider(urlBase: appDelegate, id: searchResult.id, term: term, limit: 5, cursor: cursor) { searchResult, metadatas, error in
 
             if error != .success {
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
 
             metadataForSection.unifiedSearchInProgress = false

iOSClient/Main/Create cloud/NCCreateFormUploadAssets.swift

@@ -341,7 +341,7 @@ class NCCreateFormUploadAssets: XLFormViewController, NCSelectDelegate {
                 if !NCNetworking.shared.createFolder(assets: self.assets, selector: NCGlobal.shared.selectorUploadFile, useSubFolder: useSubFolder, account: self.appDelegate.account, urlBase: self.appDelegate.urlBase) {
                     
                     let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_error_createsubfolders_upload_")
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                     return
                 }
             }

iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift

@@ -323,7 +323,7 @@ import XLForm
             NextcloudKit.shared.NCTextCreateFile(fileNamePath: fileNamePath, editorId: editorId, creatorId: creatorId, templateId: templateIdentifier, customUserAgent: customUserAgent) { account, url, error in
                 guard error.errorCode == 0, account == self.appDelegate.account, let url = url else {
                     self.navigationItem.rightBarButtonItem?.isEnabled = true
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                     return
                 }
 
@@ -347,7 +347,7 @@ import XLForm
             NextcloudKit.shared.createRichdocuments(path: fileNamePath, templateId: templateIdentifier) { account, url, error in
                 guard error == .success, account == self.appDelegate.account, let url = url else {
                     self.navigationItem.rightBarButtonItem?.isEnabled = true
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                     return
                 }
 

iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -443,7 +443,7 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
             NCActivityIndicator.shared.stop()
 
             let error = NKError(errorCode: NCGlobal.shared.errorCreationFile, errorDescription: "_error_creation_file_")
-            NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+            NCContentPresenter.shared.showError(error: error)
             return
         }
         let fileUrl = URL(fileURLWithPath: fileNameGenerateExport)
@@ -481,7 +481,7 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
             } catch {
                 NCActivityIndicator.shared.stop()
                 let error = NKError(errorCode: NCGlobal.shared.errorCreationFile, errorDescription: "_error_creation_file_")
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+                NCContentPresenter.shared.showError(error: error)
                 return
             }
         }
@@ -564,7 +564,7 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
             guard let data = image.jpegData(compressionQuality: CGFloat(0.5)) else {
                 NCActivityIndicator.shared.stop()
                 let error = NKError(errorCode: NCGlobal.shared.errorCreationFile, errorDescription: "_error_creation_file_")
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+                NCContentPresenter.shared.showError(error: error)
                 return
             }
 
@@ -573,7 +573,7 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
             } catch {
                 NCActivityIndicator.shared.stop()
                 let error = NKError(errorCode: NCGlobal.shared.errorCreationFile, errorDescription: "_error_creation_file_")
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+                NCContentPresenter.shared.showError(error: error)
                 return
             }
         }

iOSClient/Main/NCFunctionCenter.swift

@@ -697,7 +697,7 @@ import Photos
 
             NCNetworking.shared.favoriteMetadata(metadata) { error in
                 if error != .success {
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                 }
             }
         }
@@ -705,7 +705,7 @@ import Photos
         let deleteConfirmFile = UIAction(title: titleDeleteConfirmFile, image: UIImage(systemName: "trash"), attributes: .destructive) { _ in
             NCNetworking.shared.deleteMetadata(metadata, onlyLocalCache: false) { error in
                 if error != .success {
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                 }
             }
         }

iOSClient/Main/NCPickerViewController.swift

@@ -89,17 +89,17 @@ class NCPhotosPickerViewController: NSObject {
 
         viewController.didExceedMaximumNumberOfSelection = { _ in
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_limited_dimension_")
-            NCContentPresenter.shared.messageNotification("_info_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+            NCContentPresenter.shared.showError(error: error)
         }
 
         viewController.handleNoAlbumPermissions = { _ in
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_denied_album_")
-            NCContentPresenter.shared.messageNotification("_info_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+            NCContentPresenter.shared.showError(error: error)
         }
 
         viewController.handleNoCameraPermissions = { _ in
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_denied_camera_")
-            NCContentPresenter.shared.messageNotification("_info_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+            NCContentPresenter.shared.showError(error: error)
         }
 
         viewController.configure = configure
@@ -178,7 +178,7 @@ class NCDocumentPickerViewController: NSObject, UIDocumentPickerDelegate {
 
             } else {
                 let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_read_file_error_")
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
         }
     }

iOSClient/Menu/NCCollectionViewCommon+Menu.swift

@@ -117,7 +117,7 @@ extension NCCollectionViewCommon {
                     action: { _ in
                         NCNetworking.shared.favoriteMetadata(metadata) { error in
                             if error != .success {
-                                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                                NCContentPresenter.shared.showError(error: error)
                             }
                         }
                     }

iOSClient/Menu/NCViewer+Menu.swift

@@ -50,7 +50,7 @@ extension NCViewer {
                     action: { _ in
                         NCNetworking.shared.favoriteMetadata(metadata) { error in
                             if error != .success {
-                                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                                NCContentPresenter.shared.showError(error: error)
                             }
                         }
                     }

iOSClient/Networking/NCAutoUpload.swift

@@ -104,7 +104,7 @@ class NCAutoUpload: NSObject {
                     #if !EXTENSION
                     if selector == NCGlobal.shared.selectorUploadAutoUploadAll {
                         let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_error_createsubfolders_upload_")
-                        NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: .error, priority: .max)
+                        NCContentPresenter.shared.showError(error: error, priority: .max)
                     }
                     #endif
                     return completion(0)

iOSClient/Networking/NCNetworking.swift

@@ -217,7 +217,7 @@ import Photos
 
         if !NCUtilityFileSystem.shared.moveFile(atPath: certificateAtPath, toPath: certificateToPath) {
             let error = NKError(errorCode: NCGlobal.shared.errorCreationFile, errorDescription: "_error_creation_file_")
-            NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error, priority: .max)
+            NCContentPresenter.shared.showError(error: error, priority: .max)
         }
     }
     

iOSClient/Networking/NCNetworkingCheckRemoteUser.swift

@@ -70,7 +70,7 @@ import NextcloudKit
                         if UIApplication.shared.applicationState == .active && NextcloudKit.shared.isNetworkReachable() && !CCUtility.getPassword(account).isEmpty && !appDelegate.deletePasswordSession {
                             let description = String.localizedStringWithFormat(NSLocalizedString("_error_check_remote_user_", comment: ""), tableAccount.user, tableAccount.urlBase)
                             let error = NKError(errorCode: error.errorCode, errorDescription: description)
-                            NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecondLong, type: NCContentPresenter.messageType.error, priority: .max)
+                            NCContentPresenter.shared.showError(error: error, priority: .max)
                             CCUtility.setPassword(account, password: nil)
                             appDelegate.deletePasswordSession = true
                         }
@@ -81,7 +81,7 @@ import NextcloudKit
 
             } else {
 
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecondLong, type: NCContentPresenter.messageType.error, priority: .max)
+                NCContentPresenter.shared.showError(error: error, priority: .max)
 
                 self.checkRemoteUserInProgress = false
             }
@@ -91,7 +91,7 @@ import NextcloudKit
             if UIApplication.shared.applicationState == .active &&  NextcloudKit.shared.isNetworkReachable() {
                 let description = String.localizedStringWithFormat(NSLocalizedString("_error_check_remote_user_", comment: ""), tableAccount.user, tableAccount.urlBase)
                 let error = NKError(errorCode: error.errorCode, errorDescription: description)
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecondLong, type: NCContentPresenter.messageType.error, priority: .max)
+                NCContentPresenter.shared.showError(error: error, priority: .max)
                 CCUtility.setPassword(account, password: nil)
             }
 

iOSClient/Networking/NCNetworkingChunkedUpload.swift

@@ -48,7 +48,7 @@ extension NCNetworking {
             } else {
                 NCContentPresenter.shared.dismiss()
                 let error = NKError(errorCode: NCGlobal.shared.errorReadFile, errorDescription: "_err_file_not_found_")
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
                 NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
                 return completion(uploadError)
             }
@@ -249,7 +249,7 @@ extension NCNetworking {
             } else {
                 let description = errorDescription + " code: \(error.errorCode)"
                 let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: description)
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
 
             NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: errorDescription, sessionTaskIdentifier: NCGlobal.shared.metadataStatusNormal, status: NCGlobal.shared.metadataStatusUploadError)

iOSClient/Networking/NCOperationQueue.swift

@@ -270,7 +270,7 @@ class NCOperationDelete: ConcurrentOperation {
         } else {
             NCNetworking.shared.deleteMetadata(metadata, onlyLocalCache: onlyLocalCache) { error in
                 if error != .success {
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                 }
                 self.finish()
             }
@@ -301,14 +301,14 @@ class NCOperationCopyMove: ConcurrentOperation {
             if move {
                 NCNetworking.shared.moveMetadata(metadata, serverUrlTo: serverUrlTo, overwrite: overwrite) { error in
                     if error != .success {
-                        NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                        NCContentPresenter.shared.showError(error: error)
                     }
                     self.finish()
                 }
             } else {
                 NCNetworking.shared.copyMetadata(metadata, serverUrlTo: serverUrlTo, overwrite: overwrite) { error in
                     if error != .success {
-                        NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                        NCContentPresenter.shared.showError(error: error)
                     }
                     self.finish()
                 }

iOSClient/Notification/NCNotification.swift

@@ -239,7 +239,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
                 self.reloadDatasource()
 
             } else if error != .success {
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             } else {
                 print("[Error] The user has been changed during networking process.")
             }
@@ -273,7 +273,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
                     self.reloadDatasource()
 
                 } else if error != .success {
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                 } else {
                     print("[Error] The user has been changed during networking process.")
                 }

iOSClient/Rename file/NCRenameFile.swift

@@ -243,7 +243,7 @@ class NCRenameFile: UIViewController, UITextFieldDelegate {
 
             } else {
 
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
         }
     }

iOSClient/Select/NCSelect.swift

@@ -758,7 +758,7 @@ extension NCSelect {
 
         NCNetworking.shared.readFolder(serverUrl: serverUrl, account: activeAccount.account) { _, _, _, _, _, _, error in
             if error != .success {
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
             self.networkInProgress = false
             self.loadDatasource(withLoadFolder: false)

iOSClient/Share/NCShareNetworking.swift

@@ -125,7 +125,7 @@ class NCShareNetworking: NSObject {
             if error == .success {
                 self.delegate?.getSharees(sharees: sharees)
             } else {
-                NCContentPresenter.shared.messageNotification("_share_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
                 self.delegate?.getSharees(sharees: nil)
             }
         }

iOSClient/Share/NCSharePaging.swift

@@ -381,7 +381,7 @@ class NCShareHeaderView: UIView {
                     color: metadata.favorite ? NCBrandColor.shared.yellowFavorite : NCBrandColor.shared.systemGray,
                     size: 20), for: .normal)
             } else {
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
         }
     }

iOSClient/UserStatus/NCUserStatus.swift

@@ -184,7 +184,7 @@ class NCUserStatus: UIViewController {
         if error != .success && error.errorCode != NCGlobal.shared.errorResourceNotFound {
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                 self.dismiss(animated: true) {
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                 }
             }
         }
@@ -311,7 +311,7 @@ class NCUserStatus: UIViewController {
         NextcloudKit.shared.clearMessage { _, error in
 
             if error != .success {
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
 
             self.dismiss(animated: true)
@@ -325,7 +325,7 @@ class NCUserStatus: UIViewController {
         NextcloudKit.shared.setCustomMessageUserDefined(statusIcon: statusMessageEmojiTextField.text, message: message, clearAt: clearAtTimestamp) { _, error in
 
             if error != .success {
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
 
             self.dismiss(animated: true)

iOSClient/Utility/NCContentPresenter.swift

@@ -63,12 +63,13 @@ class NCContentPresenter: NSObject {
 
     // MARK: - Message
 
-    @objc func showError(error: NKError) {
+    func showError(error: NKError, priority: EKAttributes.Precedence.Priority = .normal) {
         messageNotification(
             "_error_",
             error: error,
             delay: NCGlobal.shared.dismissAfterSecond,
-            type: .error)
+            type: .error,
+            priority: priority)
     }
 
     @objc func messageNotification(_ title: String, error: NKError, delay: TimeInterval, type: messageType) {

iOSClient/Viewer/NCViewer.swift

@@ -119,9 +119,9 @@ class NCViewer: NSObject {
                                 navigationController.pushViewController(viewController, animated: true)
                             }
 
-                        } else if error.errorCode != 0 {
+                        } else if error != .success {
 
-                            NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                            NCContentPresenter.shared.showError(error: error)
                         }
                     }
 
@@ -185,9 +185,9 @@ class NCViewer: NSObject {
                                     navigationController.pushViewController(viewController, animated: true)
                                 }
 
-                            } else if error.errorCode != 0 {
+                            } else if error != .success {
 
-                                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                                NCContentPresenter.shared.showError(error: error)
                             }
                         }
 
@@ -208,7 +208,7 @@ class NCViewer: NSObject {
 
                 } else {
                     let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_editor_unknown_")
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                 }
 
                 return
@@ -239,14 +239,14 @@ extension NCViewer: NCSelectDelegate {
                 NCNetworking.shared.moveMetadata(metadata, serverUrlTo: serverUrl, overwrite: overwrite) { error in
                     if error != .success {
 
-                        NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                        NCContentPresenter.shared.showError(error: error)
                     }
                 }
             } else if copy {
                 NCNetworking.shared.copyMetadata(metadata, serverUrlTo: serverUrl, overwrite: overwrite) { error in
                     if error != .success {
 
-                        NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                        NCContentPresenter.shared.showError(error: error)
                     }
                 }
             }

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -214,7 +214,7 @@ class NCPlayer: NSObject {
                             NCContentPresenter.shared.messageNotification(title, error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error, priority: .max)
                         } else {
                             let error = NKError(errorCode: NCGlobal.shared.errorGeneric, errorDescription: "_error_something_wrong_")
-                            NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error, priority: .max)
+                            NCContentPresenter.shared.showError(error: error, priority: .max)
                         }
                     }
                     break

iOSClient/Viewer/NCViewerRichdocument/NCViewerRichdocument.swift

@@ -234,7 +234,7 @@ class NCViewerRichdocument: UIViewController, WKNavigationDelegate, WKScriptMess
                                 }
                             } else {
 
-                                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                                NCContentPresenter.shared.showError(error: error)
                             }
                         })
                     }
@@ -289,7 +289,7 @@ class NCViewerRichdocument: UIViewController, WKNavigationDelegate, WKScriptMess
                     let functionJS = "OCA.RichDocuments.documentsMain.postAsset('\(metadata!.fileNameView)', '\(url!)')"
                     self.webView.evaluateJavaScript(functionJS, completionHandler: { _, _ in })
                 } else if error != .success {
-                    NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                 } else {
                     print("[LOG] It has been changed user during networking process, error.")
                 }
@@ -306,7 +306,7 @@ class NCViewerRichdocument: UIViewController, WKNavigationDelegate, WKScriptMess
                 let functionJS = "OCA.RichDocuments.documentsMain.postAsset('\(metadata.fileNameView)', '\(url!)')"
                 self.webView.evaluateJavaScript(functionJS, completionHandler: { _, _ in })
             } else if error != .success {
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             } else {
                 print("[LOG] It has been changed user during networking process, error.")
             }