1 files changed, 12 insertions, 30 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index 167401ac5..60bababd1 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -281,34 +281,6 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
         }
     }
 
-    private void showPassphraseDialog(final long masterKeyId) {
-        // Message is received after passphrase is cached
-        Handler returnHandler = new Handler() {
-            @Override
-            public void handleMessage(Message message) {
-                if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
-                    mCurrentPassphrase = PassphraseCacheService.getCachedPassphrase(
-                            EditKeyActivity.this, masterKeyId);
-                    checkEmptyIDsWanted();
-                }
-            }
-        };
-
-        // Create a new Messenger for the communication back
-        Messenger messenger = new Messenger(returnHandler);
-
-        try {
-            PassphraseDialogFragment passphraseDialog = PassphraseDialogFragment.newInstance(
-                    EditKeyActivity.this, messenger, masterKeyId);
-
-            passphraseDialog.show(getSupportFragmentManager(), "passphraseDialog");
-        } catch (PgpGeneralException e) {
-            Log.d(Constants.TAG, "No passphrase for this secret key!");
-            // send message to handler to start encryption directly
-            returnHandler.sendEmptyMessage(PassphraseDialogFragment.MESSAGE_OKAY);
-        }
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
@@ -538,7 +510,7 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
     }
 
     private void saveClicked() {
-        long masterKeyId = getMasterKeyId();
+        final long masterKeyId = getMasterKeyId();
         if (needsSaving()) { //make sure, as some versions don't support invalidateOptionsMenu
             try {
                 if (!isPassphraseSet()) {
@@ -552,7 +524,17 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
                     passphrase = "";
                 }
                 if (passphrase == null) {
-                    showPassphraseDialog(masterKeyId);
+                    PassphraseDialogFragment.show(this, masterKeyId,
+                        new Handler() {
+                            @Override
+                            public void handleMessage(Message message) {
+                                if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
+                                    mCurrentPassphrase = PassphraseCacheService.getCachedPassphrase(
+                                            EditKeyActivity.this, masterKeyId);
+                                    checkEmptyIDsWanted();
+                                }
+                            }
+                        });
                 } else {
                     mCurrentPassphrase = passphrase;
                     checkEmptyIDsWanted();