clear old code

iOSClient/CCGlobal.h

@@ -187,43 +187,22 @@
 // Search
 #define k_minCharsSearch                                2
 
-// Metadata.Net SELECTOR
+// Selector
 #define selectorDownloadSynchronize                     @"downloadSynchronize"
-#define selectorGetUserAndGroup                         @"getUserAndGroup"
 #define selectorLoadFileView                            @"loadFileView"
-#define selectorLoadModelView                           @"loadModelView"
 #define selectorLoadViewImage                           @"loadViewImage"
 #define selectorLoadCopy                                @"loadCopy"
 #define selectorLoadOffline                             @"loadOffline"
-#define selectorMove                                    @"move"
 #define selectorOpenIn                                  @"openIn"
-#define selectorOpenWindowShare                         @"openWindowShare"
 #define selectorReadFile                                @"readFile"
 #define selectorReadFileWithDownload                    @"readFileWithDownload"
-#define selectorReadFileReloadFolder                    @"readFileReloadFolder"
 #define selectorReadFolder                              @"readFolder"
 #define selectorReadFolderWithDownload                  @"readFolderWithDownload"
-#define selectorReadShare                               @"readShare"
-#define selectorRename                                  @"rename"
 #define selectorSave                                    @"save"
-#define selectorShare                                   @"share"
-#define selectorSearchFiles                             @"searchFiles"
-#define selectorSearchContentType                       @"searchContentType"
-#define selectorUnshare                                 @"unshare"
-#define selectorUpdateShare                             @"updateShare"
 #define selectorUploadAutoUpload                        @"uploadAutoUpload"
 #define selectorUploadAutoUploadAll                     @"uploadAutoUploadAll"
 #define selectorUploadFile                              @"uploadFile"
 
-// Metadata.Net ACTION
-#define actionGetEndToEndPublicKeys                     @"getEndToEndPublicKeys"
-#define actionGetEndToEndPrivateKeyCipher               @"getEndToEndPrivateKeyCipher"
-#define actionSignEndToEndPublicKey                     @"signEndToEndPublicKey"
-#define actionStoreEndToEndPrivateKeyCipher             @"storeEndToEndPrivateKeyCipher"
-#define actionDeleteEndToEndPublicKey                   @"deleteEndToEndPublicKey"
-#define actionDeleteEndToEndPrivateKey                  @"deleteEndToEndPrivateKey"
-#define actionGetEndToEndServerPublicKey                @"getEndToEndServerPublicKey"
-
 // Metadata : FileType
 #define k_metadataTypeFile_audio                        @"audio"
 #define k_metadataTypeFile_compress                     @"compress"

iOSClient/Settings/NCEndToEndInitialize.swift

@@ -89,10 +89,10 @@ class NCEndToEndInitialize : NSObject  {
                 return
             }
             
-            let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
+            //let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
             
-            metadataNet.action = actionSignEndToEndPublicKey;
-            metadataNet.key = csr;
+            //metadataNet.action = actionSignEndToEndPublicKey;
+            //metadataNet.key = csr;
             
             //appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
             
@@ -216,6 +216,7 @@ class NCEndToEndInitialize : NSObject  {
                     return
                 }
                 
+                /*
                 let metadataNet: CCMetadataNet = CCMetadataNet.init(account: self.appDelegate.activeAccount)
 
                 metadataNet.action = actionStoreEndToEndPrivateKeyCipher
@@ -223,7 +224,8 @@ 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)

iOSClient/Settings/NCManageEndToEndEncryption.m

@@ -314,9 +314,9 @@
 {
     [self deselectFormRow:sender];
     
-    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:appDelegate.activeAccount];
+    //CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:appDelegate.activeAccount];
     
-    metadataNet.action = actionDeleteEndToEndPublicKey;
+    //metadataNet.action = actionDeleteEndToEndPublicKey;
     //[appDelegate addNetworkingOperationQueue:appDelegate.netQueue delegate:self metadataNet:metadataNet];
 }
 
@@ -324,9 +324,9 @@
 {
     [self deselectFormRow:sender];
     
-    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:appDelegate.activeAccount];
+    //CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:appDelegate.activeAccount];
     
-    metadataNet.action = actionDeleteEndToEndPrivateKey;
+    //metadataNet.action = actionDeleteEndToEndPrivateKey;
     //[appDelegate addNetworkingOperationQueue:appDelegate.netQueue delegate:self metadataNet:metadataNet];
 }