Skip to content

C
cordova-plugin-background-geolocation
Commit a940ddd8 authored by Brian Samson's avatar Brian Samson
Browse files
Options

plugin installs and is working with previous api

parent c7d0d19c
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 43 deletions
plugin.xml
View file @ a940ddd8
......@@ -18,16 +18,18 @@
<!-- android -->
<platform name="android">
<source-file src="src/android/BackgroundGpsPlugin.java" target-dir="src/com/tenforwardconsulting/cordova/backgroundgeolocation" />
<source-file src="src/android/LocationUpdateService.java" target-dir="src/com/tenforwardconsulting/cordova/backgroundgeolocation" />
<source-file src="src/android/data/DAOFactory.java" target-dir="src/com/tenforwardconsulting/cordova/backgroundgeolocation" />
<source-file src="src/android/data/Location.java" target-dir="src/com/tenforwardconsulting/cordova/backgroundgeolocation" />
<source-file src="src/android/data/LocationDAO.java" target-dir="src/com/tenforwardconsulting/cordova/backgroundgeolocation" />
<source-file src="src/android/data/sqlite/LocationOpenHelper.java" target-dir="src/com/tenforwardconsulting/cordova/backgroundgeolocation" />
<source-file src="src/android/data/sqlite/SQLiteLocationDAO.java" target-dir="src/com/tenforwardconsulting/cordova/backgroundgeolocation" />
<source-file src="src/android/BackgroundGpsPlugin.java" target-dir="src/com/tenforwardconsulting/cordova/bgloc" />
<source-file src="src/android/LocationUpdateService.java" target-dir="src/com/tenforwardconsulting/cordova/bgloc" />
<source-file src="src/android/data/DAOFactory.java" target-dir="src/com/tenforwardconsulting/cordova/bgloc/data" />
<source-file src="src/android/data/Location.java" target-dir="src/com/tenforwardconsulting/cordova/bgloc/data" />
<source-file src="src/android/data/LocationDAO.java" target-dir="src/com/tenforwardconsulting/cordova/bgloc/data" />
<source-file src="src/android/data/sqlite/LocationOpenHelper.java" target-dir="src/com/tenforwardconsulting/cordova/bgloc/data/sqlite" />
<source-file src="src/android/data/sqlite/SQLiteLocationDAO.java" target-dir="src/com/tenforwardconsulting/cordova/bgloc/data/sqlite" />
<config-file target="AndroidManifest.xml" parent="/manifest/application">
<service android:enabled="true" android:name="com.tenforwardconsulting.cordova.backgroundgeolocation.LocationUpdateService" android:process=":remote" />
<source-file src="src/android/android-support-v4.jar" target-dir="libs" />
<config-file target="AndroidManifest.xml" parent="/manifest/application">
<service android:enabled="true" android:name="com.tenforwardconsulting.cordova.bgloc.LocationUpdateService" android:process=":remote" />
</config-file>
<config-file target="AndroidManifest.xml" parent="/manifest">
......@@ -38,7 +40,7 @@
</config-file>
<config-file target="res/xml/config.xml" parent="/*">
<feature name="BackgroundGeoLocation">
<param name="android-package" value="com.tenforwardconsulting.cordova.background-geolocation"/>
<param name="android-package" value="com.tenforwardconsulting.cordova.bgloc.BackgroundGpsPlugin"/>
</feature>
</config-file>
</platform>
......
src/android/BackgroundGpsPlugin.java
View file @ a940ddd8
package com.tenforwardconsulting.cordova.backgroundgeolocation;
package com.tenforwardconsulting.cordova.bgloc;
import org.apache.cordova.api.CallbackContext;
import org.apache.cordova.api.CordovaPlugin;
import org.apache.cordova.CallbackContext;
import org.apache.cordova.CordovaPlugin;
import org.json.JSONArray;
import org.json.JSONException;
......
src/android/LocationUpdateService.java
View file @ a940ddd8
package com.tenforwardconsulting.cordova.backgroundgeolocation;
package com.tenforwardconsulting.cordova.bgloc;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpPost;
......@@ -6,9 +6,10 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.json.JSONObject;
import com.tenforwardconsulting.cordova.backgroundgeolocation.data.DAOFactory;
import com.tenforwardconsulting.cordova.backgroundgeolocation.data.LocationDAO;
import com.tenforwardconsulting.cordova.bgloc.data.DAOFactory;
import com.tenforwardconsulting.cordova.bgloc.data.LocationDAO;
import android.app.Application;
import android.app.Notification;
import android.app.NotificationManager;
import android.support.v4.app.NotificationCompat;
......@@ -110,11 +111,15 @@ public class LocationUpdateService extends Service implements LocationListener {
PackageManager pm = this.getPackageManager();
Intent notificationIntent = pm.getLaunchIntentForPackage(this.getPackageName());
notificationIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
Application application = this.getApplication();
int backgroundIconId = application.getResources().getIdentifier("background_notification", "drawable", application.getPackageName());
int appNameId = application.getResources().getIdentifier("app_name", "string", application.getPackageName());
PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
.setSmallIcon(R.drawable.notification)
.setContentTitle(this.getString(R.string.app_name))
.setSmallIcon(backgroundIconId)
.setContentTitle(this.getString(appNameId))
.setOngoing(true)
.setContentIntent(contentIntent)
.setWhen(System.currentTimeMillis());
......@@ -164,7 +169,7 @@ public class LocationUpdateService extends Service implements LocationListener {
Log.d(TAG, "afterexecute " + task.getStatus());
}
private boolean postLocation(com.tenforwardconsulting.cordova.backgroundgeolocation.data.Location l) {
private boolean postLocation(com.tenforwardconsulting.cordova.bgloc.data.Location l) {
if (l == null) {
Log.w(TAG, "postLocation: null location");
return false;
......@@ -203,8 +208,8 @@ public class LocationUpdateService extends Service implements LocationListener {
}
}
private void persistLocation(Location location) {
LocationDAO dao = DAOFactory.createLocationDAO();
com.tenforwardconsulting.cordova.backgroundgeolocation.data.Location savedLocation = com.tenforwardconsulting.cordova.backgroundgeolocation.data.Location.fromAndroidLocation(location);
LocationDAO dao = DAOFactory.createLocationDAO(this.getApplicationContext());
com.tenforwardconsulting.cordova.bgloc.data.Location savedLocation = com.tenforwardconsulting.cordova.bgloc.data.Location.fromAndroidLocation(location);
if (dao.persistLocation(savedLocation)) {
Log.d(TAG, "Persisted Location: " + savedLocation);
......@@ -239,7 +244,7 @@ public class LocationUpdateService extends Service implements LocationListener {
Log.d(TAG, "#timestamp " + System.currentTimeMillis());
if (lastUpdateTime + 5*60*1000 < SystemClock.elapsedRealtime()) {
Log.d(TAG, "5 minutes, forcing update with last location");
postLocation(com.tenforwardconsulting.cordova.backgroundgeolocation.Location.fromAndroidLocation(
postLocation(com.tenforwardconsulting.cordova.bgloc.data.Location.fromAndroidLocation(
locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER)));
}
try {
......@@ -258,8 +263,8 @@ public class LocationUpdateService extends Service implements LocationListener {
@Override
protected Boolean doInBackground(Object...objects) {
Log.d(TAG, "Executing PostLocationTask#doInBackground");
LocationDAO locationDAO = DAOFactory.createLocationDAO();
for (com.tenforwardconsulting.cordova.backgroundgeolocation.data.Location savedLocation : locationDAO.getAllLocations()) {
LocationDAO locationDAO = DAOFactory.createLocationDAO(LocationUpdateService.this.getApplicationContext());
for (com.tenforwardconsulting.cordova.bgloc.data.Location savedLocation : locationDAO.getAllLocations()) {
Log.d(TAG, "Posting saved location");
if (postLocation(savedLocation)) {
locationDAO.deleteLocation(savedLocation);
......
src/android/data/DAOFactory.java
View file @ a940ddd8
package com.tenforwardconsulting.cordova.backgroundgeolocation.data;
package com.tenforwardconsulting.cordova.bgloc.data;
import com.tenforwardconsulting.cordova.backgroundgeolocation.data.sqlite.SQLiteLocationDAO;
import android.content.Context;
import com.tenforwardconsulting.cordova.bgloc.data.sqlite.SQLiteLocationDAO;
public abstract class DAOFactory {
public static LocationDAO createLocationDAO() {
public static LocationDAO createLocationDAO(Context context) {
//Very basic for now
return new SQLiteLocationDAO();
return new SQLiteLocationDAO(context);
}
}
src/android/data/Location.java
View file @ a940ddd8
package com.tenforwardconsulting.cordova.backgroundgeolocation.data;
package com.tenforwardconsulting.cordova.bgloc.data;
import java.util.Date;
......
src/android/data/LocationDAO.java
View file @ a940ddd8
package com.tenforwardconsulting.cordova.backgroundgeolocation.data;
package com.tenforwardconsulting.cordova.bgloc.data;
public interface LocationDAO {
public Location[] getAllLocations();
......
src/android/data/sqlite/LocationOpenHelper.java
View file @ a940ddd8
package com.tenforwardconsulting.cordova.backgroundgeolocation;
package com.tenforwardconsulting.cordova.bgloc.data.sqlite;
import com.geocrowd.android.core.GeoCrowdApplication;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log;
public class LocationOpenHelper extends SQLiteOpenHelper {
private static final String SQLITE_DATABASE_NAME = "cordova_bg_locations";
private static final int DATABASE_VERSION = 1;
public static final String LOCATION_TABLE_NAME = "location";
private static final String LOCATION_TABLE_COLUMNS =
......@@ -23,8 +21,8 @@ public class LocationOpenHelper extends SQLiteOpenHelper {
");";
LocationOpenHelper(Context context) {
super(context, GeoCrowdApplication.SQLITE_DATABASE_NAME, null, DATABASE_VERSION);
}
super(context, SQLITE_DATABASE_NAME, null, DATABASE_VERSION);
}
@Override
public void onCreate(SQLiteDatabase db) {
......
src/android/data/sqlite/SQLiteLocationDAO.java
View file @ a940ddd8
package com.tenforwardconsulting.cordova.backgroundgeolocation.data.sqlite;
package com.tenforwardconsulting.cordova.bgloc.data.sqlite;
import java.text.ParseException;
import java.text.SimpleDateFormat;
......@@ -7,22 +7,29 @@ import java.util.Date;
import java.util.List;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.util.Log;
import com.tenforwardconsulting.cordova.backgroundgeolocation.data.Location;
import com.tenforwardconsulting.cordova.backgroundgeolocation.LocationDAO;
import com.tenforwardconsulting.cordova.bgloc.data.Location;
import com.tenforwardconsulting.cordova.bgloc.data.LocationDAO;
public class SQLiteLocationDAO implements LocationDAO {
public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
private static final String TAG = "SQLiteLocationDAO";
private Context context;
public SQLiteLocationDAO(Context context) {
this.context = context;
}
public Location[] getAllLocations() {
SQLiteDatabase db = null;
Cursor c = null;
List<Location> all = new ArrayList<Location>();
try {
db = new LocationOpenHelper(GeoCrowdApplication.getApplication().getApplicationContext()).getReadableDatabase();
db = new LocationOpenHelper(context).getReadableDatabase();
c = db.query(LocationOpenHelper.LOCATION_TABLE_NAME, null, null, null, null, null, null);
while (c.moveToNext()) {
all.add(hydrate(c));
......@@ -39,7 +46,7 @@ public class SQLiteLocationDAO implements LocationDAO {
}
public boolean persistLocation(Location location) {
SQLiteDatabase db = new LocationOpenHelper(GeoCrowdApplication.getApplication().getApplicationContext()).getWritableDatabase();
SQLiteDatabase db = new LocationOpenHelper(context).getWritableDatabase();
db.beginTransaction();
ContentValues values = getContentValues(location);
long rowId = db.insert(LocationOpenHelper.LOCATION_TABLE_NAME, null, values);
......@@ -57,7 +64,7 @@ public class SQLiteLocationDAO implements LocationDAO {
}
public void deleteLocation(Location location) {
SQLiteDatabase db = new LocationOpenHelper(GeoCrowdApplication.getApplication().getApplicationContext()).getWritableDatabase();
SQLiteDatabase db = new LocationOpenHelper(context).getWritableDatabase();
db.beginTransaction();
db.delete(LocationOpenHelper.LOCATION_TABLE_NAME, "id = ?", new String[]{location.getId().toString()});
db.setTransactionSuccessful();
......
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