Merge branch 'develop'

Nextcloud.xcodeproj/project.pbxproj

@@ -1117,6 +1117,13 @@
 		F732B3361E8045A1002B7D75 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
 		F732BA031D76CE1500E9878B /* CCNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNetworking.h; sourceTree = "<group>"; };
 		F732BA041D76CE1500E9878B /* CCNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCNetworking.m; sourceTree = "<group>"; };
+		F735379F1F6125DF00A28648 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
+		F73537A01F6125DF00A28648 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
+		F73537A11F6125DF00A28648 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
+		F73537A21F6125DF00A28648 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		F73537A31F6125E000A28648 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		F73537A41F6125E000A28648 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Intro.strings"; sourceTree = "<group>"; };
+		F73537A51F6125E000A28648 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Error.strings"; sourceTree = "<group>"; };
 		F73B4EAD1F470D9100BBEE4B /* Big5Freq.tab */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Big5Freq.tab; sourceTree = "<group>"; };
 		F73B4EAE1F470D9100BBEE4B /* CharDistribution.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CharDistribution.cpp; sourceTree = "<group>"; };
 		F73B4EAF1F470D9100BBEE4B /* CharDistribution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharDistribution.h; sourceTree = "<group>"; };
@@ -1897,13 +1904,6 @@
 		F7D532551F5D4155006568B1 /* sk-SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sk-SK"; path = "sk-SK.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		F7D532561F5D4155006568B1 /* sk-SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sk-SK"; path = "sk-SK.lproj/Intro.strings"; sourceTree = "<group>"; };
 		F7D532571F5D4156006568B1 /* sk-SK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sk-SK"; path = "sk-SK.lproj/Error.strings"; sourceTree = "<group>"; };
-		F7D532851F5D4417006568B1 /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F7D532861F5D4417006568B1 /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F7D532871F5D4417006568B1 /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
-		F7D532881F5D4417006568B1 /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		F7D532891F5D4417006568B1 /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F7D5328A1F5D4418006568B1 /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/Intro.strings"; sourceTree = "<group>"; };
-		F7D5328B1F5D4418006568B1 /* cs-CZ */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "cs-CZ"; path = "cs-CZ.lproj/Error.strings"; sourceTree = "<group>"; };
 		F7D5328C1F5D443B006568B1 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
 		F7D5328D1F5D443B006568B1 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
 		F7D5328E1F5D443B006568B1 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
@@ -1911,27 +1911,6 @@
 		F7D532901F5D443B006568B1 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		F7D532911F5D443B006568B1 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/Intro.strings"; sourceTree = "<group>"; };
 		F7D532921F5D443B006568B1 /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/Error.strings"; sourceTree = "<group>"; };
-		F7D532931F5D4451006568B1 /* es-AR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-AR"; path = "es-AR.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F7D532941F5D4451006568B1 /* es-AR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-AR"; path = "es-AR.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F7D532951F5D4451006568B1 /* es-AR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-AR"; path = "es-AR.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
-		F7D532961F5D4451006568B1 /* es-AR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-AR"; path = "es-AR.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		F7D532971F5D4451006568B1 /* es-AR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-AR"; path = "es-AR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F7D532981F5D4451006568B1 /* es-AR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-AR"; path = "es-AR.lproj/Intro.strings"; sourceTree = "<group>"; };
-		F7D532991F5D4452006568B1 /* es-AR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-AR"; path = "es-AR.lproj/Error.strings"; sourceTree = "<group>"; };
-		F7D5329A1F5D445C006568B1 /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/CTAssetsPicker.strings; sourceTree = "<group>"; };
-		F7D5329B1F5D445C006568B1 /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/SwiftWebVC.strings; sourceTree = "<group>"; };
-		F7D5329C1F5D445C006568B1 /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/BKPasscodeView.strings; sourceTree = "<group>"; };
-		F7D5329D1F5D445C006568B1 /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/Localizable.strings; sourceTree = "<group>"; };
-		F7D5329E1F5D445C006568B1 /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F7D5329F1F5D445C006568B1 /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/Intro.strings; sourceTree = "<group>"; };
-		F7D532A01F5D445C006568B1 /* sq */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sq; path = sq.lproj/Error.strings; sourceTree = "<group>"; };
-		F7D532A11F5D4461006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/CTAssetsPicker.strings"; sourceTree = "<group>"; };
-		F7D532A21F5D4461006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/SwiftWebVC.strings"; sourceTree = "<group>"; };
-		F7D532A31F5D4461006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/BKPasscodeView.strings"; sourceTree = "<group>"; };
-		F7D532A41F5D4461006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		F7D532A51F5D4461006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		F7D532A61F5D4462006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Intro.strings"; sourceTree = "<group>"; };
-		F7D532A71F5D4462006568B1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Error.strings"; sourceTree = "<group>"; };
 		F7DC5FE81F011EB700A903C7 /* MGSwipeButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGSwipeButton.h; sourceTree = "<group>"; };
 		F7DC5FE91F011EB700A903C7 /* MGSwipeButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGSwipeButton.m; sourceTree = "<group>"; };
 		F7DC5FEA1F011EB700A903C7 /* MGSwipeTableCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGSwipeTableCell.h; sourceTree = "<group>"; };
@@ -4115,10 +4094,7 @@
 				is,
 				nl,
 				"sk-SK",
-				"cs-CZ",
 				"en-GB",
-				"es-AR",
-				sq,
 				"zh-Hans",
 			);
 			mainGroup = F7F67B9F1A24D27800EE80DA;
@@ -5114,11 +5090,8 @@
 				F7D532451F5D4123006568B1 /* is */,
 				F7D5324C1F5D4137006568B1 /* nl */,
 				F7D532531F5D4155006568B1 /* sk-SK */,
-				F7D532871F5D4417006568B1 /* cs-CZ */,
 				F7D5328E1F5D443B006568B1 /* en-GB */,
-				F7D532951F5D4451006568B1 /* es-AR */,
-				F7D5329C1F5D445C006568B1 /* sq */,
-				F7D532A31F5D4461006568B1 /* zh-Hans */,
+				F73537A11F6125DF00A28648 /* zh-Hans */,
 			);
 			name = BKPasscodeView.strings;
 			path = "Supporting Files";
@@ -5142,11 +5115,8 @@
 				F7D532441F5D4123006568B1 /* is */,
 				F7D5324B1F5D4137006568B1 /* nl */,
 				F7D532521F5D4155006568B1 /* sk-SK */,
-				F7D532861F5D4417006568B1 /* cs-CZ */,
 				F7D5328D1F5D443B006568B1 /* en-GB */,
-				F7D532941F5D4451006568B1 /* es-AR */,
-				F7D5329B1F5D445C006568B1 /* sq */,
-				F7D532A21F5D4461006568B1 /* zh-Hans */,
+				F73537A01F6125DF00A28648 /* zh-Hans */,
 			);
 			name = SwiftWebVC.strings;
 			path = "Supporting Files";
@@ -5170,11 +5140,8 @@
 				F7D532481F5D4123006568B1 /* is */,
 				F7D5324F1F5D4137006568B1 /* nl */,
 				F7D532561F5D4155006568B1 /* sk-SK */,
-				F7D5328A1F5D4418006568B1 /* cs-CZ */,
 				F7D532911F5D443B006568B1 /* en-GB */,
-				F7D532981F5D4451006568B1 /* es-AR */,
-				F7D5329F1F5D445C006568B1 /* sq */,
-				F7D532A61F5D4462006568B1 /* zh-Hans */,
+				F73537A41F6125E000A28648 /* zh-Hans */,
 			);
 			name = Intro.strings;
 			path = "Supporting Files";
@@ -5198,11 +5165,8 @@
 				F7D532431F5D4123006568B1 /* is */,
 				F7D5324A1F5D4137006568B1 /* nl */,
 				F7D532511F5D4155006568B1 /* sk-SK */,
-				F7D532851F5D4417006568B1 /* cs-CZ */,
 				F7D5328C1F5D443B006568B1 /* en-GB */,
-				F7D532931F5D4451006568B1 /* es-AR */,
-				F7D5329A1F5D445C006568B1 /* sq */,
-				F7D532A11F5D4461006568B1 /* zh-Hans */,
+				F735379F1F6125DF00A28648 /* zh-Hans */,
 			);
 			name = CTAssetsPicker.strings;
 			path = "Supporting Files";
@@ -5226,11 +5190,8 @@
 				F7D532491F5D4124006568B1 /* is */,
 				F7D532501F5D4137006568B1 /* nl */,
 				F7D532571F5D4156006568B1 /* sk-SK */,
-				F7D5328B1F5D4418006568B1 /* cs-CZ */,
 				F7D532921F5D443B006568B1 /* en-GB */,
-				F7D532991F5D4452006568B1 /* es-AR */,
-				F7D532A01F5D445C006568B1 /* sq */,
-				F7D532A71F5D4462006568B1 /* zh-Hans */,
+				F73537A51F6125E000A28648 /* zh-Hans */,
 			);
 			name = Error.strings;
 			path = "Supporting Files";
@@ -5254,11 +5215,8 @@
 				F7D532471F5D4123006568B1 /* is */,
 				F7D5324E1F5D4137006568B1 /* nl */,
 				F7D532551F5D4155006568B1 /* sk-SK */,
-				F7D532891F5D4417006568B1 /* cs-CZ */,
 				F7D532901F5D443B006568B1 /* en-GB */,
-				F7D532971F5D4451006568B1 /* es-AR */,
-				F7D5329E1F5D445C006568B1 /* sq */,
-				F7D532A51F5D4461006568B1 /* zh-Hans */,
+				F73537A31F6125E000A28648 /* zh-Hans */,
 			);
 			name = InfoPlist.strings;
 			path = "Supporting Files";
@@ -5282,11 +5240,8 @@
 				F7D532461F5D4123006568B1 /* is */,
 				F7D5324D1F5D4137006568B1 /* nl */,
 				F7D532541F5D4155006568B1 /* sk-SK */,
-				F7D532881F5D4417006568B1 /* cs-CZ */,
 				F7D5328F1F5D443B006568B1 /* en-GB */,
-				F7D532961F5D4451006568B1 /* es-AR */,
-				F7D5329D1F5D445C006568B1 /* sq */,
-				F7D532A41F5D4461006568B1 /* zh-Hans */,
+				F73537A21F6125DF00A28648 /* zh-Hans */,
 			);
 			name = Localizable.strings;
 			path = "Supporting Files";

iOSClient/Brand/Picker.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.17.7</string>
+	<string>2.17.8</string>
 	<key>CFBundleVersion</key>
 	<string>00002</string>
 	<key>NSAppTransportSecurity</key>

iOSClient/Brand/PickerFileProvider.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.17.7</string>
+	<string>2.17.8</string>
 	<key>CFBundleVersion</key>
 	<string>00002</string>
 	<key>NSExtension</key>

iOSClient/Brand/Share.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.17.7</string>
+	<string>2.17.8</string>
 	<key>CFBundleVersion</key>
 	<string>00002</string>
 	<key>NSAppTransportSecurity</key>

iOSClient/Brand/iOSClient.plist

@@ -46,7 +46,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.17.7</string>
+	<string>2.17.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

iOSClient/Database/NCManageDatabase.swift

@@ -415,9 +415,12 @@ class NCManageDatabase: NSObject {
                 }
                 
                 // Update user with ID
+                // RollBack 07.09
+                /*
                 if userProfile.id.characters.count > 0 {
                     result.user = userProfile.id
                 }
+                */
                 
                 result.enabled = userProfile.enabled
                 result.address = userProfile.address

iOSClient/Login/CCLogin.m

@@ -360,15 +360,15 @@
     
     if (account) {
     
+        // Update User (+ userProfile.id)
+        [[NCManageDatabase sharedInstance] setAccountsUserProfile:userProfile];
+        
         // Set this account as default
         tableAccount *account = [[NCManageDatabase sharedInstance] setAccountActive:metadataNet.account];
         
         // Setting App active account
         [app settingActiveAccount:account.account activeUrl:account.url activeUser:account.user activePassword:account.password];
     
-        // Update User
-        [[NCManageDatabase sharedInstance] setAccountsUserProfile:userProfile];
-
         // Ok ! Dismiss
         [self.delegate loginSuccess:_loginType];
         

iOSClient/Main/CCMain.m

@@ -1215,7 +1215,14 @@
 
 - (void)getUserProfileSuccess:(CCMetadataNet *)metadataNet userProfile:(OCUserProfile *)userProfile
 {
+    // Update User (+ userProfile.id)
     [[NCManageDatabase sharedInstance] setAccountsUserProfile:userProfile];
+    
+    // Get Account Active
+    tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
+    
+    // Setting App active account
+    [app settingActiveAccount:account.account activeUrl:account.url activeUser:account.user activePassword:account.password];
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
         

iOSClient/Networking/CCNetworking.m

@@ -397,10 +397,6 @@
             errorCode = httpResponse.statusCode;
         else
             errorCode = error.code;
-        
-        // Request trusted certificated
-        if (errorCode == NSURLErrorServerCertificateUntrusted)
-            [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
     }
 
     // ----------------------- DOWNLOAD -----------------------