norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

simulate existence of default storage dir

Browse Source
This commit is contained in:
Adrian Ulrich 2017-04-14 21:05:55 +02:00
parent b809aa0f32
commit 848dba0abc
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ch/blinkenlights/android/vanilla/FolderPickerAdapter.java
View File

@ -19,6 +19,7 @@ package ch.blinkenlights.android.vanilla;
import android.content.Context; import android.content.Context;
import android.app.Activity; import android.app.Activity;
import android.os.Environment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -51,6 +52,10 @@ public class FolderPickerAdapter
* Our layout inflater instance * Our layout inflater instance
*/ */
private final LayoutInflater mInflater; private final LayoutInflater mInflater;
/**
* The external storage directory as reported by the OS
*/
final private File mStorageDir;
/** /**
* The currently set directory * The currently set directory
*/ */
@ -68,7 +73,8 @@ public class FolderPickerAdapter
public FolderPickerAdapter(Context context, int resource) { public FolderPickerAdapter(Context context, int resource) {
super(context, resource); super(context, resource);
mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mCurrentDir = new File("/"); mStorageDir = Environment.getExternalStorageDirectory();
mCurrentDir = mStorageDir;
} }
@Override @Override
@ -172,6 +178,15 @@ public class FolderPickerAdapter
clear(); clear();
add(new FolderPickerAdapter.Item("../", null, 0)); add(new FolderPickerAdapter.Item("../", null, 0));
// Hack alert: Android >= 6.0's default storage root directory
// is usually not readable. That's not a big issue but
// can be very annoying for users who browse around.
// We are therefore detecting this and will 'simulate'
// the existence of the default storage root.
if (dirs == null && mStorageDir.getParentFile().equals(path)) {
dirs = new File[] { mStorageDir };
}
if (dirs != null) { if (dirs != null) {
Arrays.sort(dirs); Arrays.sort(dirs);
for(File fentry: dirs) { for(File fentry: dirs) {