Merge pull request #143 from EXL/fix_fpicker_crash
Fix crash in FPicker on Android OS >= 7.0
This commit is contained in:
commit
c1da6335e4
1 changed files with 6 additions and 5 deletions
|
@ -78,15 +78,16 @@ public class FPicker extends Activity {
|
||||||
{
|
{
|
||||||
File[] dirs = folder.listFiles();
|
File[] dirs = folder.listFiles();
|
||||||
List<Item> dir = new ArrayList<Item>();
|
List<Item> dir = new ArrayList<Item>();
|
||||||
|
|
||||||
while( dirs == null )
|
while( dirs == null )
|
||||||
{
|
{
|
||||||
folder = new File(folder.getParent());
|
try {
|
||||||
if( folder == null )
|
folder = new File(folder.getParent());
|
||||||
return dir;
|
} catch (NullPointerException e) {
|
||||||
|
folder = new File(Environment.getExternalStorageDirectory().toString());
|
||||||
|
}
|
||||||
dirs = folder.listFiles();
|
dirs = folder.listFiles();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
for(File ff: dirs)
|
for(File ff: dirs)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue