diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-15 19:22:40 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-15 19:22:40 +0200 |
| commit | 72237a08924e60f0ee5d57f5b1e6735ece9172c1 (patch) | |
| tree | fe8dfc0ea12f43bc717bc63ceb71a0193fcc5f75 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider | |
| parent | e1d505a2910e6b28bde5183d8b6275df62dd3862 (diff) | |
| download | open-keychain-72237a08924e60f0ee5d57f5b1e6735ece9172c1.tar.gz open-keychain-72237a08924e60f0ee5d57f5b1e6735ece9172c1.tar.bz2 open-keychain-72237a08924e60f0ee5d57f5b1e6735ece9172c1.zip | |
some fixes for edit
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..ea0d2ea39 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -756,7 +756,7 @@ public class ProviderHelper { UncachedKeyRing oldSecretRing = getWrappedSecretKeyRing(masterKeyId).getUncachedKeyRing(); // Merge data from new secret ring into old one - secretRing = oldSecretRing.merge(secretRing, mLog, mIndent); + secretRing = secretRing.merge(oldSecretRing, mLog, mIndent); // If this is null, there is an error in the log so we can just return if (secretRing == null) { |