marinofaggiana 6 lat temu
rodzic
commit
484adcbf24
2 zmienionych plików z 5 dodań i 10 usunięć
  1. 4 3
      iOSClient/Login/CCLogin.m
  2. 1 7
      iOSClient/Login/NCLoginQRCode.swift

+ 4 - 3
iOSClient/Login/CCLogin.m

@@ -258,10 +258,11 @@
 
 - (void)dismissQRCode:(NSString *)value metadataType:(NSString *)metadataType
 {
-    if (value != nil) {
+    NSString *protocolLogin = [[NCBrandOptions sharedInstance].webLoginAutenticationProtocol stringByAppendingString:@"login/"];
+    
+    if (value != nil && [value hasPrefix:protocolLogin] && [value containsString:@"user:"] && [value containsString:@"password:"] && [value containsString:@"server:"]) {
         
-        value = [value stringByReplacingOccurrencesOfString:[NCBrandOptions sharedInstance].webLoginAutenticationProtocol withString:@""];
-        value = [value stringByReplacingOccurrencesOfString:@"login/" withString:@""];
+        value = [value stringByReplacingOccurrencesOfString:protocolLogin withString:@""];
         
         NSArray *valueArray = [value componentsSeparatedByString: @"&"];
         

+ 1 - 7
iOSClient/Login/NCLoginQRCode.swift

@@ -63,13 +63,7 @@ class NCLoginQRCode: NSObject, QRCodeReaderViewControllerDelegate {
         readerVC.delegate = self
         
         readerVC.completionBlock = { (result: QRCodeReaderResult?) in
-            if result != nil {
-                if result!.value.hasPrefix(NCBrandOptions.sharedInstance.webLoginAutenticationProtocol) && result!.value.contains("user:") && result!.value.contains("password:") && result!.value.contains("server:") {
-                    self.readerVC.dismiss(animated: true, completion: nil)
-                }
-            } else {
-                self.readerVC.dismiss(animated: true, completion: nil)
-            }
+            self.readerVC.dismiss(animated: true, completion: nil)
         }
         
         delegate?.present(readerVC, animated: true, completion: nil)