RootToolsEx: scan /dev/block too in case there are partitions multiboot didn't detect

Author: M1cha

app/src/main/java/org/efidroid/efidroidmanager/RootToolsEx.java

@@ -202,18 +202,15 @@ public void commandOutput(int id, String line) {
     public static List<String> getBlockDevices() throws Exception {
         final ArrayList<String> devices = new ArrayList<>();
 
-        String deviceWildcard = "/dev/block/*";
-        if(isDirectory("/multiboot")) {
-            deviceWildcard = "/multiboot/dev/block/*";
-        }
-
+        String deviceWildcard = "/multiboot/dev/block/* /dev/block/*";
         final Command command = new Command(0, false, "busybox blkid -c /dev/null "+deviceWildcard)
         {
             @Override
             public void commandOutput(int id, String line) {
                 super.commandOutput(id, line);
                 String blkDevice = line.split(":")[0];
-                devices.add(blkDevice);
+                if(blkDevice.startsWith("/multiboot") || devices.indexOf("/multiboot"+blkDevice)<0)
+                    devices.add(blkDevice);
             }
         };