Marino Faggiana 6 жил өмнө
parent
commit
b1cb742a64

+ 0 - 11
Share/ShareViewController.m

@@ -299,17 +299,6 @@
     }
 }
 
-- (void)addNetworkingQueue:(CCMetadataNet *)metadataNet
-{
-    id operation;
-   
-    operation = [OCnetworking new];
-    
-    [operation setQueuePriority:metadataNet.priority];
-    
-    [_networkingOperationQueue addOperation:operation];
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Lock Password =====
 #pragma --------------------------------------------------------------------------------------------

+ 0 - 1
iOSClient/AppDelegate.h

@@ -173,7 +173,6 @@
 - (void)changeTheming:(UIViewController *)vc;
 
 // Task Networking
-- (void)addNetworkingOperationQueue:(NSOperationQueue *)netQueue delegate:(id)delegate metadataNet:(CCMetadataNet *)metadataNet;
 - (void)loadAutoDownloadUpload;
 
 // Maintenance Mode

+ 0 - 5
iOSClient/AppDelegate.m

@@ -1138,11 +1138,6 @@
     });
 }
 
-- (void)addNetworkingOperationQueue:(NSOperationQueue *)netQueue delegate:(id)delegate metadataNet:(CCMetadataNet *)metadataNet
-{
-    
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Process Load Download/Upload < k_timerProcess seconds > =====
 #pragma --------------------------------------------------------------------------------------------

+ 5 - 11
iOSClient/Settings/NCEndToEndInitialize.swift

@@ -46,26 +46,20 @@ class NCEndToEndInitialize : NSObject  {
         // Clear all keys 
         CCUtility.clearAllKeysEnd(toEnd: appDelegate.activeAccount)
         
-        let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
         
-        metadataNet.action = actionGetEndToEndPublicKeys
-        appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
+        //metadataNet.action = actionGetEndToEndPublicKeys
     }
     
     func getPrivateKeyCipher() {
         
-        let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
         
-        metadataNet.action = actionGetEndToEndPrivateKeyCipher
-        appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
+        //metadataNet.action = actionGetEndToEndPrivateKeyCipher
     }
     
     func getPublicKeyServer() {
         
-        let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
         
-        metadataNet.action = actionGetEndToEndServerPublicKey
-        appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
+        //metadataNet.action = actionGetEndToEndServerPublicKey
     }
     
     // --------------------------------------------------------------------------------------------
@@ -100,7 +94,7 @@ class NCEndToEndInitialize : NSObject  {
             metadataNet.action = actionSignEndToEndPublicKey;
             metadataNet.key = csr;
             
-            appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
+            //appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
             
         case 409:
             appDelegate.messageNotification("E2E get publicKey", description: "forbidden: the user can't access the public keys", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
@@ -229,7 +223,7 @@ class NCEndToEndInitialize : NSObject  {
                 metadataNet.keyCipher = privateKeyChiper
                 metadataNet.password = e2ePassphrase
                     
-                self.appDelegate.addNetworkingOperationQueue(self.appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
+                //self.appDelegate.addNetworkingOperationQueue(self.appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
             }
             
             alertController.addAction(OKAction)

+ 2 - 2
iOSClient/Settings/NCManageEndToEndEncryption.m

@@ -317,7 +317,7 @@
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:appDelegate.activeAccount];
     
     metadataNet.action = actionDeleteEndToEndPublicKey;
-    [appDelegate addNetworkingOperationQueue:appDelegate.netQueue delegate:self metadataNet:metadataNet];
+    //[appDelegate addNetworkingOperationQueue:appDelegate.netQueue delegate:self metadataNet:metadataNet];
 }
 
 - (void)deletePrivateKey:(XLFormRowDescriptor *)sender
@@ -327,7 +327,7 @@
     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:appDelegate.activeAccount];
     
     metadataNet.action = actionDeleteEndToEndPrivateKey;
-    [appDelegate addNetworkingOperationQueue:appDelegate.netQueue delegate:self metadataNet:metadataNet];
+    //[appDelegate addNetworkingOperationQueue:appDelegate.netQueue delegate:self metadataNet:metadataNet];
 }
 
 #pragma --------------------------------------------------------------------------------------------