Merge pull request #2214 from nextcloud/warning

Warning

Nextcloud.xcodeproj/project.pbxproj

@@ -3607,7 +3607,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -3670,7 +3670,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;

iOSClient/Data/NCManageDatabase+Account.swift

@@ -36,7 +36,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let addObject = tableAccount()
 
                 addObject.account = account
@@ -68,7 +68,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 realm.add(account, update: .all)
             }
         } catch let error {
@@ -81,7 +81,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let result = realm.objects(tableAccount.self).filter("account == %@", account)
 
                 realm.delete(result)
@@ -198,7 +198,7 @@ extension NCManageDatabase {
         var accountReturn = tableAccount()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 let results = realm.objects(tableAccount.self)
                 for result in results {
@@ -223,7 +223,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 if let result = realm.objects(tableAccount.self).filter("account == %@", account).first {
                     result.password = "********"
@@ -239,7 +239,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("active == true").first {
                     if (tableAccount().objectSchema.properties.contains { $0.name == property }) {
                         result[property] = state
@@ -256,7 +256,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("active == true").first {
                     if let fileName = fileName {
                         result.autoUploadFileName = fileName
@@ -275,7 +275,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("active == true").first {
                     if let serverUrl = serverUrl {
                         result.autoUploadDirectory = serverUrl
@@ -300,7 +300,7 @@ extension NCManageDatabase {
                 return nil
             }
 
-            try realm.safeWrite {
+            try realm.write {
 
                 guard let result = realm.objects(tableAccount.self).filter("account == %@", activeAccount.account).first else {
                     return
@@ -350,7 +350,7 @@ extension NCManageDatabase {
                 return nil
             }
 
-            try realm.safeWrite {
+            try realm.write {
 
                 guard let result = realm.objects(tableAccount.self).filter("account == %@", activeAccount.account).first else {
                     return
@@ -377,7 +377,7 @@ extension NCManageDatabase {
 
         let realm = try! Realm()
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("account == %@", account).first {
                     result.mediaPath = path
                 }
@@ -391,7 +391,7 @@ extension NCManageDatabase {
 
         let realm = try! Realm()
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("account == %@", account).first {
                     result.userStatusClearAt = userStatusClearAt
                     result.userStatusIcon = userStatusIcon
@@ -413,7 +413,7 @@ extension NCManageDatabase {
         let alias = alias?.trimmingCharacters(in: .whitespacesAndNewlines)
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAccount.self).filter("active == true").first {
                     if let alias = alias {
                         result.alias = alias

iOSClient/Data/NCManageDatabase+Activity.swift

@@ -204,7 +204,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 let results = realm.objects(tableComments.self).filter("account == %@ AND objectId == %@", account, objectId)
                 realm.delete(results)

iOSClient/Data/NCManageDatabase+DashboardWidget.swift

@@ -52,7 +52,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 
                 let resultDashboard = realm.objects(tableDashboardWidget.self).filter("account == %@", account)
                 realm.delete(resultDashboard)

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -231,7 +231,7 @@ extension NCManageDatabase {
         let returnMetadata = tableMetadata.init(value: metadata)
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 realm.add(metadata, update: .all)
             }
         } catch let error {
@@ -246,7 +246,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 for metadata in metadatas {
                     realm.add(metadata, update: .all)
                 }
@@ -261,7 +261,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let results = realm.objects(tableMetadata.self).filter(predicate)
                 realm.delete(results)
             }
@@ -275,7 +275,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first {
                     result.serverUrl = serverUrlTo
                 }
@@ -290,7 +290,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let results = realm.objects(tableMetadata.self).filter("ocId == %@", ocId)
                 for result in results {
                     result.serverUrl = serverUrl
@@ -306,7 +306,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first {
                     let resultsType = NKCommon.shared.getInternalType(fileName: fileNameTo, mimeType: "", directory: result.directory)
                     result.fileName = fileNameTo
@@ -338,10 +338,8 @@ extension NCManageDatabase {
         var metadatasUpdate: [tableMetadata] = []
         var metadatasLocalUpdate: [tableMetadata] = []
 
-        realm.refresh()
-
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 // DELETE
                 for metadataResult in metadatasResult {
@@ -414,10 +412,9 @@ extension NCManageDatabase {
     func setMetadataSession(ocId: String, session: String? = nil, sessionError: String? = nil, sessionSelector: String? = nil, sessionTaskIdentifier: Int? = nil, status: Int? = nil, etag: String? = nil) {
 
         let realm = try! Realm()
-        realm.refresh()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first
                 if let session = session {
                     result?.session = session
@@ -450,7 +447,7 @@ extension NCManageDatabase {
         var result: tableMetadata?
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first
                 result?.status = status
             }
@@ -472,7 +469,7 @@ extension NCManageDatabase {
         guard let etagResource = etagResource else { return }
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first
                 result?.etagResource = etagResource
             }
@@ -486,7 +483,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first
                 result?.favorite = favorite
             }
@@ -500,7 +497,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let results = realm.objects(tableMetadata.self).filter("account == %@ AND favorite == true", account)
                 for result in results {
                     result.favorite = false
@@ -519,7 +516,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first
                 result?.e2eEncrypted = encrypted
             }
@@ -533,7 +530,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let result = realm.objects(tableMetadata.self).filter("account == %@ AND serverUrl == %@ AND fileName == %@", account, serverUrl, fileName).first
                 result?.fileNameView = newFileNameView
             }
@@ -712,7 +709,7 @@ extension NCManageDatabase {
         realm.refresh()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 let results = realm.objects(tableMetadata.self).filter("account == %@ AND (status == %d OR status == %@)", account, NCGlobal.shared.metadataStatusWaitUpload, NCGlobal.shared.metadataStatusUploadError)
                 realm.delete(results)
@@ -727,7 +724,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let results = realm.objects(tableMetadata.self).filter("account == %@ AND fileId == %@", account, fileId)
                 for result in results {
                     result.commentsUnread = false
@@ -758,7 +755,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let results = realm.objects(tableMetadata.self).filter("account == %@ AND assetLocalIdentifier IN %@", account, assetLocalIdentifiers)
                 for result in results {
                     result.assetLocalIdentifier = ""
@@ -775,8 +772,6 @@ extension NCManageDatabase {
         let realm = try! Realm()
         var classFile = metadata.classFile
 
-        realm.refresh()
-
         if !metadata.livePhoto || !CCUtility.getLivePhoto() {
             return nil
         }

iOSClient/Data/NCManageDatabase+Video.swift

@@ -33,7 +33,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableVideo.self).filter("account == %@ AND ocId == %@", metadata.account, metadata.ocId).first {
 
                     if let durationTime = durationTime {
@@ -69,7 +69,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableVideo.self).filter("account == %@ AND ocId == %@", metadata.account, metadata.ocId).first {
                     if let codecNameVideo = codecNameVideo { result.codecNameVideo = codecNameVideo }
                     if let codecNameAudio = codecNameAudio { result.codecNameAudio = codecNameAudio }
@@ -141,7 +141,7 @@ extension NCManageDatabase {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let result = realm.objects(tableVideo.self).filter("account == %@ AND ocId == %@", metadata.account, metadata.ocId)
                 realm.delete(result)
             }

iOSClient/Data/NCManageDatabase.swift

@@ -157,7 +157,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 var results: Results<Object>
 
                 if let account = account {
@@ -252,7 +252,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 // Add new
                 let addObject = tableAvatar()
@@ -285,7 +285,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 let results = realm.objects(tableAvatar.self)
                 for result in results {
@@ -306,7 +306,7 @@ class NCManageDatabase: NSObject {
         var image: UIImage?
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableAvatar.self).filter("fileName == %@", fileName).first {
                     if let imageAvatar = UIImage(contentsOfFile: fileNameLocalPath) {
                         result.loaded = true
@@ -347,7 +347,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let addObject = tableCapabilities()
 
                 addObject.account = account
@@ -480,7 +480,7 @@ class NCManageDatabase: NSObject {
         var size: Int64 = 0
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 for fileName in fileNames {
 
@@ -518,7 +518,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 let result = realm.objects(tableChunk.self).filter(NSPredicate(format: "account == %@ AND ocId == %@ AND fileName == %@", account, ocId, fileName))
                 realm.delete(result)
@@ -533,7 +533,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 let result = realm.objects(tableChunk.self).filter(NSPredicate(format: "account == %@ AND ocId == %@", account, ocId))
                 realm.delete(result)
@@ -551,7 +551,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 let resultsCreators = realm.objects(tableDirectEditingCreators.self).filter("account == %@", account)
                 realm.delete(resultsCreators)
@@ -650,7 +650,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 var addObject = tableDirectory()
                 let result = realm.objects(tableDirectory.self).filter("ocId == %@", ocId).first
 
@@ -694,7 +694,7 @@ class NCManageDatabase: NSObject {
 
         // Delete table Dirrectory
         do {
-            try realm.safeWrite {
+            try realm.write {
                 realm.delete(results)
             }
         } catch let error {
@@ -707,7 +707,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 guard let result = realm.objects(tableDirectory.self).filter("account == %@ AND serverUrl == %@", account, serverUrl).first else {
                     return
@@ -770,7 +770,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let result = realm.objects(tableDirectory.self).filter("ocId == %@", ocId).first
                 result?.serverUrl = serverUrl
             }
@@ -784,7 +784,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let result = realm.objects(tableDirectory.self).filter("account == %@ AND serverUrl == %@", account, serverUrl).first
                 result?.offline = offline
             }
@@ -800,7 +800,7 @@ class NCManageDatabase: NSObject {
         var result: tableDirectory?
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 result = realm.objects(tableDirectory.self).filter("account == %@ AND serverUrl == %@", account, serverUrl).first
                 result?.richWorkspace = richWorkspace
             }
@@ -822,7 +822,7 @@ class NCManageDatabase: NSObject {
         var result: tableDirectory?
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 result = realm.objects(tableDirectory.self).filter("account == %@ AND serverUrl == %@", account, serverUrl).first
                 result?.colorFolder = colorFolder
             }
@@ -845,7 +845,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 realm.add(e2e, update: .all)
             }
         } catch let error {
@@ -858,7 +858,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 let results = realm.objects(tableE2eEncryption.self).filter(predicate)
                 realm.delete(results)
@@ -948,7 +948,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let addObject = tableE2eEncryptionLock()
 
                 addObject.account = account
@@ -968,7 +968,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableE2eEncryptionLock.self).filter("account == %@ AND serverUrl == %@", account, serverUrl).first {
                     realm.delete(result)
                 }
@@ -986,7 +986,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let addObject = tableExternalSites()
 
                 addObject.account = account
@@ -1009,7 +1009,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let results = realm.objects(tableExternalSites.self).filter("account == %@", account)
                 realm.delete(results)
             }
@@ -1087,7 +1087,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 let addObject = getTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId)) ?? tableLocalFile()
 
@@ -1111,7 +1111,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 let addObject = tableLocalFile()
 
@@ -1135,7 +1135,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let results = realm.objects(tableLocalFile.self).filter(predicate)
                 realm.delete(results)
             }
@@ -1149,7 +1149,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let result = realm.objects(tableLocalFile.self).filter("ocId == %@", ocId).first
                 if let fileName = fileName {
                     result?.fileName = fileName
@@ -1168,7 +1168,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 if let result = realm.objects(tableLocalFile.self).filter("ocId == %@", ocId).first {
                     result.exifDate = exifDate
                     result.exifLatitude = exifLatitude
@@ -1215,7 +1215,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let result = realm.objects(tableLocalFile.self).filter("ocId == %@", ocId).first
                 result?.offline = offline
             }
@@ -1233,7 +1233,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 var creationDateString = ""
 
@@ -1303,7 +1303,7 @@ class NCManageDatabase: NSObject {
         let home = NCUtilityFileSystem.shared.getHomeServer(account: account)
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 for share in shares {
 
@@ -1461,7 +1461,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 // Add new
                 let addObject = tableTag()
@@ -1534,7 +1534,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 let addObject = tableTip()
                 addObject.tipName = tipName
                 realm.add(addObject, update: .all)
@@ -1552,7 +1552,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
                 for trash in items {
                     let object = tableTrash()
 
@@ -1585,7 +1585,7 @@ class NCManageDatabase: NSObject {
         var predicate = NSPredicate()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 if filePath == nil {
                     predicate = NSPredicate(format: "account == %@", account)
@@ -1607,7 +1607,7 @@ class NCManageDatabase: NSObject {
         var predicate = NSPredicate()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 if fileId == nil {
                     predicate = NSPredicate(format: "account == %@", account)
@@ -1653,7 +1653,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
 
         do {
-            try realm.safeWrite {
+            try realm.write {
 
                 let results = realm.objects(tableUserStatus.self).filter("account == %@ AND predefined == %@", account, predefined)
                 realm.delete(results)
@@ -1681,15 +1681,3 @@ class NCManageDatabase: NSObject {
         }
     }
 }
-
-// MARK: -
-
-extension Realm {
-    public func safeWrite(_ block: (() throws -> Void)) throws {
-        if isInWriteTransaction {
-            try block()
-        } else {
-            try write(block)
-        }
-    }
-}

iOSClient/Extensions/UIApplication+Orientation.swift

@@ -27,7 +27,7 @@ extension UIApplication {
     var isLandscape: Bool {
         if UIDevice.current.orientation.isValidInterfaceOrientation {
             return UIDevice.current.orientation.isLandscape
-        } else  {
+        } else {
             return windows.first?.windowScene?.interfaceOrientation.isLandscape ?? false
         }
     }

iOSClient/Networking/NCNetworking.swift

@@ -173,16 +173,13 @@ import Photos
             }
         }
         #endif
-        
-        if let serverTrust: SecTrust = protectionSpace.serverTrust, let certificate = SecTrustGetCertificateAtIndex(serverTrust, 0)  {
-            
+
+        if let serverTrust: SecTrust = protectionSpace.serverTrust, let certificate = SecTrustGetCertificateAtIndex(serverTrust, 0) {
+
             // extarct certificate txt
             saveX509Certificate(certificate, host: host, directoryCertificate: directoryCertificate)
            
-            var secresult = SecTrustResultType.invalid
-            let status = SecTrustEvaluate(serverTrust, &secresult)
-            let isServerTrusted = SecTrustEvaluateWithError(serverTrust, nil)
-            
+            let isServerTrusted = SecTrustEvaluateWithError(serverTrust, nil)            
             let certificateCopyData = SecCertificateCopyData(certificate)
             let data = CFDataGetBytePtr(certificateCopyData);
             let size = CFDataGetLength(certificateCopyData);
@@ -192,7 +189,7 @@ import Photos
             
             if isServerTrusted {
                 isTrusted = true
-            } else if status == errSecSuccess, let certificateDataSaved = NSData(contentsOfFile: certificateSavedPath), certificateData.isEqual(to: certificateDataSaved as Data) {
+            } else if let certificateDataSaved = NSData(contentsOfFile: certificateSavedPath), certificateData.isEqual(to: certificateDataSaved as Data) {
                 isTrusted = true
             } else {
                 isTrusted = false

iOSClient/Security/NCEndToEndEncryption.m

@@ -906,25 +906,6 @@
     return keyData;
 }
 
-- (NSString *)getMD5:(NSString *)input
-{
-    // Create pointer to the string as UTF8
-    const char *ptr = [input cStringUsingEncoding:NSUTF8StringEncoding];
-    
-    // Create byte array of unsigned chars
-    unsigned char md5Buffer[CC_MD5_DIGEST_LENGTH];
-    
-    // Create 16 byte MD5 hash value, store in buffer
-    CC_MD5(ptr, (unsigned int)strlen(ptr), md5Buffer);
-    
-    // Convert MD5 value in the buffer to NSString of hex values
-    NSMutableString *output = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH * 2];
-    for(int i = 0; i < CC_MD5_DIGEST_LENGTH; i++)
-        [output appendFormat:@"%02x",md5Buffer[i]];
-    
-    return output;
-}
-
 - (NSString *)getSHA1:(NSString *)input
 {
     const char *cstr = [input cStringUsingEncoding:NSUTF8StringEncoding];