Commit 597faa0d authored by Chris Scott's avatar Chris Scott

Bugs in renaming

parent 3922103d
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
</config-file> </config-file>
<config-file target="res/xml/config.xml" parent="/*"> <config-file target="res/xml/config.xml" parent="/*">
<feature name="BackgroundGeoLocation"> <feature name="BackgroundGeoLocation">
......
package com.tenforwardconsulting.cordova.bgloc; package com.transistorsoft.cordova.bggeo;
import org.apache.cordova.CallbackContext; import org.apache.cordova.CallbackContext;
import org.apache.cordova.CordovaPlugin; import org.apache.cordova.CordovaPlugin;
...@@ -31,7 +31,7 @@ import android.media.AudioManager; ...@@ -31,7 +31,7 @@ import android.media.AudioManager;
import android.media.ToneGenerator; import android.media.ToneGenerator;
public class BackgroundGeolocationPlugin extends CordovaPlugin implements LocationListener, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener { public class BackgroundGeolocationPlugin extends CordovaPlugin implements LocationListener, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
private static final String TAG = "BackgroundGeoLocation"; private static final String TAG = "BackgroundGeolocation";
public static final String ACTION_START = "start"; public static final String ACTION_START = "start";
public static final String ACTION_STOP = "stop"; public static final String ACTION_STOP = "stop";
...@@ -88,7 +88,7 @@ public class BackgroundGeolocationPlugin extends CordovaPlugin implements Locati ...@@ -88,7 +88,7 @@ public class BackgroundGeolocationPlugin extends CordovaPlugin implements Locati
} }
// This is the IntentService we'll provide to google-play API. // This is the IntentService we'll provide to google-play API.
locationUpdateService = PendingIntent.getService(activity, 0, new Intent(activity, LocationService.class), PendingIntent.FLAG_UPDATE_CURRENT); locationUpdateService = PendingIntent.getService(activity, 0, new Intent(activity, BackgroundGeolocationService.class), PendingIntent.FLAG_UPDATE_CURRENT);
// Register for events fired by our IntentService "LocationService" // Register for events fired by our IntentService "LocationService"
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
......
package com.tenforwardconsulting.cordova.bgloc; package com.transistorsoft.cordova.bggeo;
import de.greenrobot.event.EventBus; import de.greenrobot.event.EventBus;
...@@ -15,7 +15,7 @@ public class BackgroundGeolocationService extends IntentService { ...@@ -15,7 +15,7 @@ public class BackgroundGeolocationService extends IntentService {
private static final String TAG = "BackgroundGeolocationService"; private static final String TAG = "BackgroundGeolocationService";
public LocationService() { public BackgroundGeolocationService() {
super("com.transistorsoft.cordova.bggeo.BackgroundGeolocationService"); super("com.transistorsoft.cordova.bggeo.BackgroundGeolocationService");
} }
...@@ -45,7 +45,7 @@ public class BackgroundGeolocationService extends IntentService { ...@@ -45,7 +45,7 @@ public class BackgroundGeolocationService extends IntentService {
break; break;
} }
boolean isPushPluginActive = BackgroundGpsPlugin.isActive(); boolean isPushPluginActive = BackgroundGeolocationPlugin.isActive();
if (isMoving && !isPushPluginActive) { if (isMoving && !isPushPluginActive) {
forceMainActivityReload(); forceMainActivityReload();
} }
...@@ -54,7 +54,7 @@ public class BackgroundGeolocationService extends IntentService { ...@@ -54,7 +54,7 @@ public class BackgroundGeolocationService extends IntentService {
final Location location = intent.getParcelableExtra(FusedLocationProviderApi.KEY_LOCATION_CHANGED); final Location location = intent.getParcelableExtra(FusedLocationProviderApi.KEY_LOCATION_CHANGED);
if (location != null) { if (location != null) {
Log.i(TAG, "Location received: " + location.toString()); Log.i(TAG, "Location received: " + location.toString());
boolean isPushPluginActive = BackgroundGpsPlugin.isActive(); boolean isPushPluginActive = BackgroundGeolocationPlugin.isActive();
if (!isPushPluginActive) { if (!isPushPluginActive) {
forceMainActivityReload(); forceMainActivityReload();
} }
......
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