hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check if the directory is readable. If it is not, then display a dialog. Try to show the previous directory selected, but if that cannot be, just exit.

Browse Source
This commit is contained in:
Kevin Ruland 2012-02-21 02:42:08 +00:00
parent 58d89c7c27
commit 00e1f817e3
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
android/src/net/sf/openrocket/android/filebrowser/SimpleFileBrowser.java
View File

@ -2,7 +2,6 @@ package net.sf.openrocket.android.filebrowser;
import java.io.File; import java.io.File;
import java.io.FileFilter; import java.io.FileFilter;
import java.text.Collator;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
@ -11,6 +10,7 @@ import java.util.List;
import net.sf.openrocket.R; import net.sf.openrocket.R;
import net.sf.openrocket.android.actionbarcompat.ActionBarListActivity; import net.sf.openrocket.android.actionbarcompat.ActionBarListActivity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@ -31,6 +31,8 @@ public class SimpleFileBrowser extends ActionBarListActivity {
private List<File> path = null; private List<File> path = null;
private final static File root = new File("/"); private final static File root = new File("/");
private File previousDirectory = root;
private String baseDirPrefKey; private String baseDirPrefKey;
private String baseDirName; private String baseDirName;
@ -102,7 +104,35 @@ public class SimpleFileBrowser extends ActionBarListActivity {
} }
private void getDir(File dirPath) { private void getDir(final File dirPath) {
// A little sanity check. It could be possible the directory saved in the preference
// is no longer mounted, is not a directory (any more), or cannot be read.
// if any of these are the case, we display a little dialog, then revert to the
// previousDirectory.
if ( !dirPath.exists() || !dirPath.isDirectory() || !dirPath.canRead() ) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Unable to open directory " + dirPath.getAbsolutePath() );
builder.setCancelable(true);
builder.setOnCancelListener( new Dialog.OnCancelListener() {
@Override
public void onCancel(DialogInterface arg0) {
if ( root.getAbsolutePath().equals(dirPath.getAbsolutePath()) ) {
SimpleFileBrowser.this.finish();
} else {
SimpleFileBrowser.this.getDir( previousDirectory );
}
}
});
builder.show();
return;
}
previousDirectory = dirPath;
setTitle(dirPath.getAbsolutePath()); setTitle(dirPath.getAbsolutePath());
path = new ArrayList<File>(); path = new ArrayList<File>();