Merge pull request #68 from Microsoft/a-hakhal/check-gps

Add check to make sure location services are switched ON

Author: momohs

MobileClient/src/pages/home/home.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { Component, NgZone, ViewChild, ElementRef } from '@angular/core';
-import { NavController, ModalController, Platform } from 'ionic-angular';
+import { NavController, ModalController, Platform, ToastController } from 'ionic-angular';
 import { Network } from 'ionic-native';
 
 import { Logger } from 'angular2-logger/core';
@@ -44,7 +44,8 @@ export class HomePage {
     private backgroundTrackerService: BackgroundTrackerService,
     private mapHostService: MapHostService,
     public modalCtrl: ModalController,
-    private settingsSrvc: SettingsService) {  
+    private settingsSrvc: SettingsService,
+    private toastController: ToastController) {  
 
       this.onDevice = this.platform.is('cordova');
       this.platform.ready().then(() => {
@@ -82,7 +83,15 @@ export class HomePage {
     }
 
     continueInitialization() {
-      this.backgroundTrackerService.startTracking();
+      this.backgroundTrackerService.startTracking().then(() => {
+        if(!this.backgroundTrackerService.isTracking){
+          this.toastController.create({
+            message: 'Location Services is disabled.\n Please enable it to continue.',
+            duration: 5000,
+            position: 'middle'
+          }).present();
+        }
+      });
 
       this.mapHostInitialized = true;
       this.mapHostService.initialize(this.mapElement.nativeElement);

MobileClient/src/pages/settings/settings.ts

@@ -62,15 +62,23 @@ export class SettingsPage {
   }
 
   startService() {
-    this.backgroundTrackerService.startTracking();
-
-    this.toastController.create({
-      message: 'Starting tracking service',
-      duration: 3000,
-      position: 'top'
-    }).present();
-
-    this.trackingServiceRunning = this.backgroundTrackerService.isTracking;
+    this.backgroundTrackerService.startTracking().then((values) => {
+      this.trackingServiceRunning = this.backgroundTrackerService.isTracking;
+        if(!this.trackingServiceRunning){
+          this.toastController.create({
+            message: 'Location Services is disabled.\n Please enable it to continue.',
+            duration: 5000,
+            position: 'middle',
+          }).present();  
+        }
+        else{
+          this.toastController.create({
+            message: 'Starting tracking service',
+            duration: 3000,
+            position: 'top'
+          }).present();
+        }
+    });
   }
 
   stopService() {

MobileClient/src/providers/background-tracker-service.ts

@@ -57,6 +57,13 @@ export class BackgroundTrackerService {
       return this.startPromise;
     }
 
+    let locationPromise = new Promise(function(resolve) {
+      backgroundGeolocation.isLocationEnabled(function (locationEnabled) {
+          resolve(locationEnabled)
+      }, function (error) {
+        resolve(false)
+      }); 
+    });
     this.isTracking = true;
 
     let startFinished;
@@ -68,13 +75,21 @@ export class BackgroundTrackerService {
     let settingsPromise = this.settingsService.get(Settings.BackgroundOptions);
     let tokenPromise = this.settingsService.get(Settings.SecurityToken);
 
-    let allPromises = Promise.all([urlPromise, settingsPromise, tokenPromise]);
+    let allPromises = Promise.all([urlPromise, settingsPromise, tokenPromise, locationPromise]);
 
     allPromises.then((values) => {
-
+      
       let trackingUrl = values[0];
       let bgOptions = values[1];
       let token = values[2];
+      let locationStatus = values[3];
+
+      if(!locationStatus){
+        this.isTracking = false;
+        this.logger.info('[INFO] BackgroundGeolocation services diabled');
+      }else{
+        this.logger.info('[INFO] BackgroundGeolocation services enabled');
+      }
 
       if (!bgOptions) {
         this.logger.info('no bgOptions settings');