From 141e2d2ad91c89ecad67c45dd587bca9ac96ae77 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 5 May 2011 02:52:47 +0200
Subject: [PATCH] Make the "pick directory intent" array a constant

---
 src/com/fsck/k9/helper/FileBrowserHelper.java | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/com/fsck/k9/helper/FileBrowserHelper.java b/src/com/fsck/k9/helper/FileBrowserHelper.java
index f5ea6c4f8..2ef2c78e9 100644
--- a/src/com/fsck/k9/helper/FileBrowserHelper.java
+++ b/src/com/fsck/k9/helper/FileBrowserHelper.java
@@ -15,6 +15,16 @@ import com.fsck.k9.K9;
 import com.fsck.k9.R;
 
 public class FileBrowserHelper {
+    /**
+     * A string array that specifies the name of the intent to use, and the scheme to use with it
+     * when setting the data for the intent.
+     */
+    private static final String[][] PICK_DIRECTORY_INTENTS =
+        { { "org.openintents.action.PICK_DIRECTORY", "file://" },   // OI File Manager (maybe others)
+          { "com.estrongs.action.PICK_DIRECTORY", "file://" },      // ES File Explorer
+          { Intent.ACTION_PICK, "folder://" },                      // Blackmoon File Browser (maybe others)
+          { "com.androidworkz.action.PICK_DIRECTORY", "file://" }}; // SystemExplorer
+
     private static FileBrowserHelper sInstance;
 
     /**
@@ -62,14 +72,6 @@ public class FileBrowserHelper {
      *
      */
     public boolean showFileBrowserActivity(Activity c, File startPath, int requestcode, FileBrowserFailOverCallback callback) {
-        // A string array that specifies the name of the intent to use, and
-        // the scheme to use with it when setting the data for the intent.
-        String[][] intentDetails =
-            { { "org.openintents.action.PICK_DIRECTORY", "file://" },   // OI File Manager (maybe others)
-              { "com.estrongs.action.PICK_DIRECTORY", "file://" },      // ES File Explorer
-              { Intent.ACTION_PICK, "folder://" },                      // Blackmoon File Browser (maybe others)
-              { "com.androidworkz.action.PICK_DIRECTORY", "file://" }}; // SystemExplorer
-
         boolean success = false;
 
         if (startPath == null) {
@@ -78,9 +80,11 @@ public class FileBrowserHelper {
 
         int listIndex = 0;
         do {
-        	Intent intent = new Intent(intentDetails[listIndex][0]);
+            String intentAction = PICK_DIRECTORY_INTENTS[listIndex][0];
+            String uriPrefix = PICK_DIRECTORY_INTENTS[listIndex][1];
+        	Intent intent = new Intent(intentAction);
         	if (startPath != null) {
-                intent.setData(Uri.parse(intentDetails[listIndex][1] + startPath.getPath()));
+                intent.setData(Uri.parse(uriPrefix + startPath.getPath()));
         	}
         	try {
                 c.startActivityForResult(intent, requestcode);
@@ -89,9 +93,9 @@ public class FileBrowserHelper {
             	// Try the next intent in the list
             	listIndex++;
             };
-        } while (!success && (listIndex < intentDetails.length));
+        } while (!success && (listIndex < PICK_DIRECTORY_INTENTS.length));
 
-        if (listIndex == intentDetails.length) {
+        if (listIndex == PICK_DIRECTORY_INTENTS.length) {
             //No Filebrowser is installed => show a fallback textdialog
             showPathTextInput(c, startPath, callback);
             success = false;