mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-25 08:28:50 -05:00
Merge remote-tracking branch 'upstream/master' into search1
This commit is contained in:
commit
b8261d7319
@ -155,6 +155,9 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
|
|||||||
if ( !(pgpKeyRing instanceof PGPSecretKeyRing) ) {
|
if ( !(pgpKeyRing instanceof PGPSecretKeyRing) ) {
|
||||||
secretKey = false;
|
secretKey = false;
|
||||||
}
|
}
|
||||||
|
else{
|
||||||
|
secretKey = true;
|
||||||
|
}
|
||||||
|
|
||||||
userIds = new ArrayList<String>();
|
userIds = new ArrayList<String>();
|
||||||
for (String userId : new IterableIterator<String>(pgpKeyRing.getPublicKey().getUserIDs())) {
|
for (String userId : new IterableIterator<String>(pgpKeyRing.getPublicKey().getUserIDs())) {
|
||||||
|
Loading…
Reference in New Issue
Block a user