fix: Not activated false warning when launching editor #149

Author: Xtr126

app/src/main/java/xtr/keymapper/activity/MainActivity.java

@@ -90,14 +90,14 @@ protected void onCreate(Bundle savedInstanceState) {
              */
             if(!RemoteServiceHelper.useShizuku) {
                 Shell.getShell(shell -> {
-                    RemoteServiceHelper.getInstance(this, null);
-                    if (Shizuku.pingBinder() || getPackageManager().getLaunchIntentForPackage("moe.shizuku.privileged.api") != null) { // Ask user to enable shizuku if shizuku app detected
+                    // Ask user to enable shizuku if shizuku app detected
+                    if (Shizuku.pingBinder() || getPackageManager().getLaunchIntentForPackage("moe.shizuku.privileged.api") != null) {
                         showAlertDialog(R.string.detected_shizuku, R.string.use_shizuku_for_activation, (dialog, which) -> {
                             RemoteServiceHelper.useShizuku = keymapConfig.useShizuku = true;
                             keymapConfig.applySharedPrefs();
                             alertShizukuNotAuthorized();
                         }, R.string.ok);
-                    } else if (!RemoteServiceHelper.isRootService) {
+                    } else if (Boolean.FALSE.equals(Shell.isAppGrantedRoot())) {
                         alertRootAccessNotFound();
                     }
                 });
@@ -191,7 +191,7 @@ private Unit startPointer(Integer displayId) {
         if (RemoteServiceHelper.useShizuku) {
             if (!Shizuku.pingBinder() || Shizuku.checkSelfPermission() != PERMISSION_GRANTED)
                 alertShizukuNotAuthorized();
-        } else if (!RemoteServiceHelper.isRootService) {
+        } else if (Boolean.FALSE.equals(Shell.isAppGrantedRoot())) {
             alertRootAccessAndExit();
         }
 

app/src/main/java/xtr/keymapper/editor/EditorActivity.java

@@ -38,7 +38,6 @@ public void onCreate(Bundle savedInstanceState) {
         WindowInsetsControllerCompat windowInsetsController = WindowCompat.getInsetsController(getWindow(), getWindow().getDecorView());
         windowInsetsController.setSystemBarsBehavior(WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
         windowInsetsController.hide(WindowInsetsCompat.Type.systemBars());
-        RemoteServiceHelper.getInstance(this, service -> mService = service);
 
         if (editor != null) editor.hideView();
 
@@ -54,23 +53,32 @@ public void onCreate(Bundle savedInstanceState) {
             MainActivity.checkOverlayPermission(this);
         }
 
-        if (getEvent())
-            // Can receive key events from remote service
-            try {
-                mService.registerOnKeyEventListener(editor);
-                mService.pauseMouse();
-            } catch (RemoteException e) {
-                Log.e("editorActivity", e.getMessage(), e);
+        RemoteServiceHelper.getInstance(this, this::onConnection);
+    }
+
+    private void onConnection(IRemoteService service) {
+        if (editor != null) {
+            this.mService = service;
+            KeymapConfig keymapConfig = new KeymapConfig(this);
+
+            if (getEvent())
+                // Can receive key events from remote service
+                try {
+                    mService.registerOnKeyEventListener(editor);
+                    mService.pauseMouse();
+                } catch (RemoteException e) {
+                    Log.e("editorActivity", e.getMessage(), e);
+                }
+            else {
+                MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
+
+                builder.setMessage(R.string.dialog_alert_editor)
+                        .setPositiveButton(R.string.ok, (dialog, which) -> {})
+                        .setTitle(R.string.dialog_alert_editor_title);
+                AlertDialog dialog = builder.create();
+                if (keymapConfig.editorOverlay) dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);
+                dialog.show();
             }
-        else {
-            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
-
-            builder.setMessage(R.string.dialog_alert_editor)
-                    .setPositiveButton(R.string.ok, (dialog, which) -> {})
-                    .setTitle(R.string.dialog_alert_editor_title);
-            AlertDialog dialog = builder.create();
-            if (keymapConfig.editorOverlay) dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);
-            dialog.show();
         }
     }
 

app/src/main/java/xtr/keymapper/server/RemoteServiceHelper.java

@@ -11,8 +11,6 @@
 import android.os.ServiceManager;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.ipc.RootService;
 
@@ -23,7 +21,6 @@
 public class RemoteServiceHelper {
 
     private static IRemoteService service = null;
-    public static boolean isRootService = true;
     public static boolean useShizuku = false;
 
     public static void pauseKeymap(Context context){
@@ -59,14 +56,14 @@ public static void reloadKeymap(Context context) {
     public static void runIfActive(Context context, Runnable runnable) {
         getInstance(context, service -> {
             try {
-                if (service.isActive()) runnable.run();
+                if (service != null && service.isActive()) runnable.run();
             } catch (RemoteException ignored) {
             }
         });
     }
 
     public interface RootRemoteServiceCallback {
-        void onConnection(@NonNull IRemoteService service);
+        void onConnection(IRemoteService service);
     }
     public static class RemoteServiceConnection implements ServiceConnection {
         RootRemoteServiceCallback cb;
@@ -141,17 +138,18 @@ public static void getInstance(Context context, RootRemoteServiceCallback callba
         } else {
             getInstance();
             if (service != null) {
-                if (callback != null) callback.onConnection(service);
+                callback.onConnection(service);
             } else {
                 RemoteServiceConnection connection = new RemoteServiceConnection(callback);
                 if (useShizuku) {
                     if (Shizuku.pingBinder() && Shizuku.checkSelfPermission() == PackageManager.PERMISSION_GRANTED)
-                        if (callback != null) bindShizukuService(context, connection);
+                        bindShizukuService(context, connection);
+                    else callback.onConnection(null);
                 } else {
-                    Boolean hasRootAccess = Shell.isAppGrantedRoot();
-                    if (hasRootAccess != null) isRootService = hasRootAccess;
-                    Intent intent = new Intent(context, RootRemoteService.class);
-                    if (callback != null) RootService.bind(intent, connection);
+                    if (Boolean.TRUE.equals(Shell.isAppGrantedRoot())) {
+                        Intent intent = new Intent(context, RootRemoteService.class);
+                        RootService.bind(intent, connection);
+                    } else callback.onConnection(null);
                 }
             }
         }