Fix for Workers/Context

NathanaelA · NathanaelA · commit 88c53682b772 · 2019-02-12T23:07:33.000-06:00
diff --git a/src/changelog b/src/changelog
@@ -27,4 +27,5 @@ v2.2.5  - Fix CopyDatabase indexOf to lastIndexOf - Thanks Webleaf
 v2.2.6  - Forgot to include the ios sqlite helper in v2.2.4/v2.2.5
 v2.3.0  - Several minor issues fixed, Multi-threading added to Sqlite
 v2.3.1  - iOS SQLExec bind returns the wrong error value
-v2.3.2  - Added Promise tests, started ES6 updated.
+v2.3.2  - Added Promise tests, started ES6 updated.
+v2.3.3  - In some worker situations, the context cannot be retrieved, added additional method to get context.
diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-sqlite",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "A sqlite NativeScript module for Android and iOS",
   "main": "sqlite",
   "nativescript": {
diff --git a/src/sqlite.android.js b/src/sqlite.android.js
@@ -5,7 +5,7 @@
  *
  * Any questions please feel free to put a issue up on github
  * Nathan@master-technology.com                           http://nativescript.tools
- * Version 2.3.1 - Android
+ * Version 2.3.2 - Android
  *************************************************************************************/
 
 /* global global, require, module */
@@ -975,12 +975,22 @@ function _getContext() {
     if (appModule.android.context) {
         return (appModule.android.context);
     }
+    if (typeof appModule.getNativeApplication === 'function') {
+        let ctx = appModule.getNativeApplication();
+        if (ctx) {
+            return ctx;
+        }
+    }
+
+
     //noinspection JSUnresolvedFunction,JSUnresolvedVariable
-    let ctx = java.lang.Class.forName("android.app.AppGlobals").getMethod("getInitialApplication", null).invoke(null, null);
+    ctx = java.lang.Class.forName("android.app.AppGlobals").getMethod("getInitialApplication", null).invoke(null, null);
     if (ctx) return ctx;
 
     //noinspection JSUnresolvedFunction,JSUnresolvedVariable
     ctx = java.lang.Class.forName("android.app.ActivityThread").getMethod("currentApplication", null).invoke(null, null);
+    if (ctx) return ctx;
+
     return ctx;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript-sqlite",`
`3`		`- "version": "2.3.2",`
	`3`	`+ "version": "2.3.3",`
`4`	`4`	`"description": "A sqlite NativeScript module for Android and iOS",`
`5`	`5`	`"main": "sqlite",`
`6`	`6`	`"nativescript": {`