aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main
diff options
context:
space:
mode:
authorMiroojin Bakshi <gaglu231094@gmail.com>2014-03-10 21:11:14 +0530
committerMiroojin Bakshi <gaglu231094@gmail.com>2014-03-10 21:11:14 +0530
commitb8261d73196380a00c9aaa15e200e092dd041719 (patch)
treef050bf854f70c17520e060a60a7e8409a937ad61 /OpenPGP-Keychain/src/main
parent98da2d0c48eec809009e4c129ef13dd4a6f93cc3 (diff)
parent3372cfacb65e0d0283963bc2b79be76149b7e805 (diff)
downloadopen-keychain-b8261d73196380a00c9aaa15e200e092dd041719.tar.gz
open-keychain-b8261d73196380a00c9aaa15e200e092dd041719.tar.bz2
open-keychain-b8261d73196380a00c9aaa15e200e092dd041719.zip
Merge remote-tracking branch 'upstream/master' into search1
Diffstat (limited to 'OpenPGP-Keychain/src/main')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java3
1 files changed, 3 insertions, 0 deletions
diff --git 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
index f764b879c..ac1f582f1 100644
--- 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())) {