Merge pull request #576 from Valodim/stripped-secretkeys

Support stripped secretkeys
2014-04-16 19:40:36 +02:00
parent 676262b052 8b4700d521
commit b0c65729a9
13 changed files with 130 additions and 32 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -685,7 +685,7 @@ public class KeychainIntentService extends IntentService
                }

                Cursor cursor = getContentResolver().query(KeyRings.buildUnifiedKeyRingsUri(),
-                        new String[]{KeyRings.MASTER_KEY_ID, KeyRings.HAS_SECRET},
+                        new String[]{KeyRings.MASTER_KEY_ID, KeyRings.HAS_ANY_SECRET},
                        selection, null, null);
                try {
                    cursor.moveToFirst();