From 36bc0ae676d9ac9bdf65d00690e8aad07223c51e Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 4 Jun 2014 21:35:13 +0200
Subject: fix bug with bad verifying master keys

---
 .../org/sufficientlysecure/keychain/provider/ProviderHelper.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')

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());
-- 
cgit v1.2.3