Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: launching activity defined with fully qualified name #2269

Merged
merged 1 commit into from
Jan 19, 2024
Merged

fix: launching activity defined with fully qualified name #2269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions packages/cli-platform-android/src/commands/runAndroid/__tests__/tryLaunchAppOnDevice.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion packages/cli-platform-android/src/commands/runAndroid/tryLaunchAppOnDevice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('.');

Expand Down