Merge branch '2221' into develop

iOSClient/Brand/File_Provider_Extension.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.22.0</string>
+	<string>2.22.1</string>
 	<key>CFBundleVersion</key>
-	<string>25</string>
+	<string>0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderDocumentGroup</key>

iOSClient/Brand/Notification_Service_Extension.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.22.0</string>
+	<string>2.22.1</string>
 	<key>CFBundleVersion</key>
-	<string>25</string>
+	<string>0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

iOSClient/Brand/Share.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.22.0</string>
+	<string>2.22.1</string>
 	<key>CFBundleVersion</key>
-	<string>25</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.22.0</string>
+	<string>2.22.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -69,7 +69,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>25</string>
+	<string>0</string>
 	<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
 	<true/>
 	<key>Fabric</key>

iOSClient/Favorites/CCFavorites.m

@@ -35,6 +35,8 @@
     NSString *autoUploadFileName;
     NSString *autoUploadDirectory;
     
+    UIDocumentInteractionController *docController;
+    
     // Datasource
     CCSectionDataSourceMetadata *sectionDataSource;
 }
@@ -297,7 +299,7 @@
 {
     NSURL *url = [NSURL fileURLWithPath:[CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileNameView:metadata.fileNameView]];
         
-    UIDocumentInteractionController *docController = [UIDocumentInteractionController interactionControllerWithURL:url];
+    docController = [UIDocumentInteractionController interactionControllerWithURL:url];
     docController.delegate = self;
         
     NSIndexPath *indexPath = [sectionDataSource.fileIDIndexPath objectForKey:metadata.fileID];

iOSClient/Main/CCDetail.h

@@ -33,7 +33,7 @@
 
 @class tableMetadata;
 
-@interface CCDetail : UIViewController <UIDocumentInteractionControllerDelegate, MWPhotoBrowserDelegate, ReaderViewControllerDelegate>
+@interface CCDetail : UIViewController <MWPhotoBrowserDelegate, ReaderViewControllerDelegate>
 
 @property (nonatomic, strong) tableMetadata *metadataDetail;
 @property (nonatomic, strong) NSDate *dateFilterQuery;
@@ -53,9 +53,6 @@
 @property (nonatomic, strong) ReaderViewController *readerPDFViewController;
 @property (nonatomic, strong) NSString *passwordPDF;
 
-// Action
-@property (nonatomic, strong) UIDocumentInteractionController *docController;
-
 @property(nonatomic, weak) IBOutlet UIImageView *imageBackground;
 
 - (void)changeToDisplayMode;

iOSClient/Main/CCDetail.m

@@ -34,10 +34,12 @@
 
 #define alertRequestPasswordPDF 1
 
-@interface CCDetail () <NCTextDelegate>
+@interface CCDetail () <NCTextDelegate, UIDocumentInteractionControllerDelegate>
 {
     AppDelegate *appDelegate;
-        
+    
+    UIDocumentInteractionController *docController;
+    
     UIBarButtonItem *buttonModifyTxt;
     UIBarButtonItem *buttonAction;
     UIBarButtonItem *buttonShare;
@@ -723,14 +725,14 @@
     tableMetadata *metadata = [self.photoDataSource objectAtIndex:index];
     if (metadata == nil) return;
 
-    self.docController = [UIDocumentInteractionController interactionControllerWithURL:[NSURL fileURLWithPath:[CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileNameView:metadata.fileNameView]]];
+    docController = [UIDocumentInteractionController interactionControllerWithURL:[NSURL fileURLWithPath:[CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileNameView:metadata.fileNameView]]];
     
-    self.docController.delegate = self;
+    docController.delegate = self;
     
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
-        [self.docController presentOptionsMenuFromRect:photoBrowser.view.frame inView:photoBrowser.view animated:YES];
+        [docController presentOptionsMenuFromRect:photoBrowser.view.frame inView:photoBrowser.view animated:YES];
     
-    [self.docController presentOptionsMenuFromBarButtonItem:photoBrowser.actionButton animated:YES];
+    [docController presentOptionsMenuFromBarButtonItem:photoBrowser.actionButton animated:YES];
 }
 
 - (void)photoBrowser:(MWPhotoBrowser *)photoBrowser shareButtonPressedForPhotoAtIndex:(NSUInteger)index
@@ -1135,14 +1137,14 @@
     
     NSString *filePath = [CCUtility getDirectoryProviderStorageFileID:self.metadataDetail.fileID fileNameView:self.metadataDetail.fileNameView];
 
-    self.docController = [UIDocumentInteractionController interactionControllerWithURL:[NSURL fileURLWithPath:filePath]];
+    docController = [UIDocumentInteractionController interactionControllerWithURL:[NSURL fileURLWithPath:filePath]];
 
-    self.docController.delegate = self;
+    docController.delegate = self;
     
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
-        [self.docController presentOptionsMenuFromRect:self.view.frame inView:self.view animated:YES];
+        [docController presentOptionsMenuFromRect:self.view.frame inView:self.view animated:YES];
     
-    [self.docController presentOptionsMenuFromBarButtonItem:sender animated:YES];
+    [docController presentOptionsMenuFromBarButtonItem:sender animated:YES];
 }
 
 - (void)shareButtonPressed:(UIBarButtonItem *)sender

iOSClient/Main/CCMain.m

@@ -57,6 +57,7 @@
     NSDate *_lockUntilDate;
 
     UIRefreshControl *_refreshControl;
+    UIDocumentInteractionController *docController;
 
     CCHud *_hud;
     
@@ -2335,7 +2336,7 @@
 {
     NSURL *url = [NSURL fileURLWithPath:[CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileNameView:metadata.fileNameView]];
     
-    UIDocumentInteractionController *docController = [UIDocumentInteractionController interactionControllerWithURL:url];
+    docController = [UIDocumentInteractionController interactionControllerWithURL:url];
     docController.delegate = self;
     
     NSIndexPath *indexPath = [sectionDataSource.fileIDIndexPath objectForKey:metadata.fileID];

iOSClient/Transfers/CCTransfers.m

@@ -68,6 +68,7 @@
     [super viewDidLoad];
     
     // Custom Cell
+    [self.tableView registerNib:[UINib nibWithNibName:@"CCCellMain" bundle:nil] forCellReuseIdentifier:@"CellMain"];
     [self.tableView registerNib:[UINib nibWithNibName:@"CCCellMainTransfer" bundle:nil] forCellReuseIdentifier:@"CellMainTransfer"];
     
     self.tableView.delegate = self;