diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-06 17:40:16 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-06 17:40:16 +0200 |
commit | 834eb41932e87e340c7b4599dcedc5cfe356e167 (patch) | |
tree | 2eb8639bdfeaefb4359dcf6f7c2b6fbaf69d28b0 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |
parent | 454b9baf11f0bf551bc3444607fe006103810858 (diff) | |
parent | eb860212342ef9cef6a7265a7f9cc75a513dcb2f (diff) | |
download | open-keychain-834eb41932e87e340c7b4599dcedc5cfe356e167.tar.gz open-keychain-834eb41932e87e340c7b4599dcedc5cfe356e167.tar.bz2 open-keychain-834eb41932e87e340c7b4599dcedc5cfe356e167.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 5e6d37237..f39368e19 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -207,17 +207,12 @@ public class ProviderHelper { Log.e(Constants.TAG, "Key could not be deleted! Maybe we are creating a new one!", e); } + // insert new version of this keyRing ContentValues values = new ContentValues(); - // use exactly the same _ID again to replace key in-place. - // NOTE: If we would not use the same _ID again, - // getting back to the ViewKeyActivity would result in Nullpointer, - // because the currently loaded key would be gone from the database values.put(KeyRingData.MASTER_KEY_ID, masterKeyId); values.put(KeyRingData.KEY_RING_DATA, keyRing.getEncoded()); - - // insert new version of this keyRing Uri uri = KeyRingData.buildPublicKeyRingUri(Long.toString(masterKeyId)); - Uri insertedUri = context.getContentResolver().insert(uri, values); + context.getContentResolver().insert(uri, values); // save all keys and userIds included in keyRing object in database ArrayList<ContentProviderOperation> operations = new ArrayList<ContentProviderOperation>(); |