split getMasterKeyId for the remaining use cases

Closes #549
2014-04-11 03:29:00 +02:00
parent b77fb2fcc0
commit baa3c86e12
5 changed files with 19 additions and 16 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
@@ -51,7 +51,7 @@ public class ExportHelper {

    public void deleteKey(Uri dataUri, Handler deleteHandler) {
        try {
-            long masterKeyId = ProviderHelper.getMasterKeyId(mActivity, dataUri);
+            long masterKeyId = ProviderHelper.extractOrGetMasterKeyId(mActivity, dataUri);

            // Create a new Messenger for the communication back
            Messenger messenger = new Messenger(deleteHandler);