Merge branch 'develop'

iOSClient/Brand/File_Provider_Extension.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.24.0</string>
+	<string>2.24.1</string>
 	<key>CFBundleVersion</key>
-	<string>20</string>
+	<string>0</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

iOSClient/Brand/Share.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.24.0</string>
+	<string>2.24.1</string>
 	<key>CFBundleVersion</key>
-	<string>20</string>
+	<string>0</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

iOSClient/Brand/iOSClient.plist

@@ -46,7 +46,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.24.0</string>
+	<string>2.24.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -63,7 +63,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20</string>
+	<string>0</string>
 	<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
 	<true/>
 	<key>Fabric</key>
@@ -100,21 +100,21 @@
 		<true/>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string>$(PRODUCT_NAME) requires access to the photo library for send your photos and videos to your cloud.</string>
+	<string>Camera access is required to scan documents and make photo and video.</string>
 	<key>NSFaceIDUsageDescription</key>
-	<string>$(PRODUCT_NAME) requires access to the Face ID for authenticate using face recognition.</string>
+	<string>Face ID is required to authenticate using face recognition.</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>The use of GPS is used to detect new photos from camera roll, continued use of GPS running in the background can dramatically decrease battery life.</string>
+	<string>GPS is used to detect new photos from camera roll, continued use of GPS running in the background can dramatically decrease battery life.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>The use of GPS is used to detect new photos from camera roll, continued use of GPS running in the background can dramatically decrease battery life.</string>
+	<string>GPS is used to detect new photos from camera roll, continued use of GPS running in the background can dramatically decrease battery life.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>The use of GPS is used to detect new photos from camera roll on background, the use of GPS only when the App is in use is useless</string>
+	<string>GPS is used to detect new photos from camera roll on background, the use of GPS only when the App is in use is useless.</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>$(PRODUCT_NAME) requires access to the photo library for send your photos and videos to your cloud.</string>
+	<string>Microphone access is required to create voice notes.</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>$(PRODUCT_NAME) requires access to the photo library for send your photos and videos to your cloud.</string>
+	<string>Photo library access is required to upload your photos and videos to your cloud.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>$(PRODUCT_NAME) requires access to the photo library for send your photos and videos to your cloud.</string>
+	<string>Photo library access is required to upload your photos and videos to your cloud.</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>

iOSClient/Library/OCCommunicationLib/OCSharedDto.m

@@ -33,8 +33,21 @@
     
     if (self) {
         
+        self.shareWith = @"";
+        self.path = @"";
+        self.token = @"";
         self.url = @"";
+        self.uidOwner = @"";
+        self.shareWithDisplayName = @"";
+        self.displayNameOwner = @"";
+        self.uidFileOwner = @"";
+        self.fileTarget = @"";
+        self.note = @"";
         self.label = @"";
+        self.displayNameFileOwner = @"";
+        self.mimeType = @"";
+        self.storageID = @"";
+        self.fileParent = @"";
     }
     
     return self;

iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -662,6 +662,11 @@ class NCCreateScanDocument : NSObject, ImageScannerControllerDelegate {
         
         let scannerVC = ImageScannerController()
         scannerVC.imageScannerDelegate = self
+        scannerVC.navigationBar.isTranslucent = false
+        scannerVC.navigationBar.barTintColor = NCBrandColor.sharedInstance.brand
+        scannerVC.navigationBar.tintColor = NCBrandColor.sharedInstance.brandText
+        scannerVC.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: NCBrandColor.sharedInstance.brandText]
+        
         self.viewController?.present(scannerVC, animated: true, completion: nil)
     }