ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

android: better error checking for external drives

This commit is contained in:
TwistedUmbrella 2018-04-02 18:06:51 -04:00
parent 3876a3e3ad
commit 98dbcf0aff
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
shell/android-studio/app/src/main/java/com/reicast/emulator/FileBrowser.java
View File

@ -91,39 +91,39 @@ public class FileBrowser extends Fragment {
}
}
}
public static HashSet<String> getExternalMounts() {
final HashSet<String> out = new HashSet<String>();
String reg = "(?i).*vold.*(vfat|ntfs|exfat|fat32|ext3|ext4|fuse).*rw.*";
String s = "";
StringBuilder s = new StringBuilder();
try {
final Process process = new ProcessBuilder().command("mount")
.redirectErrorStream(true).start();
process.waitFor();
final InputStream is = process.getInputStream();
final byte[] buffer = new byte[1024];
InputStream is = process.getInputStream();
byte[] buffer = new byte[1024];
while (is.read(buffer) != -1) {
s = s + new String(buffer);
s.append(new String(buffer));
}
is.close();
} catch (final Exception e) {
}
final String[] lines = s.split("\n");
for (String line : lines) {
if (StringUtils.containsIgnoreCase(line, "secure"))
continue;
if (StringUtils.containsIgnoreCase(line, "asec"))
continue;
if (line.matches(reg)) {
String[] parts = line.split(" ");
for (String part : parts) {
if (part.startsWith("/"))
if (!StringUtils.containsIgnoreCase(part, "vold"))
out.add(part);
String[] lines = s.toString().split("\n");
for (String line : lines) {
if (StringUtils.containsIgnoreCase(line, "secure"))
continue;
if (StringUtils.containsIgnoreCase(line, "asec"))
continue;
if (line.matches(reg)) {
String[] parts = line.split(" ");
for (String part : parts) {
if (part.startsWith("/"))
if (!StringUtils.containsIgnoreCase(part, "vold"))
out.add(part);
}
}
}
} catch (final Exception e) {
e.printStackTrace();
}
return out;
}