Merge remote-tracking branch 'origin/master' into v/multi-decrypt

This commit is contained in:
Vincent Breitmoser committed 2015-06-26 02:44:59 +02:00
commit dce4503ac5
23 files changed
+461 -198

No files matched your search

@@ -219,7 +219,7 @@ public class UncachedKeyRing {
Iterator<PGPPublicKey> it = mRing.getPublicKeys();
while (it.hasNext()) {
if (KeyFormattingUtils.convertFingerprintToHex(
it.next().getFingerprint()).equals(expectedFingerprint)) {
it.next().getFingerprint()).equalsIgnoreCase(expectedFingerprint)) {
return true;
}
}