diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-15 19:17:08 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-15 19:17:08 +0200 |
| commit | 29145e49c96998f220485a8e46cd2b62665b00de (patch) | |
| tree | bb561f91549d8a25c182f92722262467668c61d4 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider | |
| parent | 858fe47d4677d4c727d0696a2d683a349ad2ad3b (diff) | |
| download | open-keychain-29145e49c96998f220485a8e46cd2b62665b00de.tar.gz open-keychain-29145e49c96998f220485a8e46cd2b62665b00de.tar.bz2 open-keychain-29145e49c96998f220485a8e46cd2b62665b00de.zip | |
merge: different msg if nothing was merged
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 2 |
1 files changed, 1 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 c338c9d95..4c09bad45 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -792,7 +792,7 @@ public class ProviderHelper { try { UncachedKeyRing oldPublicRing = getWrappedPublicKeyRing(masterKeyId).getUncachedKeyRing(); - // Merge data from new public ring into secret one + // Merge data from new secret ring into public one publicRing = oldPublicRing.merge(secretRing, mLog, mIndent); if (publicRing == null) { return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog); |