move to NextcloudKit

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

iOSClient/Activity/NCActivity.swift

@@ -88,7 +88,7 @@ class NCActivity: UIViewController, NCSharePagingContent {
                     self.commentView?.newCommentField.text?.removeAll()
                     self.loadComments()
                 } else {
-                    NCContentPresenter.shared.messageNotification("_share_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                 }
             }
         }
@@ -407,7 +407,7 @@ extension NCActivity {
             if error == .success, let comments = comments {
                 NCManageDatabase.shared.addComments(comments, account: metadata.account, objectId: metadata.fileId)
             } else if error.errorCode != NCGlobal.shared.errorResourceNotFound {
-                NCContentPresenter.shared.messageNotification("_share_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
 
             if let disptachGroup = disptachGroup {
@@ -518,7 +518,7 @@ extension NCActivity: NCShareCommentsCellDelegate {
                             if error == .success {
                                 self.loadComments()
                             } else {
-                                NCContentPresenter.shared.messageNotification("_share_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                                NCContentPresenter.shared.showError(error: error)
                             }
                         }
                     }))
@@ -539,7 +539,7 @@ extension NCActivity: NCShareCommentsCellDelegate {
                         if error == .success {
                             self.loadComments()
                         } else {
-                            NCContentPresenter.shared.messageNotification("_share_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                            NCContentPresenter.shared.showError(error: error)
                         }
                     }
                 }

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1275,7 +1275,7 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
 
         if metadata.e2eEncrypted && !CCUtility.isEnd(toEndEnabled: appDelegate.account) {
             let error = NKError(errorCode: NCGlobal.shared.errorE2EENotEnabled, errorDescription: "_e2e_goto_settings_for_enable_")
-            NCContentPresenter.shared.messageNotification("_info_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+            NCContentPresenter.shared.showInfo(error: error)
             return
         }
 
@@ -1304,7 +1304,7 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
                 NCNetworking.shared.download(metadata: metadata, selector: NCGlobal.shared.selectorLoadFileView) { _ in }
             } else {
                 let error = NKError(errorCode: NCGlobal.shared.errorOffline, errorDescription: "_go_online_")
-                NCContentPresenter.shared.messageNotification("_info_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+                NCContentPresenter.shared.showInfo(error: error)
             }
         }
     }

iOSClient/Main/Create cloud/NCCreateFormUploadAssets.swift

@@ -273,7 +273,7 @@ class NCCreateFormUploadAssets: XLFormViewController, NCSelectDelegate {
                     self.reloadFormRow(formRow)
 
                     let error = NKError(errorCode: NCGlobal.shared.errorCharactersForbidden, errorDescription: "_forbidden_characters_")
-                    NCContentPresenter.shared.messageNotification("_info_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+                    NCContentPresenter.shared.showInfo(error: error)
                 }
             }
 

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -222,7 +222,7 @@ extension NCCreateFormUploadConflictDelegate {
 
             switchAlreadyExistingFiles.isOn = true
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_file_not_rewite_doc_")
-            NCContentPresenter.shared.messageNotification("_info_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+            NCContentPresenter.shared.showInfo(error: error)
         }
 
         tableView.reloadData()

iOSClient/Main/NCFunctionCenter.swift

@@ -625,7 +625,7 @@ import Photos
             let board = UIPasteboard.general
             board.string = NCUtilityFileSystem.shared.getPath(path: metadata.path, user: metadata.user, fileName: metadata.fileName)
             let error = NKError(errorCode: NCGlobal.shared.errorNoError, errorDescription: "_copied_path_")
-            NCContentPresenter.shared.messageNotification("", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+            NCContentPresenter.shared.showInfo(error: error)
         }
 
         let detail = UIAction(title: NSLocalizedString("_details_", comment: ""), image: UIImage(systemName: "info")) { _ in

iOSClient/Main/NCMainTabBar.swift

@@ -196,7 +196,7 @@ class NCMainTabBar: UITabBar {
 
                 if !directory.permissions.contains("CK") {
                     let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_no_permission_add_file_")
-                    NCContentPresenter.shared.messageNotification("_warning_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+                    NCContentPresenter.shared.showWarning(error: error)
                     return
                 }
             }

iOSClient/Networking/NCAutoUpload.swift

@@ -62,7 +62,7 @@ class NCAutoUpload: NSObject {
             guard hasPermission else { return }
             #if !EXTENSION
             let error = NKError(errorCode: NCGlobal.shared.errorNoError, errorDescription: "_create_full_upload_")
-            NCContentPresenter.shared.messageNotification("_attention_", error: error, delay: NCGlobal.shared.dismissAfterSecondLong, type: .info, priority: .max)
+            NCContentPresenter.shared.showWarning(error: error, priority: .max)
             NCActivityIndicator.shared.start()
             #endif
             self.uploadAssetsNewAndFull(viewController: viewController, selector: NCGlobal.shared.selectorUploadAutoUploadAll, log: log) { _ in

iOSClient/Networking/NCService.swift

@@ -89,10 +89,10 @@ class NCService: NSObject {
 
             if serverProductName == "owncloud" {
                 let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_warning_owncloud_")
-                NCContentPresenter.shared.messageNotification("_warning_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info, priority: .max)
+                NCContentPresenter.shared.showWarning(error: error, priority: .max)
             } else if versionMajor <=  NCGlobal.shared.nextcloud_unsupported_version {
                 let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_warning_unsupported_")
-                NCContentPresenter.shared.messageNotification("_warning_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info, priority: .max)
+                NCContentPresenter.shared.showWarning(error: error, priority: .max)
             }
         }
     }
@@ -112,7 +112,7 @@ class NCService: NSObject {
             // Update User (+ userProfile.id) & active account & account network
             guard let tableAccount = NCManageDatabase.shared.setAccountUserProfile(userProfile!) else {
                 let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "Internal error : account not found on DB")
-                NCContentPresenter.shared.messageNotification("Account", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error, priority: .max)
+                NCContentPresenter.shared.showError(error: error, priority: .max)
                 return
             }
 

iOSClient/RichWorkspace/NCRichWorkspaceCommon.swift

@@ -32,7 +32,7 @@ import NextcloudKit
 
         if !NextcloudKit.shared.isNetworkReachable() {
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_go_online_")
-            NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+            NCContentPresenter.shared.showError(error: error)
             return
         }
 
@@ -56,7 +56,7 @@ import NextcloudKit
                 }
 
             } else if error != .success {
-                NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+                NCContentPresenter.shared.showError(error: error)
             }
         }
     }
@@ -65,7 +65,7 @@ import NextcloudKit
 
         if !NextcloudKit.shared.isNetworkReachable() {
             let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_go_online_")
-            NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+            NCContentPresenter.shared.showError(error: error)
             return
         }
 
@@ -92,7 +92,7 @@ import NextcloudKit
                         }
 
                     } else if error != .success {
-                        NCContentPresenter.shared.messageNotification("_error_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+                        NCContentPresenter.shared.showError(error: error)
                     }
                 }
 

iOSClient/Settings/NCManageAutoUploadFileName.swift

@@ -172,7 +172,7 @@ class NCManageAutoUploadFileName: XLFormViewController {
                     self.reloadFormRow(formRow)
 
                     let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_forbidden_characters_")
-                    NCContentPresenter.shared.messageNotification("_info_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+                    NCContentPresenter.shared.showInfo(error: error)
                 }
             }
 

iOSClient/Share/NCShare+NCCellDelegate.swift

@@ -35,7 +35,7 @@ extension NCShare: NCShareLinkCellDelegate, NCShareUserCellDelegate {
                 let internalLink = appDelegate.urlBase + "/index.php/f/" + metadata.fileId
                 NCShareCommon.shared.copyLink(link: internalLink, viewController: self, sender: sender)
             } else {
-                NCContentPresenter.shared.messageNotification("_share_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
         }
     }

iOSClient/Share/NCShareNetworking.swift

@@ -57,7 +57,7 @@ class NCShareNetworking: NSObject {
                 NCManageDatabase.shared.addShare(urlBase: self.urlBase, account: self.metadata.account, shares: shares)
                 self.appDelegate.shares = NCManageDatabase.shared.getTableShares(account: self.metadata.account)
             } else {
-                NCContentPresenter.shared.messageNotification("_share_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
             self.delegate?.readShareCompleted()
         }
@@ -84,7 +84,7 @@ class NCShareNetworking: NSObject {
                     self.updateShare(option: option)
                 }
             } else {
-                NCContentPresenter.shared.messageNotification("_share_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
             self.delegate?.shareCompleted()
         }
@@ -98,7 +98,7 @@ class NCShareNetworking: NSObject {
                 NCManageDatabase.shared.deleteTableShare(account: account, idShare: idShare)
                 self.delegate?.unShareCompleted()
             } else {
-                NCContentPresenter.shared.messageNotification("_share_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
             }
         }
     }
@@ -112,7 +112,7 @@ class NCShareNetworking: NSObject {
                 self.appDelegate.shares = NCManageDatabase.shared.getTableShares(account: self.metadata.account)
                 self.delegate?.readShareCompleted()
             } else {
-                NCContentPresenter.shared.messageNotification("_share_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                NCContentPresenter.shared.showError(error: error)
                 self.delegate?.updateShareWithError(idShare: option.idShare)
             }
         }

iOSClient/Share/NCSharePaging.swift

@@ -389,6 +389,6 @@ class NCShareHeaderView: UIView {
     @objc func longTap(sender: UIGestureRecognizer) {
         UIPasteboard.general.string = path.text
         let error = NKError(errorCode: NCGlobal.shared.errorNoError, errorDescription: "_copied_path_")
-        NCContentPresenter.shared.messageNotification("", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+        NCContentPresenter.shared.showInfo(error: error)
     }
 }

iOSClient/Shares/NCShares.swift

@@ -103,7 +103,7 @@ class NCShares: NCCollectionViewCommon {
 
                 DispatchQueue.main.async {
                     self.collectionView?.reloadData()
-                    NCContentPresenter.shared.messageNotification("_share_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error)
+                    NCContentPresenter.shared.showError(error: error)
                 }
             }
         }

iOSClient/Utility/NCContentPresenter.swift

@@ -72,6 +72,24 @@ class NCContentPresenter: NSObject {
             priority: priority)
     }
 
+    func showInfo(error: NKError, priority: EKAttributes.Precedence.Priority = .normal) {
+        messageNotification(
+            "_info_",
+            error: error,
+            delay: NCGlobal.shared.dismissAfterSecond,
+            type: .info,
+            priority: priority)
+    }
+
+    func showWarning(error: NKError, priority: EKAttributes.Precedence.Priority = .normal) {
+        messageNotification(
+            "_warning_",
+            error: error,
+            delay: NCGlobal.shared.dismissAfterSecond,
+            type: .info,
+            priority: priority)
+    }
+
     @objc func messageNotification(_ title: String, error: NKError, delay: TimeInterval, type: messageType) {
         messageNotification(title, error: error, delay: delay, type: type, priority: .normal, dropEnqueuedEntries: false)
     }

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCSubtitle/NCSubtitlePlayer.swift

@@ -136,7 +136,7 @@ extension NCPlayer {
         }
         if all.count != existing.count {
             let error = NKError(errorCode: NCGlobal.shared.errorNoError, errorDescription: "_subtitle_not_dowloaded_")
-            NCContentPresenter.shared.messageNotification("_info_", error: error, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info)
+            NCContentPresenter.shared.showInfo(error: error)
         }
         self.setSubtitleToolbarIcon(subtitleUrls: subtitleUrls)
         self.hideSubtitle()

iOSClient/Viewer/NCViewerQuickLook/NCViewerQuickLook.swift

@@ -68,10 +68,7 @@ import NextcloudKit
 
         if metadata?.livePhoto == true {
             let error = NKError(errorCode: NCGlobal.shared.errorCharactersForbidden, errorDescription: "_message_disable_overwrite_livephoto_")
-            NCContentPresenter.shared.messageNotification(
-                "", error: error,
-                delay: NCGlobal.shared.dismissAfterSecond,
-                type: NCContentPresenter.messageType.info)
+            NCContentPresenter.shared.showInfo(error: error)
         }
     }