From 60cbb4753ffc2bda75d9564c128829c5b1310d77 Mon Sep 17 00:00:00 2001 From: Vladimir Enchev Date: Thu, 18 Feb 2016 15:22:45 +0200 Subject: [PATCH] Android app initialization error handling improved --- application/application.android.ts | 3 +++ utils/utils.android.ts | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/application/application.android.ts b/application/application.android.ts index 75222ff5c..10c8c8b54 100644 --- a/application/application.android.ts +++ b/application/application.android.ts @@ -309,6 +309,9 @@ export function start(entry?: frame.NavigationEntry) { setupOrientationListener(androidApp); } }); + + global.androidAppInitialized = true; + loadCss(); } diff --git a/utils/utils.android.ts b/utils/utils.android.ts index 3db726aff..9480d1317 100644 --- a/utils/utils.android.ts +++ b/utils/utils.android.ts @@ -148,7 +148,13 @@ export module ad { view.setEllipsize(value === enums.WhiteSpace.nowrap ? android.text.TextUtils.TruncateAt.END : null); } - export function getApplication() { return (com.tns).NativeScriptApplication.getInstance(); } + export function getApplication() { + if (global.androidAppInitialized) { + return (com.tns).NativeScriptApplication.getInstance(); + } else { + throw new Error("Triyng to access application context however the application is not yet initialized. Please use application 'launch' event! Stack trace: " + (new Error()).stack); + } + } export function getApplicationContext() { return getApplication().getApplicationContext(); } var inputMethodManager: android.view.inputmethod.InputMethodManager;