marinofaggiana 4 tahun lalu
induk
melakukan
e896965cc3

+ 2 - 2
iOSClient/AppDelegate.swift

@@ -281,7 +281,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         NCCommunicationCommon.shared.writeLog("initialize Main")
         
         // Clear error certificate
-        CCUtility.setCertificateError(account, error: false)
+        CCUtility.clearCertificateError(account)
         
         // Registeration push notification
         NCPushNotification.shared().pushNotification()
@@ -589,7 +589,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         
         CCUtility.clearAllKeysEnd(toEnd: account)
         CCUtility.clearAllKeysPushNotification(account)
-        CCUtility.setCertificateError(account, error: false)
+        CCUtility.clearCertificateError(account)
         CCUtility.setPassword(account, password: nil)
         
         if wipe {

+ 0 - 1
iOSClient/BrowserWeb/NCBrowserWeb.swift

@@ -95,7 +95,6 @@ class NCBrowserWeb: UIViewController {
 
 extension NCBrowserWeb: WKNavigationDelegate {
     
-   
     public func webView(_ webView: WKWebView, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         if let serverTrust = challenge.protectionSpace.serverTrust {
             completionHandler(Foundation.URLSession.AuthChallengeDisposition.useCredential, URLCredential(trust: serverTrust))

+ 3 - 3
iOSClient/Networking/NCNetworking.swift

@@ -212,7 +212,7 @@ import Queuer
 #if !EXTENSION
                         DispatchQueue.main.async {
                             let appDelegate = UIApplication.shared.delegate as! AppDelegate
-                            CCUtility.setCertificateError(appDelegate.account, error: true)
+                            CCUtility.setCertificateError(appDelegate.account)
                         }
 #endif
                     }
@@ -353,7 +353,7 @@ import Queuer
                 if errorCode == 401 || errorCode == 403 {
                     NCNetworkingCheckRemoteUser.shared.checkRemoteUser(account: metadata.account)
                 } else if errorCode == Int(CFNetworkErrors.cfurlErrorServerCertificateUntrusted.rawValue) {
-                    CCUtility.setCertificateError(metadata.account, error: true)
+                    CCUtility.setCertificateError(metadata.account)
                 }
 #endif
             }
@@ -595,7 +595,7 @@ import Queuer
 
                 } else if errorCode == Int(CFNetworkErrors.cfurlErrorServerCertificateUntrusted.rawValue) {
                     
-                    CCUtility.setCertificateError(metadata.account, error: true)
+                    CCUtility.setCertificateError(metadata.account)
                     NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: errorDescription, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusUploadError)
 
                 } else {

+ 1 - 1
iOSClient/Networking/NCNetworkingE2EE.swift

@@ -332,7 +332,7 @@ import Alamofire
                             
                             } else if errorCode == Int(CFNetworkErrors.cfurlErrorServerCertificateUntrusted.rawValue) {
                             
-                                CCUtility.setCertificateError(metadata.account, error: true)
+                                CCUtility.setCertificateError(metadata.account)
                                 NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: errorDescription, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusUploadError)
                                                     
                             } else {

+ 1 - 1
iOSClient/Utility/CCUtility.h

@@ -142,7 +142,7 @@
 + (NSData *)getDatabaseEncryptionKey;
 
 + (BOOL)getCertificateError:(NSString *)account;
-+ (void)setCertificateError:(NSString *)account error:(BOOL)error;
++ (void)setCertificateError:(NSString *)account;
 + (void)clearCertificateError:(NSString *)account;
 
 + (BOOL)getDisableLocalCacheAfterUpload;

+ 4 - 7
iOSClient/Utility/CCUtility.m

@@ -541,15 +541,13 @@
     NSString *error = [UICKeyChainStore stringForKey:key service:NCGlobal.shared.serviceShareKeyChain];
     
     if (error == nil) {
-        
-        [self setCertificateError:account error:NO];
-        return  NO;
+        return false;
     }
     
-    return [error boolValue];
+    return true;
 }
 
-+ (void)setCertificateError:(NSString *)account error:(BOOL)error
++ (void)setCertificateError:(NSString *)account
 {
     // In background do not write the error
 #if !defined(EXTENSION)
@@ -558,9 +556,8 @@
         return;
     }
     NSString *key = [@"certificateError" stringByAppendingString:account];
-    NSString *sError = (error) ? @"true" : @"false";
     
-    [UICKeyChainStore setString:sError forKey:key service:NCGlobal.shared.serviceShareKeyChain];
+    [UICKeyChainStore setString:"true" forKey:key service:NCGlobal.shared.serviceShareKeyChain];
 #else
     return;
 #endif