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

introduced constants for keyserver sync, fixed sync issue

Browse Source
This commit is contained in:
Adithya Abraham Philip
2015-08-19 01:13:12 +05:30
parent f625a26bbd
commit 0251f0e416
12 changed files with 77 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@@ -700,20 +700,14 @@ public class ProviderHelper {
new String[]{"" + masterKeyId},
null
);
ContentValues lastUpdatedEntry = null;
if (lastUpdatedCursor.moveToNext()) {
lastUpdatedEntry = new ContentValues(2);
// there was an entry to re-insert
// this operation must happen after the new key is inserted
ContentValues lastUpdatedEntry = new ContentValues(2);
lastUpdatedEntry.put(UpdatedKeys.MASTER_KEY_ID,
lastUpdatedCursor.getLong(INDEX_MASTER_KEY_ID));
lastUpdatedEntry.put(UpdatedKeys.LAST_UPDATED,
lastUpdatedCursor.getLong(INDEX_LAST_UPDATED));
Log.e("PHILIP", "cv: " + lastUpdatedEntry + " actual: " + masterKeyId);
}
lastUpdatedCursor.close();
if (lastUpdatedEntry != null) {
// there was an entry to re-insert
// this operation must happen after the new key is inserted
operations.add(
ContentProviderOperation
.newInsert(UpdatedKeys.CONTENT_URI)
@@ -721,6 +715,7 @@ public class ProviderHelper {
.build()
);
}
lastUpdatedCursor.close();
try {
// delete old version of this keyRing, which also deletes all keys and userIds on cascade