Browse Source

V 4.9.5 (#2705)

Fix E2ee
Marino Faggiana 1 year ago
parent
commit
a83f6c4eb1

+ 4 - 4
Nextcloud.xcodeproj/project.pbxproj

@@ -4873,7 +4873,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 0;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -4899,7 +4899,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.9.4;
+				MARKETING_VERSION = 4.9.5;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
@@ -4938,7 +4938,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 0;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -4961,7 +4961,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.9.4;
+				MARKETING_VERSION = 4.9.5;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;

+ 3 - 1
iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -1105,7 +1105,9 @@ extension NCManageDatabase {
                 }
                 if metadatasChangedCount != 0 || metadatasChanged {
                     realm.delete(results)
-                    realm.add(metadatas, update: .all)
+                    for metadata in metadatas {
+                        realm.add(tableMetadata(value: metadata), update: .all)
+                    }
                 }
             }
         } catch let error {

+ 0 - 22
iOSClient/Settings/CCAdvanced.m

@@ -250,18 +250,6 @@
     row.action.formSelector = @selector(clearCacheRequest:);
     [sectionSize addFormRow:row];
 
-#ifdef DEBUG
-    // Clear all cache
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"azzeraallcache" rowType:XLFormRowDescriptorTypeButton title:@"Clear all cache"];
-    row.cellConfigAtConfigure[@"backgroundColor"] = UIColor.secondarySystemGroupedBackgroundColor;
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
-    [row.cellConfig setObject:[UIColor blueColor] forKey:@"textLabel.textColor"];
-    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-    [row.cellConfig setObject:[[UIImage imageNamed:@"trash"] imageWithColor:[UIColor blueColor] size:25] forKey:@"imageView.image"];
-    row.action.formSelector = @selector(clearAllCacheRequest:);
-    [sectionSize addFormRow:row];
-#endif
-
     // Section EXIT --------------------------------------------------------
     
     section = [XLFormSectionDescriptor formSection];
@@ -422,16 +410,6 @@
     [self presentViewController:alertController animated:YES completion:nil];
 }
 
-- (void)clearAllCacheRequest:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-
-    [[NCActivityIndicator shared] startActivityWithBackgroundView:nil style: UIActivityIndicatorViewStyleLarge blurEffect:true];
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^(void) {
-        [self clearCache:nil];
-    });
-}
-
 - (void)calculateSize
 {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{