Check root permission ahead of flashing

* This splits permission error from flashing error

Author: libxzr

app/src/main/java/xzr/hkf/Worker.java

@@ -45,6 +45,13 @@ public void run() {
             return;
         }
 
+        if (!rootAvailable()) {
+            MainActivity._appendLog(activity.getResources().getString(R.string.unable_flash_root), activity);
+            MainActivity.cur_status = MainActivity.status.error;
+            ((MainActivity) activity).update_title();
+            return;
+        }
+
         try {
             copy();
         } catch (IOException ioException) {
@@ -82,7 +89,7 @@ public void run() {
             is_error = true;
         }
         if (is_error) {
-            MainActivity._appendLog(activity.getResources().getString(R.string.unable_flash_root), activity);
+            MainActivity._appendLog(activity.getResources().getString(R.string.unable_flash_error), activity);
             MainActivity.cur_status = MainActivity.status.error;
             ((MainActivity) activity).update_title();
             return;
@@ -106,6 +113,15 @@ public void run() {
         ((MainActivity) activity).update_title();
     }
 
+    boolean rootAvailable() {
+        try {
+            String ret = runWithNewProcessReturn(true, "id");
+            return ret != null && ret.contains("root");
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
     void copy() throws IOException {
         InputStream inputStream = activity.getContentResolver().openInputStream(uri);
         FileOutputStream fileOutputStream = new FileOutputStream(new File(file_path));
@@ -160,6 +176,10 @@ void reboot() throws IOException {
     }
 
     void runWithNewProcessNoReturn(boolean su, String cmd) throws IOException {
+        runWithNewProcessReturn(su, cmd);
+    }
+
+    String runWithNewProcessReturn(boolean su, String cmd) throws IOException {
         Process process = null;
         if (su) {
             process = new ProcessBuilder("su").redirectErrorStream(true).start();
@@ -171,11 +191,16 @@ void runWithNewProcessNoReturn(boolean su, String cmd) throws IOException {
         outputStreamWriter.write(cmd + "\n");
         outputStreamWriter.write("exit\n");
         outputStreamWriter.flush();
-        while (bufferedReader.readLine() != null) {
+        String tmp;
+        StringBuilder ret = new StringBuilder();
+        while ((tmp = bufferedReader.readLine()) != null) {
+            ret.append(tmp);
+            ret.append("\n");
         }
         outputStreamWriter.close();
         bufferedReader.close();
         process.destroy();
+        return ret.toString();
     }
 
 }

app/src/main/res/values-zh-rCN/strings.xml

@@ -18,5 +18,6 @@
     <string name="flashing_done">刷入完成</string>
     <string name="failed">刷入错误</string>
     <string name="task_running">一个任务尚未结束</string>
-    <string name="unable_flash_root">刷入时发生错误，请检查root权限</string>
+    <string name="unable_flash_root">没有root权限</string>
+    <string name="unable_flash_error">刷入时发生了错误</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -18,5 +18,6 @@
     <string name="flashing_done">Done</string>
     <string name="failed">Failed</string>
     <string name="task_running">A task is still running</string>
-    <string name="unable_flash_root">Failed when flashing. Please check root permission.</string>
+    <string name="unable_flash_root">Unable to get root permission</string>
+    <string name="unable_flash_error">An error occurred while flashing</string>
 </resources>