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.

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

implement getting Main Activity from an Activity alias on Android #2310

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ const customFlavorManifest = fs.readFileSync(
path.join(__dirname, './files/AndroidManifest-custom-flavor.xml'),
);

const activityAliasManifest = fs.readFileSync(
path.join(__dirname, './files/AndroidManifest-activity-alias.xml'),
);

const mainManifest = fs.readFileSync(
path.join(__dirname, './files/AndroidManifest.xml'),
);
Expand Down Expand Up @@ -307,6 +311,12 @@ export const className = {
},
};

export const activityAlias = {
src: {
'AndroidManifest.xml': activityAliasManifest,
},
};

export const customFlavor = {
src: {
e2e: {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android">
<application android:name=".ExampleApplication">
<activity-alias android:name=".MainActivityAlias" android:targetActivity=".OldMainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="rntester" android:host="example" />
</intent-filter>
</activity-alias>
<activity android:name="com.old.package.OldMainActivity" android:exported="true"/>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false"/>
</application>
</queries>
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ describe('android::getMainActivity', () => {
app: mocks.customFlavor,
},
},
activityAlias: {
android: {
app: mocks.activityAlias,
},
},
});
});

Expand Down Expand Up @@ -70,4 +75,12 @@ describe('android::getMainActivity', () => {
const fakeManifestPath = findManifest('/empty');
expect(getMainActivity(fakeManifestPath || '')).toBeNull();
});

it('returns activity defined as alias in the manifest', () => {
const manifestPath = findManifest('/activityAlias');
const manifest = getMainActivity(manifestPath || '');
expect(manifest).not.toBeNull();
expect(typeof manifest).toBe('string');
expect(manifest).toBe('.MainActivityAlias');
});
});
7 changes: 7 additions & 0 deletions packages/cli-platform-android/src/config/getMainActivity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export default function getMainActivity(manifestPath: string): string | null {

const application = manifest.application || {};
const activity = application.activity || {};
const activityAlias = application['activity-alias'] || {};

let activities: Activity[] = [];

Expand All @@ -40,6 +41,12 @@ export default function getMainActivity(manifestPath: string): string | null {
activities = activity;
}

if (!Array.isArray(activityAlias)) {
activities.push(activityAlias);
} else {
activities = activities.concat(activityAlias);
}

const mainActivity = activities.find((act: Activity) => {
let intentFilters = act['intent-filter'];

Expand Down