cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

load keys from sd card during consolidate

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-09-22 00:22:15 +02:00
parent fa258fb8b3
commit 318005dbb6
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeyWritableRepository.java
View File

@@ -1091,7 +1091,7 @@ public class KeyWritableRepository extends KeyRepository {
final Cursor cursor = mContentResolver.query( final Cursor cursor = mContentResolver.query(
KeyRingData.buildPublicKeyRingUri(), KeyRingData.buildPublicKeyRingUri(),
new String[]{KeyRingData.KEY_RING_DATA}, null, null, null); new String[]{KeyRingData.MASTER_KEY_ID, KeyRingData.KEY_RING_DATA}, null, null, null);
if (cursor == null) { if (cursor == null) {
log.add(LogType.MSG_CON_ERROR_DB, indent); log.add(LogType.MSG_CON_ERROR_DB, indent);
@@ -1113,7 +1113,21 @@ public class KeyWritableRepository extends KeyRepository {
if (cursor.isAfterLast()) { if (cursor.isAfterLast()) {
return false; return false;
} }
ring = ParcelableKeyRing.createFromEncodedBytes(cursor.getBlob(0));
long masterKeyId = cursor.getLong(0);
byte[] keyBytes = cursor.getBlob(1);
if (keyBytes == null) {
try {
keyBytes = mLocalPublicKeyStorage.readPublicKey(masterKeyId);
} catch (IOException e) {
Log.e(Constants.TAG, "Failed reading key data!", e);
}
}
if (keyBytes == null) {
throw new IllegalStateException("Lost a key! This should never happen!");
}
ring = ParcelableKeyRing.createFromEncodedBytes(keyBytes);
cursor.moveToNext(); cursor.moveToNext();
return true; return true;
} }