Marino Faggiana 7 жил өмнө
parent
commit
121c193e22

+ 9 - 4
iOSClient/Main/CCMain.m

@@ -4650,11 +4650,16 @@
         
     } else {
         
-        if (metadata.directory)
-            cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:metadata.iconName] color:[NCBrandColor sharedInstance].brand];
-        else
+        if (metadata.directory) {
+            
+            if (metadata.encrypted)
+                cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:metadata.iconName] color:[UIColor redColor]];
+            else
+                cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:metadata.iconName] color:[NCBrandColor sharedInstance].brand];
+
+        } else {
             cell.file.image = [UIImage imageNamed:metadata.iconName];
-        
+        }
         if (metadata.thumbnailExists)
             [[CCActions sharedInstance] downloadTumbnail:metadata delegate:self];
     }

+ 5 - 0
iOSClient/Security/NCEndToEndEncryption.m

@@ -589,6 +589,11 @@ cleanup:
     bzero(cKey, sizeof(cKey));
     [keyData getBytes:cKey length:AES_KEY_LENGTH];
     
+    // ----- DEBUG Print
+    NSData *printKeyData = [NSData dataWithBytes:cKey length:AES_KEY_LENGTH];
+    NSLog(@"%@", [printKeyData base64EncodedStringWithOptions:0]);
+    // -----------------
+    
     // set up ivec
     unsigned char cIv[AES_IVEC_LENGTH];
     bzero(cIv, AES_IVEC_LENGTH);