aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorAdithya Abraham Philip <adithyaphilip@gmail.com>2015-03-19 20:31:34 +0530
committerAdithya Abraham Philip <adithyaphilip@gmail.com>2015-03-23 15:34:22 +0530
commit19775c399b106149e8906a7482a4b5a4af2ac8fa (patch)
tree6741a8820aaa29adaa05cbfc05cd8f51f0d826b1 /OpenKeychain/src/main/res
parent208434087fe9eb7bd88d491bb14db05e702d7845 (diff)
downloadopen-keychain-19775c399b106149e8906a7482a4b5a4af2ac8fa.tar.gz
open-keychain-19775c399b106149e8906a7482a4b5a4af2ac8fa.tar.bz2
open-keychain-19775c399b106149e8906a7482a4b5a4af2ac8fa.zip
introduced multi-threading
refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/menu/key_list.xml5
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
2 files changed, 7 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 15e098138..c4797d5f7 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -20,6 +20,11 @@
app:showAsAction="never" />
<item
+ android:id="@+id/menu_key_list_update_all_keys"
+ android:title="@string/menu_update_all_keys"
+ app:showAsAction="never" />
+
+ <item
android:id="@+id/menu_key_list_debug_cons"
android:title="Debug / Consolidate"
android:visible="false"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f22a0c533..ffb88b05c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -118,6 +118,7 @@
<string name="menu_add_keys">"Add keys"</string>
<string name="menu_search_cloud">"Search cloud"</string>
<string name="menu_export_all_keys">"Export all keys"</string>
+ <string name="menu_update_all_keys">"Update all keys"</string>
<string name="menu_advanced">"Show advanced info"</string>
<string name="menu_certify_fingerprint">"Confirm via fingerprint comparison"</string>
<string name="menu_export_log">"Export Log"</string>
@@ -316,6 +317,7 @@
<string name="progress_cancelling">"cancelling…"</string>
<string name="progress_saving">"saving…"</string>
<string name="progress_importing">"importing…"</string>
+ <string name="progress_updating">"Updating keys…"</string>
<string name="progress_exporting">"exporting…"</string>
<string name="progress_uploading">"uploading…"</string>
<string name="progress_building_key">"building key…"</string>