Trying a fix for #585

1 files changed, 21 insertions, 15 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
index 9f18d26f0..3cb1ce7b4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
@@ -48,6 +48,7 @@ import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
@@ -73,20 +74,24 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
      * encryption. Based on mSecretKeyId it asks for a passphrase to open a private key or it asks
      * for a symmetric passphrase
      */
-    public static void show(FragmentActivity context, long keyId, Handler returnHandler) {
+    public static void show(final FragmentActivity context, final long keyId, final Handler returnHandler) {
         // Create a new Messenger for the communication back
-        Messenger messenger = new Messenger(returnHandler);
-
-        try {
-            PassphraseDialogFragment passphraseDialog = PassphraseDialogFragment.newInstance(context,
-                    messenger, keyId);
-
-            passphraseDialog.show(context.getSupportFragmentManager(), "passphraseDialog");
-        } catch (PgpGeneralException e) {
-            Log.d(Constants.TAG, "No passphrase for this secret key, encrypt directly!");
-            // send message to handler to start encryption directly
-            returnHandler.sendEmptyMessage(PassphraseDialogFragment.MESSAGE_OKAY);
-        }
+        final Messenger messenger = new Messenger(returnHandler);
+
+        DialogFragmentWorkaround.INTERFACE.runnableRunDelayed(new Runnable() {
+            public void run() {
+                try {
+                    PassphraseDialogFragment passphraseDialog = PassphraseDialogFragment.newInstance(context,
+                            messenger, keyId);
+
+                    passphraseDialog.show(context.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);
+                }
+            }
+        });
     }
 
     /**
@@ -200,8 +205,9 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
                                     } else {
                                         try {
                                             clickSecretKey = PgpKeyHelper.getKeyNum(new ProviderHelper(activity)
-                                                    .getPGPSecretKeyRingWithKeyId(secretKeyId),
-                                                    curKeyIndex);
+                                                            .getPGPSecretKeyRingWithKeyId(secretKeyId),
+                                                    curKeyIndex
+                                            );
                                         } catch (ProviderHelper.NotFoundException e) {
                                             Log.e(Constants.TAG, "key not found!", e);
                                         }