Update (swift4)

Picker/DocumentPickerViewController.swift

@@ -125,7 +125,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         // Theming
         let tableCapabilities = NCManageDatabase.sharedInstance.getCapabilites()
         if (tableCapabilities != nil && NCBrandOptions.sharedInstance.use_themingColor == true) {
-            if ((tableCapabilities?.themingColor.characters.count)! > 0) {
+            if ((tableCapabilities?.themingColor.count)! > 0) {
                 NCBrandColor.sharedInstance.brand = CCGraphics.color(fromHexString: tableCapabilities?.themingColor)
             }
         }
@@ -705,7 +705,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
 
             if tableDirectory != nil {
                 
-                if (tableDirectory?.lock)! && (passcode?.characters.count)! > 0 {
+                if (tableDirectory?.lock)! && (passcode?.count)! > 0 {
                     
                     self.passcodeIsPush = true
                     openBKPasscode(recordMetadata.fileName)

iOSClient/Actions/CCActions.swift

@@ -156,7 +156,7 @@ class CCActions: NSObject {
             return
         }
         
-        if fileName.characters.count == 0 {
+        if fileName.count == 0 {
             return
         }
         

iOSClient/Create/CCCreateCloud.swift

@@ -233,7 +233,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         row = XLFormRowDescriptor(tag: "maskFileName", rowType: XLFormRowDescriptorTypeAccount, title: NSLocalizedString("_filename_", comment: ""))
         
         let fileNameMask : String = CCUtility.getFileNameMask(k_keyFileNameMask)
-        if fileNameMask.characters.count > 0 {
+        if fileNameMask.count > 0 {
             row.value = fileNameMask
         }
         section.addFormRow(row)
@@ -454,7 +454,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
             
             let valueRenameTrimming = valueRename.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
             
-            if valueRenameTrimming.characters.count > 0 {
+            if valueRenameTrimming.count > 0 {
                 
                 self.form.delegate = nil
                 CCUtility.setFileNameMask(valueRenameTrimming, key: k_keyFileNameMask)

iOSClient/Database/NCManageDatabase.swift

@@ -257,7 +257,7 @@ class NCManageDatabase: NSObject {
             return ""
         }
         
-        if result.autoUploadFileName.characters.count > 0 {
+        if result.autoUploadFileName.count > 0 {
             return result.autoUploadFileName
         } else {
             return NCBrandOptions.sharedInstance.folderDefaultAutoUpload
@@ -272,7 +272,7 @@ class NCManageDatabase: NSObject {
             return ""
         }
         
-        if result.autoUploadDirectory.characters.count > 0 {
+        if result.autoUploadDirectory.count > 0 {
             return result.autoUploadDirectory
         } else {
             return CCUtility.getHomeServerUrlActiveUrl(activeUrl)
@@ -409,7 +409,7 @@ class NCManageDatabase: NSObject {
                 }
                 
                 // Update userID
-                if userProfile.id.characters.count == 0 { // for old config.
+                if userProfile.id.count == 0 { // for old config.
                     result.userID = result.user
                 } else {
                     result.userID = userProfile.id
@@ -2158,19 +2158,19 @@ class NCManageDatabase: NSObject {
                 result.shareUserAndGroup = shares.joined(separator: ",")
             }
             
-            if (result.shareLink.characters.count > 0) {
+            if (result.shareLink.count > 0) {
                 sharesLink.updateValue(result.shareLink, forKey:"\(serverUrl)\(fileName)")
             } else {
                 sharesLink.removeValue(forKey: "\(serverUrl)\(fileName)")
             }
             
-            if (result.shareUserAndGroup.characters.count > 0) {
+            if (result.shareUserAndGroup.count > 0) {
                 sharesUserAndGroup.updateValue(result.shareUserAndGroup, forKey:"\(serverUrl)\(fileName)")
             } else {
                 sharesUserAndGroup.removeValue(forKey: "\(serverUrl)\(fileName)")
             }
             
-            if (result.shareLink.characters.count == 0 && result.shareUserAndGroup.characters.count == 0) {
+            if (result.shareLink.count == 0 && result.shareUserAndGroup.count == 0) {
                 realm.delete(result)
             }
         }
@@ -2224,7 +2224,7 @@ class NCManageDatabase: NSObject {
                 itemsLink.append(itemOCSharedDto)
             }
             
-            if (itemOCSharedDto.shareWith.characters.count > 0 && (itemOCSharedDto.shareType == Int(shareTypeUser.rawValue) || itemOCSharedDto.shareType == Int(shareTypeGroup.rawValue) || itemOCSharedDto.shareType == Int(shareTypeRemote.rawValue)  )) {
+            if (itemOCSharedDto.shareWith.count > 0 && (itemOCSharedDto.shareType == Int(shareTypeUser.rawValue) || itemOCSharedDto.shareType == Int(shareTypeGroup.rawValue) || itemOCSharedDto.shareType == Int(shareTypeRemote.rawValue)  )) {
                 itemsUsersAndGroups.append(itemOCSharedDto)
             }
         }
@@ -2235,10 +2235,10 @@ class NCManageDatabase: NSObject {
             
             let fullPath = CCUtility.getHomeServerUrlActiveUrl(activeUrl) + "\(itemOCSharedDto.path!)"
             let fileName = NSString(string: fullPath).lastPathComponent
-            var serverUrl = NSString(string: fullPath).substring(to: (fullPath.characters.count - fileName.characters.count - 1))
+            var serverUrl = NSString(string: fullPath).substring(to: (fullPath.count - fileName.count - 1))
             
             if serverUrl.hasSuffix("/") {
-                serverUrl = NSString(string: serverUrl).substring(to: (serverUrl.characters.count - 1))
+                serverUrl = NSString(string: serverUrl).substring(to: (serverUrl.count - 1))
             }
             
             if itemOCSharedDto.idRemoteShared > 0 {
@@ -2277,10 +2277,10 @@ class NCManageDatabase: NSObject {
             
             let fullPath = CCUtility.getHomeServerUrlActiveUrl(activeUrl) + "\(path)"
             let fileName = NSString(string: fullPath).lastPathComponent
-            var serverUrl = NSString(string: fullPath).substring(to: (fullPath.characters.count - fileName.characters.count - 1))
+            var serverUrl = NSString(string: fullPath).substring(to: (fullPath.count - fileName.count - 1))
             
             if serverUrl.hasSuffix("/") {
-                serverUrl = NSString(string: serverUrl).substring(to: (serverUrl.characters.count - 1))
+                serverUrl = NSString(string: serverUrl).substring(to: (serverUrl.count - 1))
             }
             
             let sharesUserAndGroupReturn = self.addShareUserAndGroup(idsRemoteShared, fileName: fileName, serverUrl: serverUrl)
@@ -2309,11 +2309,11 @@ class NCManageDatabase: NSObject {
         
         for resultShare in results {
             
-            if (resultShare.shareLink.characters.count > 0) {
+            if (resultShare.shareLink.count > 0) {
                 sharesLink = [resultShare.shareLink: "\(resultShare.serverUrl)\(resultShare.fileName)"]
             }
             
-            if (resultShare.shareUserAndGroup.characters.count > 0) {
+            if (resultShare.shareUserAndGroup.count > 0) {
                 sharesUserAndGroup = [resultShare.shareUserAndGroup: "\(resultShare.serverUrl)\(resultShare.fileName)"]
             }
         }

iOSClient/Settings/NCManageAutoUploadFileName.swift

@@ -63,7 +63,7 @@ class NCManageAutoUploadFileName: XLFormViewController {
         row = XLFormRowDescriptor(tag: "maskFileName", rowType: XLFormRowDescriptorTypeAccount, title: NSLocalizedString("_filename_", comment: ""))
         
         let fileNameMask : String = CCUtility.getFileNameMask(k_keyFileNameAutoUploadMask)
-        if fileNameMask.characters.count > 0 {
+        if fileNameMask.count > 0 {
             row.value = fileNameMask
         }
         section.addFormRow(row)
@@ -192,7 +192,7 @@ class NCManageAutoUploadFileName: XLFormViewController {
             
             let valueRenameTrimming = valueRename.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
             
-            if valueRenameTrimming.characters.count > 0 {
+            if valueRenameTrimming.count > 0 {
                 
                 self.form.delegate = nil
                 CCUtility.setFileNameMask(valueRenameTrimming, key: k_keyFileNameAutoUploadMask)

iOSClient/Text/NCText.swift

@@ -110,7 +110,7 @@ class NCText: UIViewController, UITextViewDelegate {
     
     func textViewDidChange(_ textView: UITextView) {
         
-        if textView.text.characters.count == 0 {
+        if textView.text.count == 0 {
             nextButton.isEnabled = false
         } else {
             nextButton.isEnabled = true