import-log: more minor improvements

3 files changed, 12 insertions, 17 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 1c68a7b0b..96bf3f207 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -390,13 +390,12 @@ public class ProviderHelper {
 
             // get a list of owned secret keys, for verification filtering
             LongSparseArray<WrappedPublicKey> trustedKeys = getAllWrappedMasterKeys();
-            log(LogLevel.INFO, LogType.MSG_IP_TRUST_USING, new String[]{
-                    Integer.toString(trustedKeys.size())
-            });
 
             // classify and order user ids. primary are moved to the front, revoked to the back,
             // otherwise the order in the keyfile is preserved.
-            log(LogLevel.DEBUG, LogType.MSG_IP_UID_CLASSIFYING);
+            log(LogLevel.INFO, LogType.MSG_IP_UID_CLASSIFYING, new String[]{
+                    Integer.toString(trustedKeys.size())
+            });
             mIndent += 1;
             List<UserIdItem> uids = new ArrayList<UserIdItem>();
             for (String userId : new IterableIterator<String>(
@@ -471,18 +470,18 @@ public class ProviderHelper {
                         });
                     }
                 }
-                mIndent -= 1;
 
                 if (unknownCerts > 0) {
                     log(LogLevel.DEBUG, LogType.MSG_IP_UID_CERTS_UNKNOWN, new String[]{
                             Integer.toString(unknownCerts)
                     });
                 }
+                mIndent -= 1;
 
             }
             mIndent -= 1;
 
-            log(LogLevel.INFO, LogType.MSG_IP_UID_INSERT);
+            log(LogLevel.DEBUG, LogType.MSG_IP_UID_REORDER);
             // primary before regular before revoked (see UserIdItem.compareTo)
             // this is a stable sort, so the order of keys is otherwise preserved.
             Collections.sort(uids);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
index 9790d216d..f83dc796f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
@@ -133,14 +133,12 @@ public class OperationResultParcel implements Parcelable {
         MSG_IP_SUBKEY_FLAGS_XXX (R.string.msg_ip_subkey_flags_xxx),
         MSG_IP_SUBKEY_FUTURE (R.string.msg_ip_subkey_future),
         MSG_IP_SUCCESS (R.string.msg_ip_success),
-        MSG_IP_TRUST_RETRIEVE (R.string.msg_ip_trust_retrieve),
-        MSG_IP_TRUST_USING (R.string.msg_ip_trust_using),
         MSG_IP_UID_CERT_BAD (R.string.msg_ip_uid_cert_bad),
         MSG_IP_UID_CERT_ERROR (R.string.msg_ip_uid_cert_error),
         MSG_IP_UID_CERT_GOOD (R.string.msg_ip_uid_cert_good),
         MSG_IP_UID_CERTS_UNKNOWN (R.string.msg_ip_uid_certs_unknown),
         MSG_IP_UID_CLASSIFYING (R.string.msg_ip_uid_classifying),
-        MSG_IP_UID_INSERT (R.string.msg_ip_uid_insert),
+        MSG_IP_UID_REORDER(R.string.msg_ip_uid_reorder),
         MSG_IP_UID_PROCESSING (R.string.msg_ip_uid_processing),
         MSG_IP_UID_REVOKED (R.string.msg_ip_uid_revoked),
         MSG_IP_UID_SELF_BAD (R.string.msg_ip_uid_self_bad),
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 41cf0d246..c57347055 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -534,14 +534,12 @@
     <string name="msg_ip_subkey_future">Subkey creation date lies in the future! (%s)</string>
     <string name="msg_ip_success">Successfully imported public keyring</string>
     <string name="msg_ip_reinsert_secret">Re-inserting secret key</string>
-    <string name="msg_ip_trust_retrieve">Retrieving trusted keys</string>
-    <string name="msg_ip_trust_using">Using %s trusted keys</string>
     <string name="msg_ip_uid_cert_bad">Encountered bad certificate!</string>
     <string name="msg_ip_uid_cert_error">Error processing certificate!</string>
     <string name="msg_ip_uid_cert_good">Found good certificate from %1$s (%2$s)</string>
-    <string name="msg_ip_uid_certs_unknown">Ignored %s certificates from unknown pubkeys</string>
-    <string name="msg_ip_uid_classifying">Classifying user ids</string>
-    <string name="msg_ip_uid_insert">Inserting user ids</string>
+    <string name="msg_ip_uid_certs_unknown">Ignoring %s certificates from unknown pubkeys</string>
+    <string name="msg_ip_uid_classifying">Classifying user ids, using %s trusted signatures</string>
+    <string name="msg_ip_uid_reorder">Re-ordering user ids</string>
     <string name="msg_ip_uid_processing">Processing user id %s</string>
     <string name="msg_ip_uid_revoked">Found uid revocation certificate</string>
     <string name="msg_ip_uid_self_bad">Bad self certificate encountered!</string>
@@ -567,15 +565,15 @@
     <string name="msg_kc_revoke_bad">Removing bad keyring revocation key</string>
     <string name="msg_kc_revoke_dup">Removing redundant keyring revocation key</string>
     <string name="msg_kc_sub">Processing subkey %s</string>
-    <string name="msg_kc_sub_bad">Subkey binding certificate verification failed!</string>
-    <string name="msg_kc_sub_bad_err">Subkey binding certificate verification failed with an error!</string>
+    <string name="msg_kc_sub_bad">Removing invalid subkey binding certificate</string>
+    <string name="msg_kc_sub_bad_err">Removing bad subkey binding certificate!</string>
     <string name="msg_kc_sub_bad_keyid">Subkey binding issuer id mismatch</string>
     <string name="msg_kc_sub_bad_type">Unknown subkey certificate type: %s</string>
     <string name="msg_kc_sub_no_cert">No valid certificate found for %s, removing from ring!</string>
     <string name="msg_kc_sub_revoke_bad_err">Removing bad subkey revocation key</string>
     <string name="msg_kc_sub_revoke_bad">Removing bad subkey revocation key</string>
     <string name="msg_kc_sub_revoke_dup">Removing redundant keyring revocation key</string>
-    <string name="msg_kc_sub_success">OK</string>
+    <string name="msg_kc_sub_success">Subkey binding OK</string>
     <string name="msg_kc_success">Keyring canonicalization successful</string>
     <string name="msg_kc_success_removed">Keyring canonicalization successful, removed %s certificates</string>
     <string name="msg_kc_uid_bad_err">Removing bad self certificate for user id %s</string>