aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-08-20 21:52:54 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-08-20 21:52:54 +0200
commitdd1b27b28f7c84cc10a4dd632b2175d9171f6c72 (patch)
tree77b467c005526ba7472ee15afb9d21b363fbef8c /OpenKeychain/src
parent6c428fa6b58fcaa8f681baa9ec5b98625c9cef91 (diff)
downloadopen-keychain-dd1b27b28f7c84cc10a4dd632b2175d9171f6c72.tar.gz
open-keychain-dd1b27b28f7c84cc10a4dd632b2175d9171f6c72.tar.bz2
open-keychain-dd1b27b28f7c84cc10a4dd632b2175d9171f6c72.zip
consolidate: small ui things
Diffstat (limited to 'OpenKeychain/src')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java4
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml3
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 47f4682c7..717d3c5ba 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -832,6 +832,8 @@ public class ProviderHelper {
log(LogLevel.START, LogType.MSG_CON);
mIndent += 1;
+ progress.setProgress(R.string.progress_con_saving, 0, 100);
+
try {
log(LogLevel.DEBUG, LogType.MSG_CON_SAVE_SECRET);
@@ -891,6 +893,8 @@ public class ProviderHelper {
mIndent -= 1;
}
+ progress.setProgress(R.string.progress_con_saving, 3, 100);
+
// 1b. fetch all public keyrings into a cache file
try {
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 71f4504d7..c4697cac3 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -302,7 +302,8 @@
<string name="progress_verifying_integrity">verifying integrity…</string>
<string name="progress_deleting_securely">deleting \'%s\' securely…</string>
- <string name="progress_con_reimport">reimporting database…</string>
+ <string name="progress_con_saving">consolidate: saving to cache…</string>
+ <string name="progress_con_reimport">consolidate: reimporting…</string>
<!-- action strings -->
<string name="hint_keyserver_search_hint">Name/Email/Key ID…</string>