fix: launching activity defined with fully qualified name

react-native-community · Jan 19, 2024 · 06aaaf2 · 06aaaf2
1 parent 4d79e33
commit 06aaaf2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/packages/cli-platform-android/src/commands/runAndroid/__tests__/tryLaunchAppOnDevice.test.ts b/packages/cli-platform-android/src/commands/runAndroid/__tests__/tryLaunchAppOnDevice.test.ts
@@ -59,6 +59,28 @@ test('launches adb shell with intent to launch com.myapp.MainActivity with diffe
   );
 });
 
+test('launches adb shell with intent to launch com.myapp.MainActivity with different appId than packageName on a simulator when mainActivity is fully qualified name', () => {
+  tryLaunchAppOnDevice(
+    device,
+    {...androidProject, mainActivity: 'com.myapp.MainActivity'},
+    adbPath,
+    args,
+  );
+
+  expect(execa.sync).toHaveBeenCalledWith(
+    'path/to/adb',
+    [
+      '-s',
+      'emulator-5554',
+      ...shellStartCommand,
+      '-n',
+      'com.myapp.custom/com.myapp.MainActivity',
+      ...actionCategoryFlags,
+    ],
+    {stdio: 'inherit'},
+  );
+});
+
 test('launches adb shell with intent to launch com.myapp.MainActivity with same appId as packageName on a simulator', () => {
   tryLaunchAppOnDevice(
     device,

diff --git a/packages/cli-platform-android/src/commands/runAndroid/tryLaunchAppOnDevice.ts b/packages/cli-platform-android/src/commands/runAndroid/tryLaunchAppOnDevice.ts
@@ -24,7 +24,9 @@ function tryLaunchAppOnDevice(
     .filter(Boolean)
     .join('.');
 
-  const activityToLaunch = mainActivity.includes('.')
+  const activityToLaunch = mainActivity.startsWith(packageName)
+    ? mainActivity
+    : mainActivity.startsWith('.')
     ? [packageName, mainActivity].join('')
     : [packageName, mainActivity].filter(Boolean).join('.');