Marino Faggiana 7 жил өмнө
parent
commit
d1339b5fc0

+ 14 - 24
iOSClient/Main/CCMain.m

@@ -2319,30 +2319,6 @@
     [self reloadDatasource];
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Encrypted/Decrypted File =====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)encryptedSelectedFiles
-{
-}
-
-- (void)decryptedSelectedFiles
-{
-}
-
-- (void)cmdEncryptedDecryptedFile
-{
-}
-
-- (void)encryptedFile:(tableMetadata *)metadata
-{
-}
-
-- (void)decryptedFile:(tableMetadata *)metadata
-{
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Progress & Task Button =====
 #pragma --------------------------------------------------------------------------------------------
@@ -4059,6 +4035,20 @@
                                     }];
         }
         
+        if ([CCUtility isEndToEndEnabled:app.activeAccount]) {
+            
+            [actionSheet addButtonWithTitle:@"Get metadata file"
+                                      image:[UIImage imageNamed:@"actionSheetCrypto"]
+                            backgroundColor:[UIColor whiteColor]
+                                     height: 50.0
+                                       type:AHKActionSheetButtonTypeEncrypted
+                                    handler:^(AHKActionSheet *as) {
+                                        
+                                        [app.endToEndInterface getEndToEndMetadata:_metadata];
+                                    }];
+        }
+        
+        
 #endif
         
         if (!([_metadata.fileName isEqualToString:autoUploadFileName] == YES && [serverUrl isEqualToString:autoUploadDirectory] == YES)) {

+ 31 - 0
iOSClient/Security/NCEntoToEndInterface.swift

@@ -447,6 +447,37 @@ class NCEntoToEndInterface : NSObject, OCNetworkingDelegate  {
         appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
     }
     
+    // --------------------------------------------------------------------------------------------
+    // MARK: Metadata
+    // --------------------------------------------------------------------------------------------
+    
+    func getEndToEndMetadataSuccess(_ metadataNet: CCMetadataNet!) {
+        print("E2E get metadata file success")
+    }
+    
+    func getEndToEndMetadataFailure(_ metadataNet: CCMetadataNet!, message: String!, errorCode: Int) {
+        
+        // Unauthorized
+        if (errorCode == kOCErrorServerUnauthorized) {
+            appDelegate.openLoginView(appDelegate.activeMain, loginType: loginModifyPasswordUser)
+        }
+        
+        if (errorCode != kOCErrorServerUnauthorized) {
+            
+            appDelegate.messageNotification("_error_", description: message as String!, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
+        }
+    }
+    
+    @objc func getEndToEndMetadata(_ metadata: tableMetadata) {
+        
+        let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
+        
+        metadataNet.action = actionGetEndToEndMetadata;
+        metadataNet.fileID = metadata.fileID;
+        
+        appDelegate.addNetworkingOperationQueue(appDelegate.netQueue, delegate: self, metadataNet: metadataNet)
+    }
+    
     // --------------------------------------------------------------------------------------------
     // MARK: Form
     // --------------------------------------------------------------------------------------------