diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-04 21:35:13 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-04 21:35:36 +0200 |
| commit | 36bc0ae676d9ac9bdf65d00690e8aad07223c51e (patch) | |
| tree | c932ae8023778c540b0cf6a9763b9f52886e068c /OpenKeychain/src/main/java | |
| parent | 2946d442e5d51a3e65029b1df2032194d3dc7e2e (diff) | |
| download | open-keychain-36bc0ae676d9ac9bdf65d00690e8aad07223c51e.tar.gz open-keychain-36bc0ae676d9ac9bdf65d00690e8aad07223c51e.tar.bz2 open-keychain-36bc0ae676d9ac9bdf65d00690e8aad07223c51e.zip | |
fix bug with bad verifying master keys
Diffstat (limited to 'OpenKeychain/src/main/java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 6 |
1 files changed, 3 insertions, 3 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 9ea1b773e..ca7e622bb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -150,11 +150,11 @@ public class ProviderHelper { if (data != null) { try { result.put(masterKeyId, - UncachedKeyRing.decodePublicFromData(data).getPublicKey()); + UncachedKeyRing.decodeFromData(data).getPublicKey()); } catch(PgpGeneralException e) { - Log.e(Constants.TAG, "Error parsing keyring, skipping."); + Log.e(Constants.TAG, "Error parsing keyring, skipping " + masterKeyId, e); } catch(IOException e) { - Log.e(Constants.TAG, "IO error, skipping keyring"); + Log.e(Constants.TAG, "IO error, skipping keyring" + masterKeyId, e); } } } while (cursor.moveToNext()); |