From 154fb6457c4ba05b99a8cf97afe9a5f3c1937cc1 Mon Sep 17 00:00:00 2001
From: Marco Jacob <mjacob@union06.de>
Date: Wed, 10 Apr 2013 20:55:19 +0200
Subject: fixes #2651 - exclude inaccessable dirs from choice

---
 main/src/cgeo/geocaching/files/SimpleDirChooser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main/src/cgeo/geocaching/files/SimpleDirChooser.java')

diff --git a/main/src/cgeo/geocaching/files/SimpleDirChooser.java b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
index 7520e2e..844287c 100644
--- a/main/src/cgeo/geocaching/files/SimpleDirChooser.java
+++ b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
@@ -238,7 +238,7 @@ public class SimpleDirChooser extends ListActivity {
         @Override
         public boolean accept(File dir, String filename) {
             File file = new File(dir, filename);
-            return file.isDirectory();
+            return file.isDirectory() && file.canWrite();
         }
 
     }
-- 
cgit v1.1


From 74fce89a36e8d130851145941459966aed1176c3 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sun, 28 Apr 2013 14:18:29 +0200
Subject: #2684: use view injection library

* If you have compile errors after pulling, please consult the issue on
github.
---
 main/src/cgeo/geocaching/files/SimpleDirChooser.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'main/src/cgeo/geocaching/files/SimpleDirChooser.java')

diff --git a/main/src/cgeo/geocaching/files/SimpleDirChooser.java b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
index 844287c..824173c 100644
--- a/main/src/cgeo/geocaching/files/SimpleDirChooser.java
+++ b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
@@ -2,11 +2,11 @@ package cgeo.geocaching.files;
 
 import cgeo.geocaching.Intents;
 import cgeo.geocaching.R;
+import cgeo.geocaching.activity.AbstractListActivity;
 import cgeo.geocaching.activity.ActivityMixin;
 
 import org.apache.commons.lang3.StringUtils;
 
-import android.app.ListActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -31,7 +31,7 @@ import java.util.List;
 /**
  * Dialog for choosing a file or directory.
  */
-public class SimpleDirChooser extends ListActivity {
+public class SimpleDirChooser extends AbstractListActivity {
     private static final String PARENT_DIR = "..        ";
     private File currentDir;
     private FileArrayAdapter adapter;
@@ -46,7 +46,6 @@ public class SimpleDirChooser extends ListActivity {
 
         ActivityMixin.setTheme(this);
         setContentView(R.layout.simple_dir_chooser);
-        setTitle(this.getResources().getString(R.string.simple_dir_chooser_title));
 
         fill(currentDir);
 
@@ -106,13 +105,13 @@ public class SimpleDirChooser extends ListActivity {
 
     public class FileArrayAdapter extends ArrayAdapter<Option> {
 
-        private Context content;
+        private Context context;
         private int id;
         private List<Option> items;
 
         public FileArrayAdapter(Context context, int simpleDirItemResId, List<Option> objects) {
             super(context, simpleDirItemResId, objects);
-            this.content = context;
+            this.context = context;
             this.id = simpleDirItemResId;
             this.items = objects;
         }
@@ -126,7 +125,7 @@ public class SimpleDirChooser extends ListActivity {
         public View getView(int position, View convertView, ViewGroup parent) {
             View v = convertView;
             if (v == null) {
-                LayoutInflater vi = (LayoutInflater) content.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                LayoutInflater vi = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
                 v = vi.inflate(id, null);
             }
 
-- 
cgit v1.1


From c645ee39ed4bb7fb7b3af9cf87ee5a2ff910c845 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Tue, 7 May 2013 07:11:38 +0200
Subject: fix #2702: Don't allow to check ".." in path selection

---
 main/src/cgeo/geocaching/files/SimpleDirChooser.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'main/src/cgeo/geocaching/files/SimpleDirChooser.java')

diff --git a/main/src/cgeo/geocaching/files/SimpleDirChooser.java b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
index 824173c..6b2366c 100644
--- a/main/src/cgeo/geocaching/files/SimpleDirChooser.java
+++ b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
@@ -186,13 +186,12 @@ public class SimpleDirChooser extends AbstractListActivity {
             if (currentOption != lastOption) {
                 currentOption.setChecked(true);
                 lastPosition = position;
-                okButton.setEnabled(true);
-                okButton.setVisibility(View.VISIBLE);
             } else {
                 lastPosition = -1;
-                okButton.setEnabled(false);
-                okButton.setVisibility(View.INVISIBLE);
             }
+            final boolean enabled = currentOption.isChecked() && !currentOption.getName().equals(PARENT_DIR);
+            okButton.setEnabled(enabled);
+            okButton.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
             adapter.notifyDataSetChanged();
         }
     }
-- 
cgit v1.1