From dd1b27b28f7c84cc10a4dd632b2175d9171f6c72 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 20 Aug 2014 21:52:54 +0200
Subject: consolidate: small ui things

---
 .../java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 4 ++++
 OpenKeychain/src/main/res/values/strings.xml                          | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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>
-- 
cgit v1.2.3