getContext can't be a instance function as the majority of what calls it is static.

NathanaelA · NathanaelA · commit 18965494ddaa · 2016-01-13T15:30:03.000-06:00
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Nathanael Anderson
+Copyright (c) 2015, 2016 Nathanael Anderson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "nativescript-sqlite",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "A sqlite NativeScript module for Android and iOS",
   "main": "sqlite.js",
   "nativescript": {
     "platforms": {
-      "android": "0.1.1",
+      "android": "0.1.2",
       "ios": "0.1.0"
     }
   },
diff --git a/sqlite.android.js b/sqlite.android.js
@@ -1,10 +1,10 @@
 /**************************************************************************************
- * (c) 2015, Master Technology
+ * (c) 2015, 2016, Master Technology
  * Licensed under the MIT license or contact me for a support, changes, enhancements,
  * and/or if you require a commercial licensing
  *
  * Any questions please feel free to email me or put a issue up on github
- * Version 0.1.0 - Android                            Nathan@master-technology.com
+ * Version 0.1.2 - Android                            Nathan@master-technology.com
  *************************************************************************************/
 
 "use strict";
@@ -241,7 +241,7 @@ function Database(dbname, options, callback) {
     if (dbname !== ""  && dbname !== ":memory:") {
         //var pkgName = appModule.android.context.getPackageName();
         //noinspection JSUnresolvedFunction
-        dbname = this._getContext().getDatabasePath(dbname).getAbsolutePath();
+        dbname = _getContext().getDatabasePath(dbname).getAbsolutePath();
         var path = dbname.substr(0, dbname.lastIndexOf('/') + 1);
 
         // Create "databases" folder if it is missing.  This causes issues on Emulators if it is missing
@@ -292,22 +292,6 @@ function Database(dbname, options, callback) {
  */
 Database.prototype._isSqlite = true;
 
-/**
- * gets the current application context
- * @returns {*}
- * @private
- */
-Database.prototype._getContext = function() {
-    if (appModule.android.context) {
-        return (appModule.android.context);
-    }
-    var ctx = java.lang.Class.forName("android.app.AppGlobals").getMethod("getInitialApplication", null).invoke(null, null);
-    if (ctx) return ctx;
-
-    ctx = java.lang.Class.forName("android.app.ActivityThread").getMethod("currentApplication", null).invoke(null, null);
-    return ctx;
-};
-
 /***
  * This gets or sets the database version
  * @param valueOrCallback to set or callback(err, version)
@@ -767,7 +751,7 @@ Database.isSqlite = function(obj) {
  */
 Database.exists = function(name) {
     //noinspection JSUnresolvedFunction
-    var dbName = this._getContext().getDatabasePath(name).getAbsolutePath();
+    var dbName = _getContext().getDatabasePath(name).getAbsolutePath();
     var dbFile = new java.io.File(dbName);
     return dbFile.exists();
 };
@@ -778,7 +762,7 @@ Database.exists = function(name) {
  */
 Database.deleteDatabase = function(name) {
     //noinspection JSUnresolvedFunction
-    var dbName = this._getContext().getDatabasePath(name).getAbsolutePath();
+    var dbName = _getContext().getDatabasePath(name).getAbsolutePath();
     var dbFile = new java.io.File(dbName);
     if (dbFile.exists()) {
         dbFile.delete();
@@ -797,10 +781,10 @@ Database.copyDatabase = function(name) {
 
     //Open your local db as the input stream
     //noinspection JSUnresolvedFunction
-    var myInput = this._getContext().getAssets().open("app/"+name);
+    var myInput = _getContext().getAssets().open("app/"+name);
 
     //noinspection JSUnresolvedFunction
-    var dbname = this._getContext().getDatabasePath(name).getAbsolutePath();
+    var dbname = _getContext().getDatabasePath(name).getAbsolutePath();
     var path = dbname.substr(0, dbname.lastIndexOf('/') + 1);
 
     // Create "databases" folder if it is missing.  This causes issues on Emulators if it is missing
@@ -856,3 +840,18 @@ Database.VALUESARESTRINGS = 8;
 
 module.exports = Database;
 
+/**
+ * gets the current application context
+ * @returns {*}
+ * @private
+ */
+function _getContext() {
+    if (appModule.android.context) {
+        return (appModule.android.context);
+    }
+    var ctx = java.lang.Class.forName("android.app.AppGlobals").getMethod("getInitialApplication", null).invoke(null, null);
+    if (ctx) return ctx;
+
+    ctx = java.lang.Class.forName("android.app.ActivityThread").getMethod("currentApplication", null).invoke(null, null);
+    return ctx;
+}
diff --git a/sqlite.ios.js b/sqlite.ios.js
@@ -1,5 +1,5 @@
 /************************************************************************************
- * (c) 2015, Master Technology
+ * (c) 2015, 2016 Master Technology
  * Licensed under the MIT license or contact me for a support, changes, enhancements,
  * and/or if you require a commercial licensing
  *

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript-sqlite",`
`3`		`- "version": "1.0.6",`
	`3`	`+ "version": "1.0.7",`
`4`	`4`	`"description": "A sqlite NativeScript module for Android and iOS",`
`5`	`5`	`"main": "sqlite.js",`
`6`	`6`	`"nativescript": {`
`7`	`7`	`"platforms": {`
`8`		`- "android": "0.1.1",`
	`8`	`+ "android": "0.1.2",`
`9`	`9`	`"ios": "0.1.0"`
`10`	`10`	`}`
`11`	`11`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/************************************************************************************`
`2`		`- * (c) 2015, Master Technology`
	`2`	`+ * (c) 2015, 2016 Master Technology`
`3`	`3`	`* Licensed under the MIT license or contact me for a support, changes, enhancements,`
`4`	`4`	`* and/or if you require a commercial licensing`
`5`	`5`	`*`