javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 19:26:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: ensure android can access native app instance before bootstrap

Browse Source
This commit is contained in:
Nathan Walker
2022-01-13 18:23:03 -08:00
parent d1dc7883f8
commit f10cffcb02
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/application/index.android.ts
View File

@ -165,11 +165,15 @@ export { androidApp as android };
let mainEntry: NavigationEntry; let mainEntry: NavigationEntry;
let started = false; let started = false;
export function run(entry?: NavigationEntry | string) { function ensureNativeApplication() {
if (!androidApp) { if (!androidApp) {
androidApp = new AndroidApplication(); androidApp = new AndroidApplication();
appCommon.setApplication(androidApp); appCommon.setApplication(androidApp);
} }
}
export function run(entry?: NavigationEntry | string) {
ensureNativeApplication();
if (started) { if (started) {
throw new Error('Application is already started.'); throw new Error('Application is already started.');
@ -233,6 +237,8 @@ export function getRootView(): View {
} }
export function getNativeApplication(): android.app.Application { export function getNativeApplication(): android.app.Application {
ensureNativeApplication();
// Try getting it from module - check whether application.android.init has been explicitly called // Try getting it from module - check whether application.android.init has been explicitly called
let nativeApp = androidApp.nativeApp; let nativeApp = androidApp.nativeApp;
if (!nativeApp) { if (!nativeApp) {