PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

preserve last update time and seen on keyserver value during consolidate

Browse source
This commit is contained in:
Vincent Breitmoser 2017-07-24 14:39:44 +02:00
parent 5c1dcf561b
commit 6e18531920
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeyWritableRepository.java
View file

@ -1185,19 +1185,29 @@ public class KeyWritableRepository extends KeyRepository {
ArrayList<ContentValues> updatedKeysValues = new ArrayList<>(); ArrayList<ContentValues> updatedKeysValues = new ArrayList<>();
final int INDEX_MASTER_KEY_ID = 0; final int INDEX_MASTER_KEY_ID = 0;
final int INDEX_LAST_UPDATED = 1; final int INDEX_LAST_UPDATED = 1;
final int INDEX_SEEN_ON_KEYSERVERS = 2;
Cursor lastUpdatedCursor = mContentResolver.query( Cursor lastUpdatedCursor = mContentResolver.query(
UpdatedKeys.CONTENT_URI, UpdatedKeys.CONTENT_URI,
new String[]{ new String[]{
UpdatedKeys.MASTER_KEY_ID, UpdatedKeys.MASTER_KEY_ID,
UpdatedKeys.LAST_UPDATED UpdatedKeys.LAST_UPDATED,
UpdatedKeys.SEEN_ON_KEYSERVERS
}, },
null, null, null); null, null, null);
while (lastUpdatedCursor.moveToNext()) { while (lastUpdatedCursor.moveToNext()) {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(UpdatedKeys.MASTER_KEY_ID, values.put(UpdatedKeys.MASTER_KEY_ID,
lastUpdatedCursor.getLong(INDEX_MASTER_KEY_ID)); lastUpdatedCursor.getLong(INDEX_MASTER_KEY_ID));
values.put(UpdatedKeys.LAST_UPDATED, if (!lastUpdatedCursor.isNull(INDEX_LAST_UPDATED)) {
lastUpdatedCursor.getLong(INDEX_LAST_UPDATED)); values.put(UpdatedKeys.LAST_UPDATED, lastUpdatedCursor.getLong(INDEX_LAST_UPDATED));
} else {
values.putNull(UpdatedKeys.LAST_UPDATED);
}
if (!lastUpdatedCursor.isNull(INDEX_SEEN_ON_KEYSERVERS)) {
values.put(UpdatedKeys.SEEN_ON_KEYSERVERS, lastUpdatedCursor.getInt(INDEX_SEEN_ON_KEYSERVERS));
} else {
values.putNull(UpdatedKeys.SEEN_ON_KEYSERVERS);
}
updatedKeysValues.add(values); updatedKeysValues.add(values);
} }
lastUpdatedCursor.close(); lastUpdatedCursor.close();