support ASTRO and others for the file selection

3 files changed, 14 insertions, 20 deletions

diff --git a/src/org/thialfihar/android/apg/DecryptActivity.java b/src/org/thialfihar/android/apg/DecryptActivity.java
index ab5ec08af..66679884a 100644
--- a/src/org/thialfihar/android/apg/DecryptActivity.java
+++ b/src/org/thialfihar/android/apg/DecryptActivity.java
@@ -32,9 +32,7 @@ import java.util.regex.Matcher;
 import org.bouncycastle2.jce.provider.BouncyCastleProvider;
 import org.bouncycastle2.openpgp.PGPException;
 import org.bouncycastle2.util.Strings;
-import org.openintents.intents.FileManager;
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
@@ -296,18 +294,17 @@ public class DecryptActivity extends BaseActivity {
     private void openFile() {
         String filename = mFilename.getText().toString();
 
-        Intent intent = new Intent(FileManager.ACTION_PICK_FILE);
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
 
         intent.setData(Uri.parse("file://" + filename));
-
-        intent.putExtra(FileManager.EXTRA_TITLE, getString(R.string.filemanager_titleDecrypt));
-        intent.putExtra(FileManager.EXTRA_BUTTON_TEXT, R.string.filemanager_btnOpen);
+        intent.setType("*/*");
 
         try {
             startActivityForResult(intent, Id.request.filename);
         } catch (ActivityNotFoundException e) {
             // No compatible file manager was found.
-            Toast.makeText(this, R.string.oiFilemanagerNotInstalled, Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, R.string.noFilemanagerInstalled, Toast.LENGTH_SHORT).show();
         }
     }
 
diff --git a/src/org/thialfihar/android/apg/EncryptActivity.java b/src/org/thialfihar/android/apg/EncryptActivity.java
index 39a321f03..aaed4f8cd 100644
--- a/src/org/thialfihar/android/apg/EncryptActivity.java
+++ b/src/org/thialfihar/android/apg/EncryptActivity.java
@@ -35,7 +35,6 @@ import org.bouncycastle2.openpgp.PGPPublicKeyRing;
 import org.bouncycastle2.openpgp.PGPSecretKey;
 import org.bouncycastle2.openpgp.PGPSecretKeyRing;
 import org.bouncycastle2.util.Strings;
-import org.openintents.intents.FileManager;
 import org.thialfihar.android.apg.Apg.GeneralException;
 import org.thialfihar.android.apg.utils.Choice;
 
@@ -354,18 +353,17 @@ public class EncryptActivity extends BaseActivity {
     private void openFile() {
         String filename = mFilename.getText().toString();
 
-        Intent intent = new Intent(FileManager.ACTION_PICK_FILE);
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
 
         intent.setData(Uri.parse("file://" + filename));
-
-        intent.putExtra(FileManager.EXTRA_TITLE, R.string.filemanager_titleEncrypt);
-        intent.putExtra(FileManager.EXTRA_BUTTON_TEXT, R.string.filemanager_btnOpen);
+        intent.setType("*/*");
 
         try {
             startActivityForResult(intent, Id.request.filename);
         } catch (ActivityNotFoundException e) {
             // No compatible file manager was found.
-            Toast.makeText(this, R.string.oiFilemanagerNotInstalled, Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, R.string.noFilemanagerInstalled, Toast.LENGTH_SHORT).show();
         }
     }
 
diff --git a/src/org/thialfihar/android/apg/FileDialog.java b/src/org/thialfihar/android/apg/FileDialog.java
index 22d64fc84..b6bbbf3f1 100644
--- a/src/org/thialfihar/android/apg/FileDialog.java
+++ b/src/org/thialfihar/android/apg/FileDialog.java
@@ -16,8 +16,6 @@
 

 package org.thialfihar.android.apg;

 

-import org.openintents.intents.FileManager;

-

 import android.app.Activity;

 import android.app.AlertDialog;

 import android.content.ActivityNotFoundException;

@@ -48,6 +46,8 @@ public class FileDialog {
                                     String defaultFile, OnClickListener onClickListener,

                                     String fileManagerTitle, String fileManagerButton,

                                     int requestCode) {

+        // TODO: fileManagerTitle and fileManagerButton are deprecated, no use for them right now,

+        // but maybe the Intent now used will someday support them again, so leaving them in

         LayoutInflater inflater =

             (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);

         AlertDialog.Builder alert = new AlertDialog.Builder(activity);

@@ -102,18 +102,17 @@ public class FileDialog {
     private static void openFile() {

         String filename = mFilename.getText().toString();

 

-        Intent intent = new Intent(FileManager.ACTION_PICK_FILE);

+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);

+        intent.addCategory(Intent.CATEGORY_OPENABLE);

 

         intent.setData(Uri.parse("file://" + filename));

-

-        intent.putExtra(FileManager.EXTRA_TITLE, mFileManagerTitle);

-        intent.putExtra(FileManager.EXTRA_BUTTON_TEXT, mFileManagerButton);

+        intent.setType("*/*");

 

         try {

             mActivity.startActivityForResult(intent, mRequestCode);

         } catch (ActivityNotFoundException e) {

             // No compatible file manager was found.

-            Toast.makeText(mActivity, R.string.oiFilemanagerNotInstalled, Toast.LENGTH_SHORT).show();

+            Toast.makeText(mActivity, R.string.noFilemanagerInstalled, Toast.LENGTH_SHORT).show();

         }

     }

 }