fix: check if auto profiling is enabled before launching apps

Xtr126 · Oct 5, 2024 · aa233d4 · aa233d4
1 parent d8d78da
commit aa233d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/app/src/main/java/xtr/keymapper/TouchPointer.java b/app/src/main/java/xtr/keymapper/TouchPointer.java
@@ -288,13 +288,6 @@ public void setCursorY(int y)  {
      * service.
      */
     private final ActivityObserver mActivityObserverCallback = new ActivityObserver.Stub() {
-        private void reloadKeymap() {
-            try {
-                mService.resumeMouse();
-                mService.reloadKeymap();
-            } catch (RemoteException ignored) {
-            }
-        }
         private String lastPackageName = null;
 
         @Override
@@ -308,8 +301,7 @@ public void onForegroundActivitiesChanged(String packageName) {
                 mHandler.post(() -> {
                     ProfileSelector.showEnableProfileDialog(context, packageName, enabled ->
                             ProfileSelector.createNewProfileForApp(context, packageName, enabled, profile -> {
-                                TouchPointer.this.selectedProfile = profile;
-                                reloadKeymap();
+                                launchProfile(profile);
                             }));
                 });
             } else {

diff --git a/app/src/main/java/xtr/keymapper/server/RemoteService.java b/app/src/main/java/xtr/keymapper/server/RemoteService.java
@@ -235,7 +235,7 @@ public void startServer(KeymapProfile profile, KeymapConfig keymapConfig, IRemot
                 throw new RuntimeException(e);
             }
             // Launch app/game
-            if (!profile.packageName.equals(BuildConfig.APPLICATION_ID)) {
+            if (!profile.packageName.equals(BuildConfig.APPLICATION_ID) && keymapConfig.disableAutoProfiling) {
                 Intent launchIntent = context.getPackageManager().getLaunchIntentForPackage(profile.packageName);
                 if (launchIntent != null && launchIntent.getComponent() != null) try {
                     new ProcessBuilder("am", "start", "-a", "android.intent.action.MAIN", "-n",