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

Do not use java.nio.Path on devices < android-O

Browse Source 
Turns out that this was only added in API26 (but is present in Java 7)
This commit is contained in:
Adrian Ulrich 2021-04-05 08:15:49 +02:00
parent 8c6a4cd4c7
commit 5763ab5d12
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/ch/blinkenlights/android/vanilla/FileUtils.java
View File

@ -258,15 +258,27 @@ public class FileUtils {
public static ArrayList<File> getFallbackDirectories(Context context, File dir) {
HashSet<File> result = new HashSet<>();
Path prefix = dir.toPath();
for (File f : context.getExternalMediaDirs()) {
Path p = f.toPath();
if (p.getNameCount() <= prefix.getNameCount())
continue;
if (!p.startsWith(prefix))
continue;
Path sp = p.subpath(prefix.getNameCount(), prefix.getNameCount()+1);
result.add(new File(dir, sp.toString()));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
Path prefix = dir.toPath();
for (File f : context.getExternalMediaDirs()) {
Path p = f.toPath();
if (p.getNameCount() <= prefix.getNameCount())
continue;
if (!p.startsWith(prefix))
continue;
Path sp = p.subpath(prefix.getNameCount(), prefix.getNameCount()+1);
result.add(new File(dir, sp.toString()));
}
} else {
// java.nio.Paths was only added in API 26 *sigh*.
switch (dir.toString()) {
case "/":
result.add(new File("/storage"));
break;
case "/storage/emulated":
result.add(new File("/storage/emulated/0"));
break;
}
}
return new ArrayList<File>(result);
}