marinofaggiana 3 years ago
parent
commit
2c4b7ff7df

+ 10 - 7
iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -107,7 +107,9 @@ class NCNetworkingProcessUpload: NSObject {
                             if let metadata = NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusInUpload) {
                                 NCNetworking.shared.upload(metadata: metadata) {
                                     self.startTimer()
-                                } completion: { (_, _) in }
+                                } completion: { (_, _) in
+                                    // completion
+                                }
                             } else {
                                 self.startTimer()
                             }
@@ -118,13 +120,10 @@ class NCNetworkingProcessUpload: NSObject {
                         if metadata.e2eEncrypted && UIApplication.shared.applicationState == .active {
                             if let metadata = NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusInUpload) {
                                 NCNetworking.shared.upload(metadata: metadata) {
-                                    self.startTimer()
+                                    // start
                                 } completion: { (_, _) in
-                                    
+                                    self.startTimer()
                                 }
-                                //NCNetworking.shared.upload(metadata: metadata) { (_, _) in
-                                //    self.startTimer()
-                                //}
                             } else {
                                 self.startTimer()
                             }
@@ -133,7 +132,11 @@ class NCNetworkingProcessUpload: NSObject {
                         
                         counterUpload += 1
                         if let metadata = NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusInUpload) {
-                            NCNetworking.shared.upload(metadata: metadata) { } completion: { (_, _) in }
+                            NCNetworking.shared.upload(metadata: metadata) {
+                                // start
+                            } completion: { (_, _) in
+                                // completion
+                            }
                         }
                     }
                     

+ 1 - 1
iOSClient/Settings/NCManageEndToEndEncryption.m

@@ -85,7 +85,7 @@
         
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"serviceActivated" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_e2e_settings_activated_", nil)];
         row.cellConfigAtConfigure[@"backgroundColor"] = NCBrandColor.shared.secondarySystemGroupedBackground;
-        [row.cellConfig setObject:[[UIImage imageNamed:@"checkmark.circle.fill"] imageWithColor:[UIColor redColor] size:25] forKey:@"imageView.image"];
+        [row.cellConfig setObject:[[UIImage imageNamed:@"checkmark.circle.fill"] imageWithColor:[UIColor greenColor] size:25] forKey:@"imageView.image"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
         [row.cellConfig setObject:NCBrandColor.shared.label forKey:@"textLabel.textColor"];
         [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];