fix: call System.exit()

Xtr126 · Feb 20, 2024 · d156f8a · d156f8a
1 parent 4477c13
commit d156f8a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/app/src/main/java/xtr/keymapper/Server.java b/app/src/main/java/xtr/keymapper/Server.java
@@ -5,6 +5,8 @@
 import android.content.pm.PackageManager;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import com.topjohnwu.superuser.CallbackList;
 import com.topjohnwu.superuser.Shell;
 
@@ -23,6 +25,15 @@ public class Server {
  public File script;
  public MainActivity.Callback mCallback;
 
+ static {
+ // Set settings before the main shell can be created
+ Shell.enableVerboseLogging = false;
+ Shell.setDefaultBuilder(Shell.Builder.create()
+ .setFlags(Shell.FLAG_REDIRECT_STDERR)
+ .setTimeout(10)
+ );
+ }
+
  private void writeScript(ApplicationInfo ai) throws IOException, InterruptedException {
  final String className = RemoteService.class.getName();
 
@@ -64,15 +75,11 @@ public void onAddElement(String line) {
 
  public void startServer() {
  mCallback.updateCmdView1("exec sh " + script.getPath() + "\n");
- try {
- if (Shell.getCachedShell() != null)
- Shell.getCachedShell().close();
- } catch (IOException ignored) {
- }
  Shell.getShell(shell -> {
  if (!shell.isRoot()) mCallback.alertRootAccessNotFound();
- try {
- Shell.cmd(new FileInputStream(script)).to(callbackList).submit();
+ else try {
+ Shell.cmd(new FileInputStream(script)).to(callbackList)
+ .submit(out -> System.exit(1));
  } catch (FileNotFoundException e) {
  throw new RuntimeException(e);
  }

diff --git a/app/src/main/java/xtr/keymapper/activity/MainActivity.java b/app/src/main/java/xtr/keymapper/activity/MainActivity.java
@@ -178,6 +178,8 @@ public void alertRootAccessNotFound() {
  .setPositiveButton("OK", (dialog, which) -> {
  Intent launchIntent = MainActivity.this.getPackageManager().getLaunchIntentForPackage("me.weishu.kernelsu");
  if (launchIntent != null) startActivity(launchIntent);
+ finishAffinity();
+ System.exit(0);
  });
  runOnUiThread(() -> builder.create().show());
  }