浏览代码

add en string

Marino Faggiana 7 年之前
父节点
当前提交
0ea561ebb5
共有 2 个文件被更改,包括 13 次插入4 次删除
  1. 11 4
      iOSClient/Main/CCMain.m
  2. 2 0
      iOSClient/Supporting Files/en.lproj/Localizable.strings

+ 11 - 4
iOSClient/Main/CCMain.m

@@ -1832,7 +1832,7 @@
         if ([CCUtility isEndToEndEnabled:app.activeAccount])
             [app.endToEndInterface getEndToEndMetadata:metadataFolder];
         else
-            [app messageNotification:@"_info_" description:@"You are in a encrypted directory, go to on \"Settings\" and enable the End-To-End Encryption" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo errorCode:0];            
+            [app messageNotification:@"_info_" description:@"_e2e_goto_settings_for_enable_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo errorCode:0];            
     }
 }
 
@@ -4997,11 +4997,18 @@
             [self downloadFileSuccess:_metadata.fileID serverUrl:serverUrl selector:selectorLoadFileView selectorPost:nil];
             
         } else {
+            
+            if ([CCUtility isFolderEncrypted:self.serverUrl account:app.activeAccount] && ![CCUtility isEndToEndEnabled:app.activeAccount]) {
+                
+                [app messageNotification:@"_info_" description:@"_e2e_goto_settings_for_enable_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo errorCode:0];
                 
-            [[CCNetworking sharedNetworking] downloadFile:_metadata.fileID serverUrl:serverUrl selector:selectorLoadFileView selectorPost:nil session:k_download_session taskStatus:k_taskStatusResume delegate:self];
+            } else {
             
-            NSIndexPath *indexPath = [_sectionDataSource.fileIDIndexPath objectForKey:_metadata.fileID];
-            if (indexPath) [self.tableView reloadRowsAtIndexPaths:[NSArray arrayWithObjects:indexPath, nil] withRowAnimation:UITableViewRowAnimationAutomatic];
+                [[CCNetworking sharedNetworking] downloadFile:_metadata.fileID serverUrl:serverUrl selector:selectorLoadFileView selectorPost:nil session:k_download_session taskStatus:k_taskStatusResume delegate:self];
+            
+                NSIndexPath *indexPath = [_sectionDataSource.fileIDIndexPath objectForKey:_metadata.fileID];
+                if (indexPath) [self.tableView reloadRowsAtIndexPaths:[NSArray arrayWithObjects:indexPath, nil] withRowAnimation:UITableViewRowAnimationAutomatic];
+            }
         }
     }
     

+ 2 - 0
iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -506,3 +506,5 @@
 "_e2e_settings_remove_message_"     = "Confirm removing encryption along with the passphrase.";
 "_e2e_set_folder_encrypted_"        = "Set as encrypted";
 "_e2e_remove_folder_encrypted_"     = "Remove as encrypted";
+"_e2e_goto_settings_for_enable_"    = "You are in a encrypted directory, go to on \"Settings\" and enable the End-To-End Encryption";
+