moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-16 13:55:03 -05:00
Code Issues Releases Wiki Activity

Merge branch 'development' of github.com:open-keychain/open-keychain into development

Browse Source
This commit is contained in:
Dominik Schürmann 2015-05-06 13:56:36 +02:00
commit 13dff41350
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
View File

@ -275,7 +275,7 @@ public class ImportExportOperation extends BaseOperation {
// If we have an expected fingerprint, make sure it matches // If we have an expected fingerprint, make sure it matches
if (entry.mExpectedFingerprint != null) { if (entry.mExpectedFingerprint != null) {
if(!KeyFormattingUtils.convertFingerprintToHex(key.getFingerprint()).equals(entry.mExpectedFingerprint)) { if (!key.containsSubkey(entry.mExpectedFingerprint)) {
log.add(LogType.MSG_IMPORT_FINGERPRINT_ERROR, 2); log.add(LogType.MSG_IMPORT_FINGERPRINT_ERROR, 2);
badKeys += 1; badKeys += 1;
continue; continue;
@ -314,10 +314,7 @@ public class ImportExportOperation extends BaseOperation {
log.add(result, 2); log.add(result, 2);
} catch (IOException e) { } catch (IOException | PgpGeneralException e) {
Log.e(Constants.TAG, "Encountered bad key on import!", e);
++badKeys;
} catch (PgpGeneralException e) {
Log.e(Constants.TAG, "Encountered bad key on import!", e); Log.e(Constants.TAG, "Encountered bad key on import!", e);
++badKeys; ++badKeys;
} }
@ -460,6 +457,7 @@ public class ImportExportOperation extends BaseOperation {
int okSecret = 0, okPublic = 0, progress = 0; int okSecret = 0, okPublic = 0, progress = 0;
Cursor cursor = null;
try { try {
String selection = null, ids[] = null; String selection = null, ids[] = null;
@ -480,7 +478,7 @@ public class ImportExportOperation extends BaseOperation {
+ " IN (" + placeholders + ")"; + " IN (" + placeholders + ")";
} }
Cursor cursor = mProviderHelper.getContentResolver().query( cursor = mProviderHelper.getContentResolver().query(
KeyRings.buildUnifiedKeyRingsUri(), new String[]{ KeyRings.buildUnifiedKeyRingsUri(), new String[]{
KeyRings.MASTER_KEY_ID, KeyRings.PUBKEY_DATA, KeyRings.MASTER_KEY_ID, KeyRings.PUBKEY_DATA,
KeyRings.PRIVKEY_DATA, KeyRings.HAS_ANY_SECRET KeyRings.PRIVKEY_DATA, KeyRings.HAS_ANY_SECRET
@ -569,6 +567,9 @@ public class ImportExportOperation extends BaseOperation {
} catch (Exception e) { } catch (Exception e) {
Log.e(Constants.TAG, "error closing stream", e); Log.e(Constants.TAG, "error closing stream", e);
} }
if (cursor != null) {
cursor.close();
}
} }

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
View File

@ -215,6 +215,17 @@ public class UncachedKeyRing {
} }
public boolean containsSubkey(String expectedFingerprint) {
Iterator<PGPPublicKey> it = mRing.getPublicKeys();
while (it.hasNext()) {
if (KeyFormattingUtils.convertFingerprintToHex(
it.next().getFingerprint()).equals(expectedFingerprint)) {
return true;
}
}
return false;
}
public interface IteratorWithIOThrow<E> { public interface IteratorWithIOThrow<E> {
public boolean hasNext() throws IOException; public boolean hasNext() throws IOException;
public E next() throws IOException; public E next() throws IOException;