From a358917d95b169a0c03c445a3ca816a0d2fb26a6 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Tue, 8 Jan 2013 14:24:58 +0100 Subject: fix #2361: index out of bounds in dir chooser --- main/src/cgeo/geocaching/files/SimpleDirChooser.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'main/src') diff --git a/main/src/cgeo/geocaching/files/SimpleDirChooser.java b/main/src/cgeo/geocaching/files/SimpleDirChooser.java index 346780d..404777a 100644 --- a/main/src/cgeo/geocaching/files/SimpleDirChooser.java +++ b/main/src/cgeo/geocaching/files/SimpleDirChooser.java @@ -43,13 +43,7 @@ public class SimpleDirChooser extends ListActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); final Bundle extras = getIntent().getExtras(); - String startDir = extras.getString(START_DIR); - if (StringUtils.isBlank(startDir)) { - startDir = Environment.getExternalStorageDirectory().getPath(); - } else { - startDir = startDir.substring(0, startDir.lastIndexOf(File.separatorChar)); - } - currentDir = new File(startDir); + currentDir = dirContaining(extras.getString(START_DIR)); ActivityMixin.setTheme(this); setContentView(R.layout.simple_dir_chooser); @@ -82,6 +76,18 @@ public class SimpleDirChooser extends ListActivity { }); } + /** + * Return the directory containing a given path, or a sensible default. + * + * @param path the path to get the enclosing directory from, can be null or empty + * @return the directory containing path, or a sensible default if none + */ + private static File dirContaining(final String path) { + return StringUtils.contains(path, File.separatorChar) ? + new File(StringUtils.substringBeforeLast(path, Character.toString(File.separatorChar))) : + Environment.getExternalStorageDirectory(); + } + private void fill(File dir) { EditText path = (EditText) findViewById(R.id.simple_dir_chooser_path); path.setText(this.getResources().getString(R.string.simple_dir_chooser_current_path) + " " + dir.getAbsolutePath()); -- cgit v1.1