Merge pull request #172 from shankari/implement_runtime_permissions

Fix notification messages generated for foreground service notifications
e-mission · Mar 28, 2019 · f1443cd · f1443cd
2 parents 856258f + 2fa05c2
commit f1443cd
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e-mission-data-collection",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Simple package that stores all the connection settings that need to be configured",
   "cordova": {
     "id": "e-mission-data-collection",

diff --git a/plugin.xml b/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
         id="edu.berkeley.eecs.emission.cordova.datacollection"
-        version="1.3.1">
+        version="1.3.2">
 
   <name>DataCollection</name>
   <description>Background data collection FTW! This is the part that I really

diff --git a/src/android/location/ActivityRecognitionChangeIntentService.java b/src/android/location/ActivityRecognitionChangeIntentService.java
@@ -29,7 +29,7 @@ public ActivityRecognitionChangeIntentService() {
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
 		Log.d(this, TAG, "onStartCommand called with intent "+intent+" flags "+flags+" startId "+startId);
-		TripDiaryStateMachineForegroundService.handleStart(this, "Handling geofence event", intent, flags, startId);
+		TripDiaryStateMachineForegroundService.handleStart(this, "Recording activity ", intent, flags, startId);
 		return super.onStartCommand(intent, flags, startId);
 	}
 

diff --git a/src/android/location/GeofenceExitIntentService.java b/src/android/location/GeofenceExitIntentService.java
@@ -35,7 +35,7 @@ public void onStart(Intent i, int startId) {
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
 		Log.d(this, TAG, "onStartCommand called with intent "+intent+" flags "+flags+" startId "+startId);
-		TripDiaryStateMachineForegroundService.handleStart(this, "Handling geofence event", intent, flags, startId);
+		TripDiaryStateMachineForegroundService.handleStart(this, "Handling geofence exit ", intent, flags, startId);
 		return super.onStartCommand(intent, flags, startId);		
 	}
 

diff --git a/src/android/location/LocationChangeIntentService.java b/src/android/location/LocationChangeIntentService.java
@@ -44,7 +44,7 @@ public void onCreate() {
 	@Override
 	public int onStartCommand(Intent i, int flags, int startId) {
 		Log.d(this, TAG, "onStart called with "+i+" startId "+startId);
-		TripDiaryStateMachineForegroundService.handleStart(this, "Handling geofence event", i, flags, startId);
+		TripDiaryStateMachineForegroundService.handleStart(this, "Recording location ", i, flags, startId);
 		return super.onStartCommand(i, flags, startId);
 	}
 

diff --git a/src/android/location/actions/GeofenceLocationIntentService.java b/src/android/location/actions/GeofenceLocationIntentService.java
@@ -41,7 +41,7 @@ public void onCreate() {
     @Override
     public int onStartCommand(Intent i, int flags, int startId) {
         Log.d(this, TAG, "onStart called with "+i+" startId "+startId);
-        TripDiaryStateMachineForegroundService.handleStart(this, "Handling geofence event", i, flags, startId);
+        TripDiaryStateMachineForegroundService.handleStart(this, "Handling geofence creation", i, flags, startId);
         return super.onStartCommand(i, flags, startId);
     }
 

diff --git a/www/ui/ionic/js/collect-settings.js b/www/ui/ionic/js/collect-settings.js
@@ -171,7 +171,7 @@ angular.module('emission.main.control.collection', [])
             if (ionic.Platform.isIOS()) {
                 cch.new_config.accuracy = cch.accuracyOptions["kCLLocationAccuracyBest"];
             } else if (ionic.Platform.isAndroid()) {
-                accuracy = cch.accuracyOptions["PRIORITY_HIGH_ACCURACY"];
+                cch.new_config.accuracy = cch.accuracyOptions["PRIORITY_HIGH_ACCURACY"];
             }
         } else {
             if (ionic.Platform.isIOS()) {