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

Fix saving of allowed keys

Browse Source
This commit is contained in:
Dominik Schürmann 2015-01-30 10:47:40 +01:00
parent 15e7e5f7c6
commit 464f7c6718
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1310,7 +1310,6 @@ public class ProviderHelper {
progress.setProgress(100, 100); progress.setProgress(100, 100);
log.add(LogType.MSG_CON_SUCCESS, indent); log.add(LogType.MSG_CON_SUCCESS, indent);
indent -= 1;
return new ConsolidateResult(ConsolidateResult.RESULT_OK, log); return new ConsolidateResult(ConsolidateResult.RESULT_OK, log);
@ -1528,20 +1527,15 @@ public class ProviderHelper {
public void saveAllowedKeyIdsForApp(Uri uri, Set<Long> allowedKeyIds) public void saveAllowedKeyIdsForApp(Uri uri, Set<Long> allowedKeyIds)
throws RemoteException, OperationApplicationException { throws RemoteException, OperationApplicationException {
ArrayList<ContentProviderOperation> ops = new ArrayList<>(); // wipe whole table of allowed keys for this account
mContentResolver.delete(uri, null, null);
// clear table
ops.add(ContentProviderOperation.newDelete(uri)
.build());
// re-insert allowed key ids // re-insert allowed key ids
for (Long keyId : allowedKeyIds) { for (Long keyId : allowedKeyIds) {
ops.add(ContentProviderOperation.newInsert(uri) ContentValues values = new ContentValues();
.withValue(ApiAllowedKeys.KEY_ID, keyId) values.put(ApiAllowedKeys.KEY_ID, keyId);
.build()); mContentResolver.insert(uri, values);
} }
getContentResolver().applyBatch(KeychainContract.CONTENT_AUTHORITY, ops);
} }
public Set<String> getAllFingerprints(Uri uri) { public Set<String> getAllFingerprints(Uri uri) {