1 files changed, 23 insertions, 41 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
index 16ef28311..bcd57b290 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java
@@ -30,18 +30,17 @@ import android.widget.Toast;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
 import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
-import org.sufficientlysecure.keychain.ui.dialog.FileDialogFragment;
 import org.sufficientlysecure.keychain.util.Log;
 
+import java.io.File;
+
 public class ExportHelper {
-    protected FileDialogFragment mFileDialog;
-    protected String mExportFilename;
+    protected File mExportFile;
 
     ActionBarActivity mActivity;
 
@@ -68,47 +67,30 @@ public class ExportHelper {
     /**
      * Show dialog where to export keys
      */
-    public void showExportKeysDialog(final long[] masterKeyIds, final String exportFilename,
+    public void showExportKeysDialog(final long[] masterKeyIds, final File exportFile,
                                      final boolean showSecretCheckbox) {
-        mExportFilename = exportFilename;
-
-        // Message is received after file is selected
-        Handler returnHandler = new Handler() {
-            @Override
-            public void handleMessage(Message message) {
-                if (message.what == FileDialogFragment.MESSAGE_OKAY) {
-                    Bundle data = message.getData();
-                    mExportFilename = data.getString(FileDialogFragment.MESSAGE_DATA_FILENAME);
-
-                    exportKeys(masterKeyIds, data.getBoolean(FileDialogFragment.MESSAGE_DATA_CHECKED));
-                }
-            }
-        };
+        mExportFile = exportFile;
 
-        // Create a new Messenger for the communication back
-        final Messenger messenger = new Messenger(returnHandler);
-
-        DialogFragmentWorkaround.INTERFACE.runnableRunDelayed(new Runnable() {
-            public void run() {
-                String title = null;
-                if (masterKeyIds == null) {
-                    // export all keys
-                    title = mActivity.getString(R.string.title_export_keys);
-                } else {
-                    // export only key specified at data uri
-                    title = mActivity.getString(R.string.title_export_key);
-                }
-
-                String message = mActivity.getString(R.string.specify_file_to_export_to);
-                String checkMsg = showSecretCheckbox ?
-                        mActivity.getString(R.string.also_export_secret_keys) : null;
+        String title = null;
+        if (masterKeyIds == null) {
+            // export all keys
+            title = mActivity.getString(R.string.title_export_keys);
+        } else {
+            // export only key specified at data uri
+            title = mActivity.getString(R.string.title_export_key);
+        }
 
-                mFileDialog = FileDialogFragment.newInstance(messenger, title, message,
-                        exportFilename, checkMsg);
+        String message = mActivity.getString(R.string.specify_file_to_export_to);
+        String checkMsg = showSecretCheckbox ?
+                mActivity.getString(R.string.also_export_secret_keys) : null;
 
-                mFileDialog.show(mActivity.getSupportFragmentManager(), "fileDialog");
+        FileHelper.saveFile(new FileHelper.FileDialogCallback() {
+            @Override
+            public void onFileSelected(File file, boolean checked) {
+                mExportFile = file;
+                exportKeys(masterKeyIds, checked);
             }
-        });
+        }, mActivity.getSupportFragmentManager() ,title, message, exportFile, checkMsg);
     }
 
     /**
@@ -125,7 +107,7 @@ public class ExportHelper {
         // fill values for this action
         Bundle data = new Bundle();
 
-        data.putString(KeychainIntentService.EXPORT_FILENAME, mExportFilename);
+        data.putString(KeychainIntentService.EXPORT_FILENAME, mExportFile.getAbsolutePath());
         data.putBoolean(KeychainIntentService.EXPORT_SECRET, exportSecret);
 
         if (masterKeyIds == null) {