@josuelmm/cordova-background-geolocation 3.0.2 → 3.1.1

package/android/common/src/main/java/com/marianhello/bgloc/Config.java

@@ -45,6 +45,10 @@ public class Config implements Parcelable
     private Boolean debug;
     private String notificationTitle;
     private String notificationText;
+    private String notificationSyncTitle;
+    private String notificationSyncText;
+    private String notificationSyncCompletedText;
+    private String notificationSyncFailedText;
     private String notificationIconLarge;
     private String notificationIconSmall;
     private String notificationIconColor;
@@ -60,10 +64,13 @@ public class Config implements Parcelable
     private String url;
     private String syncUrl;
     private Integer syncThreshold;
+    private Boolean syncEnabled;
     private HashMap httpHeaders;
     private Integer maxLocations;
     private LocationTemplate template;
     private Boolean enableWatchdog;
+    private Boolean showTime;
+    private Boolean showDistance;
 
     public Config () {
     }
@@ -76,6 +83,10 @@ public class Config implements Parcelable
         this.debug = config.debug;
         this.notificationTitle = config.notificationTitle;
         this.notificationText = config.notificationText;
+        this.notificationSyncTitle = config.notificationSyncTitle;
+        this.notificationSyncText = config.notificationSyncText;
+        this.notificationSyncCompletedText = config.notificationSyncCompletedText;
+        this.notificationSyncFailedText = config.notificationSyncFailedText;
         this.notificationIconLarge = config.notificationIconLarge;
         this.notificationIconSmall = config.notificationIconSmall;
         this.notificationIconColor = config.notificationIconColor;
@@ -91,9 +102,12 @@ public class Config implements Parcelable
         this.url = config.url;
         this.syncUrl = config.syncUrl;
         this.syncThreshold = config.syncThreshold;
+        this.syncEnabled = config.syncEnabled;
         this.httpHeaders = CloneHelper.deepCopy(config.httpHeaders);
         this.maxLocations = config.maxLocations;
         this.enableWatchdog = config.enableWatchdog;
+        this.showTime = config.showTime;
+        this.showDistance = config.showDistance;
         if (config.template instanceof AbstractLocationTemplate) {
             this.template = ((AbstractLocationTemplate)config.template).clone();
         }
@@ -106,6 +120,10 @@ public class Config implements Parcelable
         setDebugging((Boolean) in.readValue(null));
         setNotificationTitle(in.readString());
         setNotificationText(in.readString());
+        setNotificationSyncTitle(in.readString());
+        setNotificationSyncText(in.readString());
+        setNotificationSyncCompletedText(in.readString());
+        setNotificationSyncFailedText(in.readString());
         setLargeNotificationIcon(in.readString());
         setSmallNotificationIcon(in.readString());
         setNotificationIconColor(in.readString());
@@ -121,8 +139,11 @@ public class Config implements Parcelable
         setUrl(in.readString());
         setSyncUrl(in.readString());
         setSyncThreshold(in.readInt());
+        setSyncEnabled((Boolean) in.readValue(null));
         setMaxLocations(in.readInt());
         setEnableWatchdog((Boolean) in.readValue(null));
+        setShowTime((Boolean) in.readValue(null));
+        setShowDistance((Boolean) in.readValue(null));
         Bundle bundle = in.readBundle();
         setHttpHeaders((HashMap<String, String>) bundle.getSerializable("httpHeaders"));
         setTemplate((LocationTemplate) bundle.getSerializable(AbstractLocationTemplate.BUNDLE_KEY));
@@ -136,6 +157,10 @@ public class Config implements Parcelable
         config.debug = false;
         config.notificationTitle = "Background tracking";
         config.notificationText = "ENABLED";
+        config.notificationSyncTitle = "Syncing locations";
+        config.notificationSyncText = "Sync in progress";
+        config.notificationSyncCompletedText = "Sync completed";
+        config.notificationSyncFailedText = "Sync failed";
         config.notificationIconLarge = "";
         config.notificationIconSmall = "";
         config.notificationIconColor = "";
@@ -151,10 +176,13 @@ public class Config implements Parcelable
         config.url = "";
         config.syncUrl = "";
         config.syncThreshold = 100;
+        config.syncEnabled = true;
         config.httpHeaders = null;
         config.maxLocations = 10000;
         config.template = null;
         config.enableWatchdog = false;
+        config.showTime = false;
+        config.showDistance = false;
 
         return config;
     }
@@ -171,6 +199,10 @@ public class Config implements Parcelable
         out.writeValue(isDebugging());
         out.writeString(getNotificationTitle());
         out.writeString(getNotificationText());
+        out.writeString(getNotificationSyncTitle());
+        out.writeString(getNotificationSyncText());
+        out.writeString(getNotificationSyncCompletedText());
+        out.writeString(getNotificationSyncFailedText());
         out.writeString(getLargeNotificationIcon());
         out.writeString(getSmallNotificationIcon());
         out.writeString(getNotificationIconColor());
@@ -186,8 +218,11 @@ public class Config implements Parcelable
         out.writeString(getUrl());
         out.writeString(getSyncUrl());
         out.writeInt(getSyncThreshold());
+        out.writeValue(getSyncEnabled());
         out.writeInt(getMaxLocations());
         out.writeValue(getEnableWatchdog());
+        out.writeValue(getShowTime());
+        out.writeValue(getShowDistance());
         Bundle bundle = new Bundle();
         bundle.putSerializable("httpHeaders", getHttpHeaders());
         bundle.putSerializable(AbstractLocationTemplate.BUNDLE_KEY, (AbstractLocationTemplate) getTemplate());
@@ -293,6 +328,38 @@ public class Config implements Parcelable
         this.notificationText = notificationText;
     }
 
+    public String getNotificationSyncTitle() {
+        return notificationSyncTitle != null ? notificationSyncTitle : "Syncing locations";
+    }
+
+    public void setNotificationSyncTitle(String notificationSyncTitle) {
+        this.notificationSyncTitle = notificationSyncTitle;
+    }
+
+    public String getNotificationSyncText() {
+        return notificationSyncText != null ? notificationSyncText : "Sync in progress";
+    }
+
+    public void setNotificationSyncText(String notificationSyncText) {
+        this.notificationSyncText = notificationSyncText;
+    }
+
+    public String getNotificationSyncCompletedText() {
+        return notificationSyncCompletedText != null ? notificationSyncCompletedText : "Sync completed";
+    }
+
+    public void setNotificationSyncCompletedText(String notificationSyncCompletedText) {
+        this.notificationSyncCompletedText = notificationSyncCompletedText;
+    }
+
+    public String getNotificationSyncFailedText() {
+        return notificationSyncFailedText != null ? notificationSyncFailedText : "Sync failed";
+    }
+
+    public void setNotificationSyncFailedText(String notificationSyncFailedText) {
+        this.notificationSyncFailedText = notificationSyncFailedText;
+    }
+
     public boolean hasLargeNotificationIcon() {
         return notificationIconLarge != null && !notificationIconLarge.isEmpty();
     }
@@ -468,6 +535,20 @@ public class Config implements Parcelable
         this.syncThreshold = syncThreshold;
     }
 
+    public boolean hasSyncEnabled() {
+        return syncEnabled != null;
+    }
+
+    /** Whether synchronization to syncUrl is enabled. Default true. */
+    @Nullable
+    public Boolean getSyncEnabled() {
+        return syncEnabled != null ? syncEnabled : true;
+    }
+
+    public void setSyncEnabled(@Nullable Boolean syncEnabled) {
+        this.syncEnabled = syncEnabled;
+    }
+
     public boolean hasHttpHeaders() {
         return httpHeaders != null;
     }
@@ -538,6 +619,32 @@ public class Config implements Parcelable
         this.enableWatchdog = enableWatchdog;
     }
 
+    public boolean hasShowTime() {
+        return showTime != null;
+    }
+
+    @Nullable
+    public Boolean getShowTime() {
+        return showTime;
+    }
+
+    public void setShowTime(Boolean showTime) {
+        this.showTime = showTime;
+    }
+
+    public boolean hasShowDistance() {
+        return showDistance != null;
+    }
+
+    @Nullable
+    public Boolean getShowDistance() {
+        return showDistance;
+    }
+
+    public void setShowDistance(Boolean showDistance) {
+        this.showDistance = showDistance;
+    }
+
     @Override
     public String toString () {
         return new StringBuffer()
@@ -562,9 +669,12 @@ public class Config implements Parcelable
                 .append(" url=").append(getUrl())
                 .append(" syncUrl=").append(getSyncUrl())
                 .append(" syncThreshold=").append(getSyncThreshold())
+                .append(" syncEnabled=").append(getSyncEnabled())
                 .append(" httpHeaders=").append(getHttpHeaders().toString())
                 .append(" maxLocations=").append(getMaxLocations())
                 .append(" postTemplate=").append(hasTemplate() ? getTemplate().toString() : null)
+                .append(" showTime=").append(getShowTime())
+                .append(" showDistance=").append(getShowDistance())
                 .append("]")
                 .toString();
     }
@@ -603,6 +713,18 @@ public class Config implements Parcelable
         if (config2.hasNotificationText()) {
             merger.setNotificationText(config2.getNotificationText());
         }
+        if (config2.notificationSyncTitle != null) {
+            merger.setNotificationSyncTitle(config2.getNotificationSyncTitle());
+        }
+        if (config2.notificationSyncText != null) {
+            merger.setNotificationSyncText(config2.getNotificationSyncText());
+        }
+        if (config2.notificationSyncCompletedText != null) {
+            merger.setNotificationSyncCompletedText(config2.getNotificationSyncCompletedText());
+        }
+        if (config2.notificationSyncFailedText != null) {
+            merger.setNotificationSyncFailedText(config2.getNotificationSyncFailedText());
+        }
         if (config2.hasStopOnTerminate()) {
             merger.setStopOnTerminate(config2.getStopOnTerminate());
         }
@@ -648,6 +770,9 @@ public class Config implements Parcelable
         if (config2.hasSyncThreshold()) {
             merger.setSyncThreshold(config2.getSyncThreshold());
         }
+        if (config2.hasSyncEnabled()) {
+            merger.setSyncEnabled(config2.getSyncEnabled());
+        }
         if (config2.hasHttpHeaders()) {
             merger.setHttpHeaders(config2.getHttpHeaders());
         }
@@ -657,6 +782,12 @@ public class Config implements Parcelable
         if (config2.hasTemplate()) {
             merger.setTemplate(config2.getTemplate());
         }
+        if (config2.hasShowTime()) {
+            merger.setShowTime(config2.getShowTime());
+        }
+        if (config2.hasShowDistance()) {
+            merger.setShowDistance(config2.getShowDistance());
+        }
 
         return merger;
     }

package/android/common/src/main/java/com/marianhello/bgloc/HttpPostService.java

@@ -203,11 +203,44 @@ public class HttpPostService {
         }
         stream.close();
         byte[] bodyBytes = baos.toByteArray();
+        String jsonString = new String(bodyBytes, StandardCharsets.UTF_8);
+
+        // When form-urlencoded and body is a JSON array, send one POST per location (same flat
+        // format as real-time posting) so the same server endpoint accepts both.
+        if (isFormUrlEncoded) {
+            try {
+                Object parsed = new JSONTokener(jsonString).nextValue();
+                if (parsed instanceof JSONArray) {
+                    JSONArray arr = (JSONArray) parsed;
+                    int len = arr.length();
+                    if (len == 0) {
+                        if (listener != null) listener.onProgress(100);
+                        return 200;
+                    }
+                    for (int i = 0; i < len; i++) {
+                        JSONObject item = arr.getJSONObject(i);
+                        HttpPostService perRequest = new HttpPostService(mUrl);
+                        int code = perRequest.postJSON(item, headers);
+                        if (listener != null && len > 0) {
+                            listener.onProgress((i + 1) * 100 / len);
+                        }
+                        if (code < 200 || code >= 300) {
+                            return code;
+                        }
+                    }
+                    if (listener != null) {
+                        listener.onProgress(100);
+                    }
+                    return 200;
+                }
+            } catch (Exception e) {
+                // Fall through to single-POST with jsonToUrlEncoded (e.g. array wrap)
+            }
+        }
 
         byte[] outputBytes;
         if (isFormUrlEncoded) {
             try {
-                String jsonString = new String(bodyBytes, StandardCharsets.UTF_8);
                 String formBody = jsonToUrlEncoded(jsonString);
                 outputBytes = formBody.getBytes(StandardCharsets.UTF_8);
             } catch (Exception e) {

package/android/common/src/main/java/com/marianhello/bgloc/data/LocationDAO.java

@@ -19,4 +19,9 @@ public interface LocationDAO {
     BackgroundLocation deleteFirstUnpostedLocation();
     int deleteAllLocations();
     int deleteUnpostedLocations();
+    /**
+     * Delete (mark as deleted) all locations that are pending sync to syncUrl.
+     * Same effect as discarding the pending sync queue without sending to server.
+     */
+    int deletePendingSyncLocations();
 }

package/android/common/src/main/java/com/marianhello/bgloc/data/provider/ContentProviderLocationDAO.java

@@ -392,4 +392,15 @@ public class ContentProviderLocationDAO implements LocationDAO {
 
         return mResolver.update(mContentUri, values, whereClause, whereArgs);
     }
+
+    @Override
+    public int deletePendingSyncLocations() {
+        ContentValues values = new ContentValues();
+        values.put(LocationEntry.COLUMN_NAME_STATUS, BackgroundLocation.DELETED);
+
+        String whereClause = LocationEntry.COLUMN_NAME_STATUS + " = ?";
+        String[] whereArgs = { String.valueOf(BackgroundLocation.SYNC_PENDING) };
+
+        return mResolver.update(mContentUri, values, whereClause, whereArgs);
+    }
 }

package/android/common/src/main/java/com/marianhello/bgloc/data/sqlite/SQLiteConfigurationContract.java

@@ -22,6 +22,10 @@ public final class SQLiteConfigurationContract {
         public static final String COLUMN_NAME_DEBUG = "debugging";
         public static final String COLUMN_NAME_NOTIF_TITLE = "notification_title";
         public static final String COLUMN_NAME_NOTIF_TEXT = "notification_text";
+        public static final String COLUMN_NAME_NOTIF_SYNC_TITLE = "notification_sync_title";
+        public static final String COLUMN_NAME_NOTIF_SYNC_TEXT = "notification_sync_text";
+        public static final String COLUMN_NAME_NOTIF_SYNC_COMPLETED = "notification_sync_completed_text";
+        public static final String COLUMN_NAME_NOTIF_SYNC_FAILED = "notification_sync_failed_text";
         public static final String COLUMN_NAME_NOTIF_ICON_LARGE = "notification_icon_large";
         public static final String COLUMN_NAME_NOTIF_ICON_SMALL = "notification_icon_small";
         public static final String COLUMN_NAME_NOTIF_COLOR = "notification_icon_color";
@@ -37,9 +41,12 @@ public final class SQLiteConfigurationContract {
         public static final String COLUMN_NAME_URL = "url";
         public static final String COLUMN_NAME_SYNC_URL = "sync_url";
         public static final String COLUMN_NAME_SYNC_THRESHOLD = "sync_threshold";
+        public static final String COLUMN_NAME_SYNC_ENABLED = "sync_enabled";
         public static final String COLUMN_NAME_HEADERS = "http_headers";
         public static final String COLUMN_NAME_MAX_LOCATIONS = "max_locations";
         public static final String COLUMN_NAME_TEMPLATE = "template";
+        public static final String COLUMN_NAME_SHOW_TIME = "show_time";
+        public static final String COLUMN_NAME_SHOW_DISTANCE = "show_distance";
 
         public static final String SQL_CREATE_CONFIG_TABLE =
                 "CREATE TABLE " + ConfigurationEntry.TABLE_NAME + " (" +
@@ -50,6 +57,10 @@ public final class SQLiteConfigurationContract {
                         ConfigurationEntry.COLUMN_NAME_DEBUG + INTEGER_TYPE + COMMA_SEP +
                         ConfigurationEntry.COLUMN_NAME_NOTIF_TITLE + TEXT_TYPE + COMMA_SEP +
                         ConfigurationEntry.COLUMN_NAME_NOTIF_TEXT + TEXT_TYPE + COMMA_SEP +
+                        ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_TITLE + TEXT_TYPE + COMMA_SEP +
+                        ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_TEXT + TEXT_TYPE + COMMA_SEP +
+                        ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_COMPLETED + TEXT_TYPE + COMMA_SEP +
+                        ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_FAILED + TEXT_TYPE + COMMA_SEP +
                         ConfigurationEntry.COLUMN_NAME_NOTIF_ICON_SMALL + TEXT_TYPE + COMMA_SEP +
                         ConfigurationEntry.COLUMN_NAME_NOTIF_ICON_LARGE + TEXT_TYPE + COMMA_SEP +
                         ConfigurationEntry.COLUMN_NAME_NOTIF_COLOR + TEXT_TYPE + COMMA_SEP +
@@ -65,9 +76,12 @@ public final class SQLiteConfigurationContract {
                         ConfigurationEntry.COLUMN_NAME_URL + TEXT_TYPE + COMMA_SEP +
                         ConfigurationEntry.COLUMN_NAME_SYNC_URL + TEXT_TYPE + COMMA_SEP +
                         ConfigurationEntry.COLUMN_NAME_SYNC_THRESHOLD + INTEGER_TYPE + COMMA_SEP +
+                        ConfigurationEntry.COLUMN_NAME_SYNC_ENABLED + INTEGER_TYPE + COMMA_SEP +
                         ConfigurationEntry.COLUMN_NAME_HEADERS + TEXT_TYPE + COMMA_SEP +
                         ConfigurationEntry.COLUMN_NAME_MAX_LOCATIONS + INTEGER_TYPE + COMMA_SEP +
-                        ConfigurationEntry.COLUMN_NAME_TEMPLATE + TEXT_TYPE +
+                        ConfigurationEntry.COLUMN_NAME_TEMPLATE + TEXT_TYPE + COMMA_SEP +
+                        ConfigurationEntry.COLUMN_NAME_SHOW_TIME + INTEGER_TYPE + COMMA_SEP +
+                        ConfigurationEntry.COLUMN_NAME_SHOW_DISTANCE + INTEGER_TYPE +
                         " )";
 
         public static final String SQL_DROP_CONFIG_TABLE =

package/android/common/src/main/java/com/marianhello/bgloc/data/sqlite/SQLiteConfigurationDAO.java

@@ -39,6 +39,10 @@ public class SQLiteConfigurationDAO implements ConfigurationDAO {
       ConfigurationEntry.COLUMN_NAME_DEBUG,
       ConfigurationEntry.COLUMN_NAME_NOTIF_TITLE,
       ConfigurationEntry.COLUMN_NAME_NOTIF_TEXT,
+      ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_TITLE,
+      ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_TEXT,
+      ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_COMPLETED,
+      ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_FAILED,
       ConfigurationEntry.COLUMN_NAME_NOTIF_ICON_LARGE,
       ConfigurationEntry.COLUMN_NAME_NOTIF_ICON_SMALL,
       ConfigurationEntry.COLUMN_NAME_NOTIF_COLOR,
@@ -54,9 +58,12 @@ public class SQLiteConfigurationDAO implements ConfigurationDAO {
       ConfigurationEntry.COLUMN_NAME_URL,
       ConfigurationEntry.COLUMN_NAME_SYNC_URL,
       ConfigurationEntry.COLUMN_NAME_SYNC_THRESHOLD,
+      ConfigurationEntry.COLUMN_NAME_SYNC_ENABLED,
       ConfigurationEntry.COLUMN_NAME_HEADERS,
       ConfigurationEntry.COLUMN_NAME_MAX_LOCATIONS,
-      ConfigurationEntry.COLUMN_NAME_TEMPLATE
+      ConfigurationEntry.COLUMN_NAME_TEMPLATE,
+      ConfigurationEntry.COLUMN_NAME_SHOW_TIME,
+      ConfigurationEntry.COLUMN_NAME_SHOW_DISTANCE
     };
 
     String whereClause = null;
@@ -105,6 +112,16 @@ public class SQLiteConfigurationDAO implements ConfigurationDAO {
     config.setDebugging( (c.getInt(c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_DEBUG)) == 1) ? true : false );
     config.setNotificationTitle(c.getString(c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_NOTIF_TITLE)));
     config.setNotificationText(c.getString(c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_NOTIF_TEXT)));
+    int idxSyncTitle = c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_TITLE);
+    if (idxSyncTitle >= 0) {
+      if (!c.isNull(idxSyncTitle)) config.setNotificationSyncTitle(c.getString(idxSyncTitle));
+      int idxSyncText = c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_TEXT);
+      if (idxSyncText >= 0 && !c.isNull(idxSyncText)) config.setNotificationSyncText(c.getString(idxSyncText));
+      int idxSyncCompleted = c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_COMPLETED);
+      if (idxSyncCompleted >= 0 && !c.isNull(idxSyncCompleted)) config.setNotificationSyncCompletedText(c.getString(idxSyncCompleted));
+      int idxSyncFailed = c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_FAILED);
+      if (idxSyncFailed >= 0 && !c.isNull(idxSyncFailed)) config.setNotificationSyncFailedText(c.getString(idxSyncFailed));
+    }
     config.setSmallNotificationIcon(c.getString(c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_NOTIF_ICON_SMALL)));
     config.setLargeNotificationIcon(c.getString(c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_NOTIF_ICON_LARGE)));
     config.setNotificationIconColor(c.getString(c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_NOTIF_COLOR)));
@@ -120,9 +137,21 @@ public class SQLiteConfigurationDAO implements ConfigurationDAO {
     config.setUrl(c.getString(c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_URL)));
     config.setSyncUrl(c.getString(c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_SYNC_URL)));
     config.setSyncThreshold(c.getInt(c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_SYNC_THRESHOLD)));
+    int idxSyncEnabled = c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_SYNC_ENABLED);
+    if (idxSyncEnabled >= 0 && !c.isNull(idxSyncEnabled)) {
+      config.setSyncEnabled(c.getInt(idxSyncEnabled) == 1);
+    }
     config.setHttpHeaders(new JSONObject(c.getString(c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_HEADERS))));
     config.setMaxLocations(c.getInt(c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_MAX_LOCATIONS)));
     config.setTemplate(LocationTemplateFactory.fromJSONString(c.getString(c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_TEMPLATE))));
+    int idxShowTime = c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_SHOW_TIME);
+    if (idxShowTime >= 0 && !c.isNull(idxShowTime)) {
+      config.setShowTime(c.getInt(idxShowTime) == 1);
+    }
+    int idxShowDistance = c.getColumnIndex(ConfigurationEntry.COLUMN_NAME_SHOW_DISTANCE);
+    if (idxShowDistance >= 0 && !c.isNull(idxShowDistance)) {
+      config.setShowDistance(c.getInt(idxShowDistance) == 1);
+    }
 
     return config;
   }
@@ -136,6 +165,10 @@ public class SQLiteConfigurationDAO implements ConfigurationDAO {
     values.put(ConfigurationEntry.COLUMN_NAME_DEBUG, (config.isDebugging() == true) ? 1 : 0);
     values.put(ConfigurationEntry.COLUMN_NAME_NOTIF_TITLE, config.getNotificationTitle());
     values.put(ConfigurationEntry.COLUMN_NAME_NOTIF_TEXT, config.getNotificationText());
+    values.put(ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_TITLE, config.getNotificationSyncTitle());
+    values.put(ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_TEXT, config.getNotificationSyncText());
+    values.put(ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_COMPLETED, config.getNotificationSyncCompletedText());
+    values.put(ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_FAILED, config.getNotificationSyncFailedText());
     values.put(ConfigurationEntry.COLUMN_NAME_NOTIF_ICON_SMALL, config.getSmallNotificationIcon());
     values.put(ConfigurationEntry.COLUMN_NAME_NOTIF_ICON_LARGE, config.getLargeNotificationIcon());
     values.put(ConfigurationEntry.COLUMN_NAME_NOTIF_COLOR, config.getNotificationIconColor());
@@ -151,9 +184,12 @@ public class SQLiteConfigurationDAO implements ConfigurationDAO {
     values.put(ConfigurationEntry.COLUMN_NAME_URL, config.getUrl());
     values.put(ConfigurationEntry.COLUMN_NAME_SYNC_URL, config.getSyncUrl());
     values.put(ConfigurationEntry.COLUMN_NAME_SYNC_THRESHOLD, config.getSyncThreshold());
+    values.put(ConfigurationEntry.COLUMN_NAME_SYNC_ENABLED, Boolean.TRUE.equals(config.getSyncEnabled()) ? 1 : 0);
     values.put(ConfigurationEntry.COLUMN_NAME_HEADERS, new JSONObject(config.getHttpHeaders()).toString());
     values.put(ConfigurationEntry.COLUMN_NAME_MAX_LOCATIONS, config.getMaxLocations());
     values.put(ConfigurationEntry.COLUMN_NAME_TEMPLATE, config.hasTemplate() ? config.getTemplate().toString() : null);
+    values.put(ConfigurationEntry.COLUMN_NAME_SHOW_TIME, Boolean.TRUE.equals(config.getShowTime()) ? 1 : 0);
+    values.put(ConfigurationEntry.COLUMN_NAME_SHOW_DISTANCE, Boolean.TRUE.equals(config.getShowDistance()) ? 1 : 0);
 
     return values;
   }

package/android/common/src/main/java/com/marianhello/bgloc/data/sqlite/SQLiteLocationDAO.java

@@ -418,6 +418,19 @@ public class SQLiteLocationDAO implements LocationDAO {
     return db.update(LocationEntry.TABLE_NAME, values, whereClause, whereArgs);
   }
 
+  /**
+   * Mark all locations pending sync (SYNC_PENDING) as deleted. Clears the sync queue without sending.
+   */
+  public int deletePendingSyncLocations() {
+    ContentValues values = new ContentValues();
+    values.put(LocationEntry.COLUMN_NAME_STATUS, BackgroundLocation.DELETED);
+
+    String whereClause = LocationEntry.COLUMN_NAME_STATUS + " = ?";
+    String[] whereArgs = { String.valueOf(BackgroundLocation.SYNC_PENDING) };
+
+    return db.update(LocationEntry.TABLE_NAME, values, whereClause, whereArgs);
+  }
+
   private BackgroundLocation hydrate(Cursor c) {
     BackgroundLocation l = new BackgroundLocation(c.getString(c.getColumnIndex(LocationEntry.COLUMN_NAME_PROVIDER)));
     l.setTime(c.getLong(c.getColumnIndex(LocationEntry.COLUMN_NAME_TIME)));

package/android/common/src/main/java/com/marianhello/bgloc/data/sqlite/SQLiteOpenHelper.java

@@ -21,7 +21,7 @@ import static com.marianhello.bgloc.data.sqlite.SQLiteLocationContract.LocationE
 public class SQLiteOpenHelper extends android.database.sqlite.SQLiteOpenHelper {
     private static final String TAG = SQLiteOpenHelper.class.getName();
     public static final String SQLITE_DATABASE_NAME = "cordova_bg_geolocation.db";
-    public static final int DATABASE_VERSION = 16;
+    public static final int DATABASE_VERSION = 19;
 
     public static final String TEXT_TYPE = " TEXT";
     public static final String INTEGER_TYPE = " INTEGER";
@@ -120,6 +120,23 @@ public class SQLiteOpenHelper extends android.database.sqlite.SQLiteOpenHelper {
                 alterSql.add("UPDATE " + LocationEntry.TABLE_NAME +
                                         " SET " + LocationEntry.COLUMN_NAME_VERTICAL_ACCURACY + "= -1," +
                                         LocationEntry.COLUMN_NAME_HAS_VERTICAL_ACCURACY + "= 0");
+            case 16:
+                alterSql.add("ALTER TABLE " + ConfigurationEntry.TABLE_NAME +
+                        " ADD COLUMN " + ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_TITLE + TEXT_TYPE);
+                alterSql.add("ALTER TABLE " + ConfigurationEntry.TABLE_NAME +
+                        " ADD COLUMN " + ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_TEXT + TEXT_TYPE);
+                alterSql.add("ALTER TABLE " + ConfigurationEntry.TABLE_NAME +
+                        " ADD COLUMN " + ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_COMPLETED + TEXT_TYPE);
+                alterSql.add("ALTER TABLE " + ConfigurationEntry.TABLE_NAME +
+                        " ADD COLUMN " + ConfigurationEntry.COLUMN_NAME_NOTIF_SYNC_FAILED + TEXT_TYPE);
+            case 17:
+                alterSql.add("ALTER TABLE " + ConfigurationEntry.TABLE_NAME +
+                        " ADD COLUMN " + ConfigurationEntry.COLUMN_NAME_SYNC_ENABLED + INTEGER_TYPE);
+            case 18:
+                alterSql.add("ALTER TABLE " + ConfigurationEntry.TABLE_NAME +
+                        " ADD COLUMN " + ConfigurationEntry.COLUMN_NAME_SHOW_TIME + INTEGER_TYPE);
+                alterSql.add("ALTER TABLE " + ConfigurationEntry.TABLE_NAME +
+                        " ADD COLUMN " + ConfigurationEntry.COLUMN_NAME_SHOW_DISTANCE + INTEGER_TYPE);
 
                 break; // DO NOT FORGET TO MOVE DOWN BREAK ON DB UPGRADE!!!
             default: