Merge branch 'develop'

iOSClient/AppDelegate.m

@@ -900,19 +900,25 @@
     [buttonPlus setTranslatesAutoresizingMaskIntoConstraints:NO];
     [tabBarController.tabBar addSubview:buttonPlus];
     
-    constraint =[NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeCenterX multiplier:1.0 constant:0];
+    multiplier = 1.0;
+    // X
+    constraint =[NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeCenterX multiplier:multiplier constant:0];
     [tabBarController.view addConstraint:constraint];
-    
-    multiplier = 1 * (tabBarController.tabBar.frame.size.height - safeAreaBottom) / tabBarController.tabBar.frame.size.height;
-    constraint =[NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeCenterY relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeCenterY multiplier:multiplier constant:0];
+    // Y
+    if (safeAreaBottom == 0) {
+        constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeCenterY relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeCenterY multiplier:multiplier constant:0];
+    } else {
+        constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeCenterY multiplier:1.0 constant:+5];
+    }
     [tabBarController.view addConstraint:constraint];
     
-    multiplier = 0.8 * (tabBarController.tabBar.frame.size.height - safeAreaBottom) / tabBarController.tabBar.frame.size.height;
     
-    constraint =[NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeHeight multiplier:multiplier constant:0];
+    multiplier = 0.8 * (tabBarController.tabBar.frame.size.height - safeAreaBottom) / tabBarController.tabBar.frame.size.height;
+    // Width
+    constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeHeight multiplier:multiplier constant:0];
     [tabBarController.view addConstraint:constraint];
-    
-    constraint =[NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeHeight multiplier:multiplier constant:0];
+    // Height
+    constraint = [NSLayoutConstraint constraintWithItem:buttonPlus attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:tabBarController.tabBar attribute:NSLayoutAttributeHeight multiplier:multiplier constant:0];
     [tabBarController.view addConstraint:constraint];
 }
 

iOSClient/Brand/Picker.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.21.2</string>
+	<string>2.21.3</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>1</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

iOSClient/Brand/PickerFileProvider.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.21.2</string>
+	<string>2.21.3</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderDocumentGroup</key>

iOSClient/Brand/Share.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.21.2</string>
+	<string>2.21.3</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>1</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.21.2</string>
+	<string>2.21.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -69,7 +69,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>1</string>
 	<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
 	<true/>
 	<key>Fabric</key>

iOSClient/Main/CCMain.m

@@ -50,8 +50,6 @@
     NSUInteger _numSelectedFileIDsMetadatas;
     NSMutableArray *_queueSelector;
     
-    NSMutableDictionary *_statusSwipeCell;
-    
     UIImageView *_ImageTitleHomeCryptoCloud;
     
     NSString *_directoryGroupBy;
@@ -132,7 +130,6 @@
     _metadata = [tableMetadata new];
     _hud = [[CCHud alloc] initWithView:[[[UIApplication sharedApplication] delegate] window]];
     _selectedFileIDsMetadatas = [NSMutableDictionary new];
-    _statusSwipeCell = [NSMutableDictionary new];
     _queueSelector = [NSMutableArray new];
     _isViewDidLoad = YES;
     _fatherPermission = @"";
@@ -4302,14 +4299,6 @@
     // store selected cells before relod
     NSArray *indexPaths = [self.tableView indexPathsForSelectedRows];
     
-    //store swipeOffset before relod
-    [_statusSwipeCell removeAllObjects];
-    for (MGSwipeTableCell *cell in self.tableView.visibleCells) {
-        NSIndexPath *indexPath = [self.tableView indexPathForCell:cell];
-        if (cell != nil && indexPath != nil)
-            [_statusSwipeCell setObject:[NSNumber numberWithDouble:cell.swipeOffset] forKey:indexPath];
-    }
-    
     // reload table view
     [self.tableView reloadData];
     
@@ -4859,16 +4848,6 @@
     //centerIconOverText
     MGSwipeButton *deleteButton = (MGSwipeButton *)[cell.rightButtons objectAtIndex:0];
     [deleteButton centerIconOverText];
-
-    //restore swipeOffset after relod
-    CGFloat swipeOffset = [[_statusSwipeCell objectForKey:indexPath] doubleValue];
-    if (swipeOffset < 0) {
-        [cell showSwipe:MGSwipeDirectionRightToLeft animated:NO];
-        [_statusSwipeCell removeObjectForKey:indexPath];
-    } else if (swipeOffset > 0) {
-        [cell showSwipe:MGSwipeDirectionLeftToRight animated:NO];
-        [_statusSwipeCell removeObjectForKey:indexPath];
-    }
     
     // ----------------------------------------------------------------------------------------------------------
     // more

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -374,6 +374,7 @@
 "_search_sub_folder_"           = "Search here and in subfolders";
 
 "_theming_is_light_"            = "Server theming too brightly coloured, not applicable";
+"_cancel_all_task_"             = "Cancel all transfers";
 
 // Files Preview
 

iOSClient/Utility/CCUtility.m

@@ -741,7 +741,8 @@
 
 + (NSString *)getHomeServerUrlActiveUrl:(NSString *)activeUrl
 {
-    if (activeUrl == nil) return nil;
+    if (activeUrl == nil)
+        return @"";
     
     return [activeUrl stringByAppendingString:webDAV];
 }