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

Improve the default nativeApp initialization.

Browse Source
This commit is contained in:
atanasovg
2016-06-06 10:01:18 +03:00
parent 87b0f53c3d
commit 9847c9f803
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tns-core-modules/utils/utils.android.ts
View File

@@ -156,7 +156,9 @@ export module ad {
if(com.tns.NativeScriptApplication) { if(com.tns.NativeScriptApplication) {
nativeApp = com.tns.NativeScriptApplication.getInstance(); nativeApp = com.tns.NativeScriptApplication.getInstance();
} }
else {
// the getInstance might return null if com.tns.NativeScriptApplication exists but is not the starting app type
if(!nativeApp) {
// check whether application.android.init has been explicitly called // check whether application.android.init has been explicitly called
let application = require("application"); let application = require("application");
nativeApp = application.android.nativeApp; nativeApp = application.android.nativeApp;
@@ -173,6 +175,7 @@ export module ad {
} }
} }
// we cannot work without having the app instance
if(!nativeApp) { if(!nativeApp) {
throw new Error("Failed to retrieve native Android Application object. If you have a custom android.app.Application type implemented make sure that you've called the '<application-module>.android.init' method.") throw new Error("Failed to retrieve native Android Application object. If you have a custom android.app.Application type implemented make sure that you've called the '<application-module>.android.init' method.")
} }