marinofaggiana 4 жил өмнө
parent
commit
375b6b5550

+ 2 - 2
iOSClient/Main/Menu/NCCollectionViewCommon+Menu.swift

@@ -49,7 +49,7 @@ extension NCCollectionViewCommon {
         var actions = [NCMenuAction]()
         let appDelegate = UIApplication.shared.delegate as! AppDelegate
         let serverUrl = metadata.serverUrl+"/"+metadata.fileName
-        let isFolderEncrypted = CCUtility.isFolderEncrypted(serverUrl, e2eEncrypted: metadata.e2eEncrypted, account: metadata.account, urlBase: metadata.urlBase)
+        let isFolderEncrypted = CCUtility.isFolderEncrypted(metadata.serverUrl, e2eEncrypted: metadata.e2eEncrypted, account: metadata.account, urlBase: metadata.urlBase)
         let serverUrlHome = NCUtility.shared.getHomeServer(urlBase: appDelegate.urlBase, account: appDelegate.account)
         var isOffline = false
         
@@ -130,7 +130,7 @@ extension NCCollectionViewCommon {
         }
 
         // All
-        if !metadata.e2eEncrypted {
+        if !isFolderEncrypted { {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_details_", comment: ""),

+ 6 - 6
iOSClient/Utility/CCUtility.m

@@ -1554,14 +1554,14 @@
 {
     NSString *home = [[NCUtility shared] getHomeServerWithUrlBase:urlBase account:account];
         
-    if ([serverUrl isEqualToString:home] || [serverUrl isEqualToString:@".."]) {
-        
-        return false;
-        
-    } else if (e2eEncrypted) {
-        
+    if (e2eEncrypted) {
+    
         return true;
         
+    } else if ([serverUrl isEqualToString:home] || [serverUrl isEqualToString:@".."]) {
+        
+        return false;
+
     } else {
        
         tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@", account, serverUrl]];