aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-09-19 02:02:51 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2013-09-19 02:02:51 +0200
commit3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd (patch)
treed8d7ad9ea2b8fac8c988ec38885d4645242c5168 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog
parent4c461c1b445eb339382b5ffd174e6d19b93f25d0 (diff)
downloadopen-keychain-3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd.tar.gz
open-keychain-3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd.tar.bz2
open-keychain-3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd.zip
Work on new Import activity
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
index 47aea82e7..730fcc520 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
@@ -38,6 +38,8 @@ import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.ImageButton;
+// TODO: return result from file manager activity to this dialog! not the activity!
+// do it like in ImportFileFragment!
public class FileDialogFragment extends DialogFragment {
private static final String ARG_MESSENGER = "messenger";
private static final String ARG_TITLE = "title";
@@ -107,7 +109,8 @@ public class FileDialogFragment extends DialogFragment {
mBrowse.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
// only .asc or .gpg files
- FileHelper.openFile(activity, mFilename.getText().toString(), "text/plain",
+ // setting it to text/plain prevents Cynaogenmod's file manager from selecting asc or gpg types!
+ FileHelper.openFile(activity, mFilename.getText().toString(), "*/*",
requestCode);
}
});