Parcourir la source

Add encrypted status on image (temp)

Marino Faggiana il y a 7 ans
Parent
commit
665d28ac50

BIN
iOSClient/Images.xcassets/encrypted.imageset/encrypted.png


BIN
iOSClient/Images.xcassets/encrypted.imageset/encrypted@2x.png


BIN
iOSClient/Images.xcassets/encrypted.imageset/encrypted@3x.png


+ 5 - 2
iOSClient/Main/CCMain.m

@@ -4694,8 +4694,11 @@
     // Image Status Encrypted
     // ----------------------------------------------------------------------------------------------------------
     
-   // if (metadata.encrypted)
-   //     cell.status.image = [UIImage imageNamed:@"encrypted"];
+    if (_folderEncrypted && !metadata.directory) {
+        tableE2eEncryption *tableE2eEncryption = [[NCManageDatabase sharedInstance] getE2eEncryptionWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND fileNameIdentifier = %@", app.activeAccount, metadata.fileName]];
+        if (tableE2eEncryption)
+            cell.status.image = [UIImage imageNamed:@"encrypted"];
+    }
     
     // ----------------------------------------------------------------------------------------------------------
     // Favorite

+ 2 - 1
iOSClient/Utility/CCUtility.m

@@ -921,7 +921,8 @@
     for (tableMetadata *metadata in metadatas) {
         
         NSString *serverUrlEncrypted = [NSString stringWithFormat:@"%@/%@", [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID], metadata.fileName];
-        if ([serverUrl containsString:serverUrlEncrypted])
+        //if ([serverUrl containsString:serverUrlEncrypted])
+        if ([serverUrl isEqualToString:serverUrlEncrypted])
             return true;
     }