#374

iOSClient/Images.xcassets/qrcode.imageset/Contents.json

@@ -2,18 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "qrcode.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "qrcode@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "qrcode@3x.png",
-      "scale" : "3x"
+      "filename" : "qrcode-scan.png"
     }
   ],
   "info" : {

iOSClient/Login/CCLogin.m

@@ -258,7 +258,7 @@
 
 - (void)dismissQRCode:(NSString *)value metadataType:(NSString *)metadataType
 {
-    if (value != nil && [value containsString:[NCBrandOptions sharedInstance].webLoginAutenticationProtocol]) {
+    if (value != nil) {
         
         value = [value stringByReplacingOccurrencesOfString:[NCBrandOptions sharedInstance].webLoginAutenticationProtocol withString:@""];
         value = [value stringByReplacingOccurrencesOfString:@"login/" withString:@""];
@@ -277,6 +277,8 @@
             self.user.text = [valueArray[0] stringByReplacingOccurrencesOfString:@"user:" withString:@""];
             self.password.text = [valueArray[1] stringByReplacingOccurrencesOfString:@"password:" withString:@""];
             self.baseUrl.text = [valueArray[2] stringByReplacingOccurrencesOfString:@"server:" withString:@""];
+            
+            [self handleButtonLogin:self];
         }
     }
 }

iOSClient/Login/CCLogin.storyboard

@@ -125,14 +125,18 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6tp-bh-Z9k" userLabel="QRCode">
-                                <rect key="frame" x="194.66666666666666" y="440.66666666666669" width="25" height="25"/>
-                                <state key="normal" image="qrcode"/>
+                                <rect key="frame" x="182" y="448" width="50" height="50"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="50" id="3hb-Ez-hOz"/>
+                                    <constraint firstAttribute="height" constant="50" id="OLT-tb-4Qb"/>
+                                </constraints>
+                                <state key="normal" backgroundImage="qrcode"/>
                                 <connections>
                                     <action selector="handleQRCode:" destination="yj9-jo-WIn" eventType="touchUpInside" id="IW6-a9-880"/>
                                 </connections>
                             </button>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" white="0.9023259132753424" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="8lf-3Y-f5R" firstAttribute="trailing" secondItem="Kfq-Bg-a0E" secondAttribute="trailing" constant="13" id="3Rl-VS-3Op"/>
                             <constraint firstItem="1Gf-Bw-Nim" firstAttribute="leading" secondItem="4OF-5u-Hd1" secondAttribute="trailing" constant="10" id="4CC-7B-dkI"/>
@@ -142,6 +146,7 @@
                             <constraint firstItem="fhk-o9-J0l" firstAttribute="leading" secondItem="jU7-Iw-XfU" secondAttribute="trailing" constant="10" id="FmL-e8-YKk"/>
                             <constraint firstItem="8lf-3Y-f5R" firstAttribute="centerX" secondItem="BpI-xK-1SU" secondAttribute="centerX" id="IxG-UI-0vq"/>
                             <constraint firstItem="Kfq-Bg-a0E" firstAttribute="centerY" secondItem="szn-G7-5sK" secondAttribute="centerY" id="Ldo-FD-LNp"/>
+                            <constraint firstItem="6tp-bh-Z9k" firstAttribute="top" secondItem="HQd-pF-3cE" secondAttribute="bottom" constant="100" id="NCo-gF-R4d"/>
                             <constraint firstItem="jU7-Iw-XfU" firstAttribute="top" secondItem="1Gf-Bw-Nim" secondAttribute="bottom" id="QHr-T7-zbl"/>
                             <constraint firstItem="owR-PS-F32" firstAttribute="centerX" secondItem="8lf-3Y-f5R" secondAttribute="centerX" id="VSS-Pz-f7g"/>
                             <constraint firstItem="4OF-5u-Hd1" firstAttribute="centerY" secondItem="1Gf-Bw-Nim" secondAttribute="centerY" id="Wkl-Is-Ay0"/>
@@ -151,7 +156,6 @@
                             <constraint firstItem="7q8-rl-x2M" firstAttribute="leading" secondItem="8lf-3Y-f5R" secondAttribute="leading" constant="10" id="bf8-6l-dfs"/>
                             <constraint firstItem="4OF-5u-Hd1" firstAttribute="leading" secondItem="8lf-3Y-f5R" secondAttribute="leading" constant="10" id="e7p-K8-Tt3"/>
                             <constraint firstItem="s9o-RX-XeS" firstAttribute="leading" secondItem="8lf-3Y-f5R" secondAttribute="leading" constant="10" id="gYr-20-hOQ"/>
-                            <constraint firstItem="6tp-bh-Z9k" firstAttribute="centerY" secondItem="8lf-3Y-f5R" secondAttribute="centerY" id="iV8-CJ-R2u"/>
                             <constraint firstItem="7q8-rl-x2M" firstAttribute="centerY" secondItem="jU7-Iw-XfU" secondAttribute="centerY" id="jhu-Tk-ifA"/>
                             <constraint firstItem="8lf-3Y-f5R" firstAttribute="bottom" secondItem="owR-PS-F32" secondAttribute="bottom" id="kxd-eg-KfO"/>
                             <constraint firstItem="szn-G7-5sK" firstAttribute="top" secondItem="BpI-xK-1SU" secondAttribute="bottom" id="lWz-Yy-NCO"/>
@@ -192,7 +196,7 @@
         <image name="loginPassword" width="25" height="25"/>
         <image name="loginURL" width="25" height="25"/>
         <image name="loginUser" width="25" height="25"/>
-        <image name="qrcode" width="25" height="25"/>
+        <image name="qrcode" width="100" height="100"/>
         <image name="visiblePassword" width="25" height="25"/>
     </resources>
 </document>

iOSClient/Login/NCLoginQRCode.swift

@@ -63,7 +63,13 @@ class NCLoginQRCode: NSObject, QRCodeReaderViewControllerDelegate {
         readerVC.delegate = self
         
         readerVC.completionBlock = { (result: QRCodeReaderResult?) in
-            self.readerVC.dismiss(animated: true, completion: nil)
+            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)
+            }
         }
         
         delegate?.present(readerVC, animated: true, completion: nil)