update demo

- activate background monitoring with a button instead of on startup
- apply fix suggested in #86

Author: lini

demo/app/main-page.ts

@@ -3,7 +3,8 @@ import { Accuracy } from "ui/enums";
 import { EventData } from "data/observable";
 import { Page } from "ui/page";
 import { MainViewModel } from "./main-view-model";
-const utils = require("utils/utils");
+const utils = require("tns-core-modules/utils/utils");
+import * as application from "tns-core-modules/application";
 let locationService = require('./background-service');
 
 let page: Page;
@@ -14,10 +15,14 @@ declare var com: any;
 export function pageLoaded(args: EventData) {
     page = <Page>args.object;
     page.bindingContext = model;
+}
 
-    let context = utils.ad.getApplicationContext();
-    let intent = new android.content.Intent(context, com.nativescript.location.BackgroundService.class);
-    context.startService(intent);
+export function startBackgroundTap() {
+    if (application.android) {
+        let context = utils.ad.getApplicationContext();
+        let intent = new android.content.Intent(context, com.nativescript.location.BackgroundService.class);
+        context.startService(intent);
+    }
 }
 
 export function enableLocationTap() {

demo/app/main-page.xml

@@ -1,16 +1,19 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded" class="page">
-  <GridLayout rows="auto, *, auto">
+  <GridLayout rows="auto, auto, *, auto">
         <GridLayout row="0" columns="*, *, *, *" >
             <Button text="Enable Location" col="0" textWrap="true" tap="enableLocationTap"/>
             <Button text="Get Current Location" col="1" textWrap="true" tap="buttonGetLocationTap"/>
             <Button text="Start Monitoring" col="2" textWrap="true" tap="buttonStartTap"/>
             <Button text="Stop Monitoring" col="3" textWrap="true" tap="buttonStopTap"/>
         </GridLayout>
-        <ListView row="1" items="{{ locations }}">
+        <GridLayout row="1" columns="*" >
+            <Button text="Start Background thread monitoring" col="0" ios:visibility="collapsed" textWrap="true" tap="startBackgroundTap"/>
+        </GridLayout>
+        <ListView row="2" items="{{ locations }}">
             <ListView.itemTemplate>
                 <Label text="{{ $value, latitude + ', ' + longitude + ', ' + altitude }}" />
             </ListView.itemTemplate>
         </ListView>
-        <Button text="Clear" row="2" tap="buttonClearTap"/>
+        <Button text="Clear" row="3" tap="buttonClearTap"/>
     </GridLayout>
 </Page>

demo/package.json

@@ -5,7 +5,7 @@
       "version": "3.0.1"
     },
     "tns-android": {
-      "version": "3.2.0"
+      "version": "3.3.1"
     }
   },
   "dependencies": {

src/geolocation.android.ts

@@ -215,7 +215,7 @@ function _isGooglePlayServicesAvailable(): boolean {
 
     let isLocationServiceEnabled = true;
     let googleApiAvailability = com.google.android.gms.common.GoogleApiAvailability.getInstance();
-    let resultCode = googleApiAvailability.isGooglePlayServicesAvailable(androidAppInstance.foregroundActivity);
+    let resultCode = googleApiAvailability.isGooglePlayServicesAvailable(androidAppInstance.context);
     if (resultCode !== com.google.android.gms.common.ConnectionResult.SUCCESS) {
         isLocationServiceEnabled = false;
     }