1 files changed, 6 insertions, 14 deletions

diff --git a/main/src/cgeo/geocaching/files/SimpleDirChooser.java b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
index 404777a..7520e2e 100644
--- a/main/src/cgeo/geocaching/files/SimpleDirChooser.java
+++ b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.files;
 
+import cgeo.geocaching.Intents;
 import cgeo.geocaching.R;
 import cgeo.geocaching.activity.ActivityMixin;
 
@@ -8,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 import android.app.ListActivity;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.view.LayoutInflater;
@@ -18,7 +20,6 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
-import android.widget.ListView;
 import android.widget.TextView;
 
 import java.io.File;
@@ -31,8 +32,6 @@ import java.util.List;
  * Dialog for choosing a file or directory.
  */
 public class SimpleDirChooser extends ListActivity {
-    public static final String EXTRA_CHOSEN_DIR = "chosenDir";
-    public static final String START_DIR = "start_dir";
     private static final String PARENT_DIR = "..        ";
     private File currentDir;
     private FileArrayAdapter adapter;
@@ -43,7 +42,7 @@ public class SimpleDirChooser extends ListActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         final Bundle extras = getIntent().getExtras();
-        currentDir = dirContaining(extras.getString(START_DIR));
+        currentDir = dirContaining(extras.getString(Intents.EXTRA_START_DIR));
 
         ActivityMixin.setTheme(this);
         setContentView(R.layout.simple_dir_chooser);
@@ -57,10 +56,8 @@ public class SimpleDirChooser extends ListActivity {
         okButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent();
-                String chosenDirName = File.separator + adapter.getItem(lastPosition).getName();
-                intent.putExtra(EXTRA_CHOSEN_DIR, currentDir.getAbsolutePath() + chosenDirName);
-                setResult(RESULT_OK, intent);
+                setResult(RESULT_OK, new Intent()
+                        .setData(Uri.fromFile(new File(currentDir, adapter.getItem(lastPosition).getName()))));
                 finish();
             }
         });
@@ -107,11 +104,6 @@ public class SimpleDirChooser extends ListActivity {
         this.setListAdapter(adapter);
     }
 
-    @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        super.onListItemClick(l, v, position, id);
-    }
-
     public class FileArrayAdapter extends ArrayAdapter<Option> {
 
         private Context content;
@@ -206,7 +198,7 @@ public class SimpleDirChooser extends ListActivity {
         }
     }
 
-    public class Option implements Comparable<Option> {
+    public static class Option implements Comparable<Option> {
         private final String name;
         private final String path;
         private boolean checked = false;