nextcloud
/
ios
зеркало из https://github.com/nextcloud/ios.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

clear code

This commit is contained in:
Marino Faggiana 2018-02-17 17:19:33 +01:00 коммит произвёл Marino Faggiana
Родитель d1e2b80fca
Коммит fa1f254bd6
2 изменённых файлов: 2 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

25
iOSClient/Main/CCMain.m
Просмотреть файл

@ -4193,7 +4193,7 @@
type:AHKActionSheetButtonTypeEncrypted type:AHKActionSheetButtonTypeEncrypted
handler:^(AHKActionSheet *as) { handler:^(AHKActionSheet *as) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
NSError *error = [[NCNetworkingSync sharedManager] deletemarkEndToEndFolderEncrypted:appDelegate.activeUser userID:appDelegate.activeUserID password:appDelegate.activePassword url:appDelegate.activeUrl fileID:_metadata.fileID serverUrl:[NSString stringWithFormat:@"%@/%@", self.serverUrl, _metadata.fileName]]; NSError *error = [[NCNetworkingSync sharedManager] deletemarkEndToEndFolderEncrypted:appDelegate.activeUser userID:appDelegate.activeUserID password:appDelegate.activePassword url:appDelegate.activeUrl fileID:_metadata.fileID serverUrl:[NSString stringWithFormat:@"%@/%@", self.serverUrl, _metadata.fileName]];
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
if (error) { if (error) {
@ -4206,28 +4206,7 @@
}); });
}]; }];
} }
if (directory.e2eTokenLock.length > 0 && [CCUtility isEndToEndEnabled:appDelegate.activeAccount]) {
[actionSheet addButtonWithTitle:NSLocalizedString(@"_e2e_remove_folder_lock_", nil)
image:[UIImage imageNamed:@"encrypted_empty"]
backgroundColor:[NCBrandColor sharedInstance].backgroundView
height:50.0
type:AHKActionSheetButtonTypeEncrypted
handler:^(AHKActionSheet *as) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
NSError *error = [[NCNetworkingSync sharedManager] unlockEndToEndFolderEncrypted:appDelegate.activeUser userID:appDelegate.activeUserID password:appDelegate.activePassword url:appDelegate.activeUrl serverUrl:self.serverUrl fileID:_metadata.fileID token:directory.e2eTokenLock];
if (error) {
dispatch_async(dispatch_get_main_queue(), ^{
[appDelegate messageNotification:@"_e2e_error_unlock_" description:error.localizedDescription visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:error.code];
});
}
});
}];
}
[actionSheet show]; [actionSheet show];
} }

1
iOSClient/Supporting Files/en.lproj/Localizable.strings
Просмотреть файл

@ -512,7 +512,6 @@
"_e2e_remove_folder_encrypted_" = "Decrypt"; "_e2e_remove_folder_encrypted_" = "Decrypt";
"_e2e_goto_settings_for_enable_" = "This is an encrypted directory, go to \"Settings\" and enable end-to-end encryption"; "_e2e_goto_settings_for_enable_" = "This is an encrypted directory, go to \"Settings\" and enable end-to-end encryption";
"_e2e_delete_folder_not_permitted_" = "Deletion of the directory marked as 'encrypted' is not allowed"; "_e2e_delete_folder_not_permitted_" = "Deletion of the directory marked as 'encrypted' is not allowed";
"_e2e_remove_folder_lock_" = "Force remove folder lock";
"_e2e_error_encode_metadata_" = "Serious internal error in encoding metadata"; "_e2e_error_encode_metadata_" = "Serious internal error in encoding metadata";
"_e2e_error_decode_metadata_" = "Serious internal error in decoding metadata"; "_e2e_error_decode_metadata_" = "Serious internal error in decoding metadata";
"_e2e_error_create_encrypted_" = "Could not create encrypted file"; "_e2e_error_create_encrypted_" = "Could not create encrypted file";