From cb2eb8aca2e7aab6243fd3e1a3313c941e3f1998 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 27 Aug 2014 15:42:09 +0200 Subject: small language fixes for previous commit --- .../sufficientlysecure/keychain/pgp/UncachedKeyRing.java | 15 +++++++-------- .../keychain/service/OperationResultParcel.java | 6 +++--- 2 files changed, 10 insertions(+), 11 deletions(-) (limited to 'OpenKeychain/src/main/java/org') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java index 424420e72..65a2fe4a0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -37,7 +37,6 @@ import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.service.OperationResultParcel.LogLevel; import org.sufficientlysecure.keychain.service.OperationResultParcel.LogType; import org.sufficientlysecure.keychain.service.OperationResultParcel.OperationLog; -import org.sufficientlysecure.keychain.service.OperationResults; import org.sufficientlysecure.keychain.util.IterableIterator; import org.sufficientlysecure.keychain.util.Log; @@ -486,7 +485,7 @@ public class UncachedKeyRing { // Replace modified key in the keyring ring = replacePublicKey(ring, modified); if (ring == null) { - log.add(LogLevel.ERROR, LogType.MSG_MG_NO_SECRET_KEYRING, indent); + log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_SECRET_DUMMY, indent); return null; } indent -= 1; @@ -657,7 +656,7 @@ public class UncachedKeyRing { // replace pubkey in keyring ring = replacePublicKey(ring, modified); if (ring == null) { - log.add(LogLevel.ERROR, LogType.MSG_MG_NO_SECRET_KEYRING, indent); + log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_SECRET_DUMMY, indent); return null; } indent -= 1; @@ -702,7 +701,7 @@ public class UncachedKeyRing { if (getMasterKeyId() != masterKeyId || !Arrays.equals(getFingerprint(), other.getFingerprint())) { - log.add(LogLevel.ERROR, LogType.MSG_MG_HETEROGENEOUS, indent); + log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_HETEROGENEOUS, indent); return null; } @@ -750,7 +749,7 @@ public class UncachedKeyRing { // otherwise, just insert the public key result = replacePublicKey(result, key); if (result == null) { - log.add(LogLevel.ERROR, LogType.MSG_MG_NO_SECRET_KEYRING, indent); + log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_SECRET_DUMMY, indent); return null; } } @@ -782,7 +781,7 @@ public class UncachedKeyRing { if (modified != resultKey) { result = replacePublicKey(result, modified); if (result == null) { - log.add(LogLevel.ERROR, LogType.MSG_MG_NO_SECRET_KEYRING, indent); + log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_SECRET_DUMMY, indent); return null; } } @@ -810,7 +809,7 @@ public class UncachedKeyRing { if (modified != resultKey) { result = replacePublicKey(result, modified); if (result == null) { - log.add(LogLevel.ERROR, LogType.MSG_MG_NO_SECRET_KEYRING, indent); + log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_SECRET_DUMMY, indent); return null; } } @@ -827,7 +826,7 @@ public class UncachedKeyRing { return new UncachedKeyRing(result); } catch (IOException e) { - log.add(LogLevel.ERROR, LogType.MSG_MG_FATAL_ENCODE, indent); + log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_ENCODE, indent); return null; } 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 ddc456e34..72cac4856 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -332,14 +332,14 @@ public class OperationResultParcel implements Parcelable { // keyring consolidation + MSG_MG_ERROR_SECRET_DUMMY(R.string.msg_mg_error_secret_dummy), + MSG_MG_ERROR_ENCODE(R.string.msg_mg_error_encode), + MSG_MG_ERROR_HETEROGENEOUS(R.string.msg_mg_error_heterogeneous), MSG_MG_PUBLIC (R.string.msg_mg_public), MSG_MG_SECRET (R.string.msg_mg_secret), - MSG_MG_FATAL_ENCODE (R.string.msg_mg_fatal_encode), - MSG_MG_HETEROGENEOUS (R.string.msg_mg_heterogeneous), MSG_MG_NEW_SUBKEY (R.string.msg_mg_new_subkey), MSG_MG_FOUND_NEW (R.string.msg_mg_found_new), MSG_MG_UNCHANGED (R.string.msg_mg_unchanged), - MSG_MG_NO_SECRET_KEYRING (R.string.msg_mg_no_secret_keyring), // secret key create MSG_CR (R.string.msg_cr), -- cgit v1.2.3