Better parsing / splitting of mount results to fix nexus 6 problems

mangalarora · Apr 18, 2016 · ed600d0 · ed600d0
1 parent 8aeacef
commit ed600d0
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/rootbeerlib/src/main/java/com/scottyab/rootbeer/RootBeer.java b/rootbeerlib/src/main/java/com/scottyab/rootbeer/RootBeer.java
@@ -281,12 +281,30 @@ public boolean checkForRWPaths() {
 
         String[] lines = mountReader();
         for (String line : lines) {
+
+            // Split lines into parts
+            String[] args = line.split(" ");
+
+            if (args.length < 4){
+                // If we don't have enough options per line, skip this and log an error
+                QLog.e("Error formatting mount line: "+line);
+                continue;
+            }
+
+            String mountPoint = args[1];
+            String mountOptions = args[3];
+
             for(String pathToCheck: Const.pathsThatShouldNotBeWrtiable) {
-                if (line.contains(pathToCheck)) {
-                    if (line.contains(" rw,")) {
-                        QLog.v(pathToCheck+" path is mounted with rw permissions!");
+                if (mountPoint.equalsIgnoreCase(pathToCheck)) {
+
+                    // Split options out and compare against "rw" to avoid false positives
+                    for (String option : mountOptions.split(",")){
+
+                      if (option.equalsIgnoreCase("rw")){
+                        QLog.v(pathToCheck+" path is mounted with rw permissions! "+line);
                         result = true;
                         break;
+                      }
                     }
                 }
             }