Merge remote-tracking branch 'upstream/master' into search1

2014-03-10 21:11:14 +05:30
parent 98da2d0c48 3372cfacb6
commit b8261d7319
1 changed files with 3 additions and 0 deletions
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
@@ -155,6 +155,9 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
        if ( !(pgpKeyRing instanceof PGPSecretKeyRing) ) {
            secretKey = false;
        }
+        else{
+            secretKey = true;
+        }

        userIds = new ArrayList<String>();
        for (String userId : new IterableIterator<String>(pgpKeyRing.getPublicKey().getUserIDs())) {