Commit 1af4f38b authored by Chris Scott's avatar Chris Scott

bugs

parent 597faa0d
...@@ -52,7 +52,7 @@ public class BackgroundGeolocationPlugin extends CordovaPlugin implements Locati ...@@ -52,7 +52,7 @@ public class BackgroundGeolocationPlugin extends CordovaPlugin implements Locati
// Android-only config // Android-only config
private Integer locationUpdateInterval = 60000; private Integer locationUpdateInterval = 60000;
private Integer activityDetectionInterval = 60000; private Integer activityRecognitionInterval = 60000;
private CallbackContext callback; private CallbackContext callback;
...@@ -124,13 +124,13 @@ public class BackgroundGeolocationPlugin extends CordovaPlugin implements Locati ...@@ -124,13 +124,13 @@ public class BackgroundGeolocationPlugin extends CordovaPlugin implements Locati
JSONObject config = data.getJSONObject(0); JSONObject config = data.getJSONObject(0);
Log.i(TAG, "- configure: " + config.toString()); Log.i(TAG, "- configure: " + config.toString());
this.stationaryRadius = config.getInt("stationaryRadius"); stationaryRadius = config.getInt("stationaryRadius");
this.distanceFilter = (float) config.getInt("distanceFilter"); distanceFilter = (float) config.getInt("distanceFilter");
this.desiredAccuracy = config.getInt("desiredAccuracy"); desiredAccuracy = config.getInt("desiredAccuracy");
this.locationUpdateInterval = config.getInt("locationUpdateInterval"); locationUpdateInterval = config.getInt("locationUpdateInterval");
this.activityDetectionInterval = config.getInt("activityDetectionInterval"); activityRecognitionInterval = config.getInt("activityRecognitionInterval");
this.isDebugging = config.getBoolean("debug"); isDebugging = config.getBoolean("debug");
this.stopOnTerminate = config.getBoolean("stopOnTerminate"); stopOnTerminate = config.getBoolean("stopOnTerminate");
this.callback = callbackContext; this.callback = callbackContext;
} catch (JSONException e) { } catch (JSONException e) {
...@@ -274,7 +274,7 @@ public class BackgroundGeolocationPlugin extends CordovaPlugin implements Locati ...@@ -274,7 +274,7 @@ public class BackgroundGeolocationPlugin extends CordovaPlugin implements Locati
} }
private void requestActivityUpdates() { private void requestActivityUpdates() {
ActivityRecognition.ActivityRecognitionApi.requestActivityUpdates(googleApiClient, activityDetectionInterval, locationUpdateService); ActivityRecognition.ActivityRecognitionApi.requestActivityUpdates(googleApiClient, activityRecognitionInterval, locationUpdateService);
} }
private void removeActivityUpdates() { private void removeActivityUpdates() {
......
...@@ -14,11 +14,10 @@ module.exports = { ...@@ -14,11 +14,10 @@ module.exports = {
config.stationaryRadius = (config.stationaryRadius >= 0) ? config.stationaryRadius : 50; // meters config.stationaryRadius = (config.stationaryRadius >= 0) ? config.stationaryRadius : 50; // meters
config.distanceFilter = (config.distanceFilter >= 0) ? config.distanceFilter : 500; // meters config.distanceFilter = (config.distanceFilter >= 0) ? config.distanceFilter : 500; // meters
config.locationTimeout = (config.locationTimeout >= 0) ? config.locationTimeout : 60; // seconds config.locationUpdateInterval = (config.locationUpdateInterval >= 0) ? config.locationUpdateInterval : 60000; // ms
config.activityRecognitionInterval = (config.activityRecognitionInterval >= 0) ? config.activityRecognitionInterval : 60000; // ms
config.desiredAccuracy = (config.desiredAccuracy >= 0) ? config.desiredAccuracy : 100; // meters config.desiredAccuracy = (config.desiredAccuracy >= 0) ? config.desiredAccuracy : 100; // meters
config.debug = config.debug || false; config.debug = config.debug || false;
config.notificationTitle = config.notificationTitle || "Background tracking";
config.notificationText = config.notificationText || "ENABLED";
config.activityType = config.activityType || "OTHER"; config.activityType = config.activityType || "OTHER";
config.stopOnTerminate = config.stopOnTerminate || false; config.stopOnTerminate = config.stopOnTerminate || false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment