fix: Prompt about restarting a scope without root privileges

Author: lingqiqi5211

library/common-ui/java/main/src/com/sevtinge/hyperceiler/common/utils/DialogHelper.java

@@ -20,22 +20,19 @@
 
 import static com.sevtinge.hyperceiler.common.utils.CtaUtils.setCtaValue;
 import static com.sevtinge.hyperceiler.hook.utils.log.LogManager.LOGGER_CHECKER_ERR_CODE;
+import static com.sevtinge.hyperceiler.hook.utils.shell.ShellUtils.checkRootPermission;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Color;
 import android.net.Uri;
-import android.text.Html;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextPaint;
 import android.text.style.ClickableSpan;
 import android.text.style.ForegroundColorSpan;
 import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
@@ -282,16 +279,20 @@ public static void doRestart(Context context, String[] packageName, boolean isRe
         if (isRestartSystem) {
             result = ShellInit.getShell().run("reboot").sync().isResult();
         } else {
-            result = AppsTool.killApps(packageName);
-            pid = result;
+            if (checkRootPermission() != 0) {
+                result = false;
+            } else {
+                result = AppsTool.killApps(packageName);
+                pid = result;
+            }
         }
 
         if (!result) {
             showAlertDialog(context, isRestartSystem, pid);
         }
     }
 
-    private static void showAlertDialog(Context context, boolean isRestartSystem, boolean pid) {
+    public static void showAlertDialog(Context context, boolean isRestartSystem, boolean pid) {
         new AlertDialog.Builder(context)
             .setCancelable(false)
             .setTitle(R.string.tip)

library/common-ui/java/main/src/com/sevtinge/hyperceiler/common/view/RestartAlertDialog.java

@@ -18,6 +18,9 @@
  */
 package com.sevtinge.hyperceiler.common.view;
 
+import static com.sevtinge.hyperceiler.common.utils.DialogHelper.showAlertDialog;
+import static com.sevtinge.hyperceiler.hook.utils.shell.ShellUtils.checkRootPermission;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -52,6 +55,10 @@ private MultipleChoiceView createMultipleChoiceView(Context context) {
         view.setOnCheckedListener(sparseBooleanArray -> {
             dismiss();
             int size = sparseBooleanArray.size();
+            if (checkRootPermission() != 0) {
+                showAlertDialog(context, false, true);
+                return;
+            }
             for (int i = 0; i < size; i++) {
                 if (sparseBooleanArray.get(i)) {
                     // ShellUtils.execCommand("pkill -l 9 -f " + mAppPackageNameList.get(i), true, false);

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/base/tool/AppsTool.java

@@ -241,10 +241,13 @@ public static boolean killApps(String[] packageNames, int signal) {
                         .add("if [[ $pids != \"\" ]]; then")
                         .add(" pid=$pids")
                         .add("fi")
+                        .add("killed=0")
                         .add("if [[ $pid != \"\" ]]; then")
                         .add(" for i in $pid; do")
                         .add("  kill -s " + signal + " $i &>/dev/null")
+                        .add("  if [[ $? -eq 0 ]]; then killed=1; fi")
                         .add(" done")
+                        .add(" if [[ $killed -eq 0 ]]; then echo \"No Permission!\"; fi")
                         .add("else")
                         .add(" echo \"No Find Pid!\"")
                         .add("fi").over().sync().isResult();
@@ -255,8 +258,15 @@ public static boolean killApps(String[] packageNames, int signal) {
             ArrayList<String> outPut = ShellInit.getShell().getOutPut();
             ArrayList<String> error = ShellInit.getShell().getError();
             if (shellResult) {
-                if (outPut != null && !outPut.isEmpty() && "No Find Pid!".equals(outPut.get(0))) {
-                    AndroidLogUtils.logW(TAG, "Didn't find a pid that can kill: " + pkg);
+                if (outPut != null && !outPut.isEmpty()) {
+                    String firstLine = outPut.get(0);
+                    if ("No Find Pid!".equals(firstLine)) {
+                        AndroidLogUtils.logW(TAG, "Didn't find a pid that can kill: " + pkg);
+                    } else if ("No Permission!".equals(firstLine)) {
+                        AndroidLogUtils.logW(TAG, "No permission to kill process: " + pkg);
+                    } else {
+                        hasSuccess = true;
+                    }
                 } else {
                     hasSuccess = true;
                 }