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

This commit is contained in:
Miroojin Bakshi 2014-03-10 21:11:14 +05:30
commit b8261d7319

View File

@ -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())) {