@josuelmm/cordova-background-geolocation 4.5.2 → 4.5.4

package/android/common/src/main/AndroidManifest.xml

@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.marianhello.backgroundgeolocation" android:versionName="1.0" android:versionCode="1">
-    <application>
-        <service
-            android:name="com.marianhello.bgloc.sync.SyncService"
-            android:exported="true"
-            android:process=":sync">
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter"/>
-            </intent-filter>
-            <meta-data android:name="android.content.SyncAdapter"
-                android:resource="@xml/syncadapter"/>
-        </service>
-        <service
-            android:exported="false"
-            android:name="com.marianhello.bgloc.sync.AuthenticatorService">
-            <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator"/>
-            </intent-filter>
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator" />
-        </service>
-        <provider
-            android:name="com.marianhello.bgloc.data.provider.LocationContentProvider"
-            android:authorities="@string/plugin_bgloc_content_authority"
-            android:exported="false"
-            android:syncable="true"/>
-        <service
-            android:enabled="true"
-            android:exported="false"
-            android:name="com.marianhello.bgloc.service.LocationServiceImpl"
-            android:foregroundServiceType="location" />
-        <receiver android:enabled="true" android:exported="true" android:name="com.marianhello.bgloc.BootCompletedReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-        <uses-library android:name="org.apache.http.legacy" android:required="true" />
-    </application>
-
-    <uses-feature android:name="android.hardware.location" android:required="false" />
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-    <uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
-</manifest>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.marianhello.backgroundgeolocation" android:versionName="1.0" android:versionCode="1">
+    <application>
+        <service
+            android:name="com.marianhello.bgloc.sync.SyncService"
+            android:exported="true"
+            android:process=":sync">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter"/>
+            </intent-filter>
+            <meta-data android:name="android.content.SyncAdapter"
+                android:resource="@xml/syncadapter"/>
+        </service>
+        <service
+            android:exported="false"
+            android:name="com.marianhello.bgloc.sync.AuthenticatorService">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator"/>
+            </intent-filter>
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
+        </service>
+        <provider
+            android:name="com.marianhello.bgloc.data.provider.LocationContentProvider"
+            android:authorities="@string/plugin_bgloc_content_authority"
+            android:exported="false"
+            android:syncable="true"/>
+        <service
+            android:enabled="true"
+            android:exported="false"
+            android:name="com.marianhello.bgloc.service.LocationServiceImpl"
+            android:foregroundServiceType="location" />
+        <receiver android:enabled="true" android:exported="true" android:name="com.marianhello.bgloc.BootCompletedReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+        <uses-library android:name="org.apache.http.legacy" android:required="true" />
+    </application>
+
+    <uses-feature android:name="android.hardware.location" android:required="false" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+    <uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
+</manifest>

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

@@ -35,7 +35,7 @@ public class BootCompletedReceiver extends BroadcastReceiver {
      public void onReceive(Context context, Intent intent) {
         String action = intent != null ? intent.getAction() : null;
 
-        // v4.5.2 — hardening: ignore arbitrary broadcasts directed at this
+        // v4.5.4 — hardening: ignore arbitrary broadcasts directed at this
         // receiver. Without this, any explicit intent (e.g. a malicious app
         // targeting our package) could trigger the service auto-start path.
         // Accept only the canonical boot/package-replaced actions plus the

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

@@ -94,7 +94,7 @@ public class Config implements Parcelable
     private Integer stationaryPollInterval;
     /** Aggressive poll interval while stationary (ms). Default 60_000. */
     private Integer stationaryPollFast;
-    // v4.5.2 — provider hardening
+    // v4.5.4 — provider hardening
     /** 0-100. Activity-recognition transitions below this confidence are ignored. Default 50. */
     private Integer activityConfidenceThreshold;
     /** Discard fixes whose `accuracy` (m) is worse than this. `null` (default) disables the filter. */
@@ -281,7 +281,7 @@ public class Config implements Parcelable
         setStationaryTimeout((Integer) in.readValue(null));
         setStationaryPollInterval((Integer) in.readValue(null));
         setStationaryPollFast((Integer) in.readValue(null));
-        // v4.5.2 provider hardening
+        // v4.5.4 provider hardening
         setActivityConfidenceThreshold((Integer) in.readValue(null));
         setMaxAcceptedAccuracy((Float) in.readValue(null));
         // v4.5.1 — pass the plugin's classloader so getSerializable() can deserialize
@@ -338,8 +338,8 @@ public class Config implements Parcelable
         config.stationaryTimeout = 5 * 60 * 1000;
         config.stationaryPollInterval = 3 * 60 * 1000;
         config.stationaryPollFast = 60 * 1000;
-        config.activityConfidenceThreshold = 50; // v4.5.2: ignore <50% confidence transitions
-        config.maxAcceptedAccuracy = null;       // v4.5.2: off by default (no JS regression)
+        config.activityConfidenceThreshold = 50; // v4.5.4: ignore <50% confidence transitions
+        config.maxAcceptedAccuracy = null;       // v4.5.4: off by default (no JS regression)
 
         return config;
     }
@@ -414,7 +414,7 @@ public class Config implements Parcelable
         out.writeValue(getStationaryTimeout());
         out.writeValue(getStationaryPollInterval());
         out.writeValue(getStationaryPollFast());
-        // v4.5.2
+        // v4.5.4
         out.writeValue(getActivityConfidenceThreshold());
         out.writeValue(getMaxAcceptedAccuracy());
         Bundle bundle = new Bundle();
@@ -1139,7 +1139,7 @@ public class Config implements Parcelable
         if (config2.stationaryTimeout != null) merger.setStationaryTimeout(config2.stationaryTimeout);
         if (config2.stationaryPollInterval != null) merger.setStationaryPollInterval(config2.stationaryPollInterval);
         if (config2.stationaryPollFast != null) merger.setStationaryPollFast(config2.stationaryPollFast);
-        // v4.5.2
+        // v4.5.4
         if (config2.activityConfidenceThreshold != null) merger.setActivityConfidenceThreshold(config2.activityConfidenceThreshold);
         if (config2.maxAcceptedAccuracy != null) merger.setMaxAcceptedAccuracy(config2.maxAcceptedAccuracy);
 

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

@@ -193,7 +193,27 @@ public class HttpPostService {
         Iterator<String> keys = jsonObj.keys();
         while (keys.hasNext()) {
             String key = keys.next();
-            String value = jsonObj.get(key).toString();
+            // v4.5.4: skip null / JSONObject.NULL values. Previously these were
+            // serialised as the literal string "null", which servers like Traccar
+            // reject (Traccar OsmAndProtocolDecoder throws NumberFormatException
+            // on "speed=null"). Placeholders that resolve to no value (@speed,
+            // @events, @battery, etc.) end up as JSONObject.NULL in the batch and
+            // must be omitted from form-urlencoded bodies. Using `isNull` covers
+            // both the reference-equality and the literal "null" string cases.
+            if (jsonObj.isNull(key)) {
+                continue;
+            }
+            Object raw = jsonObj.opt(key);
+            if (raw == null) {
+                continue;
+            }
+            String value = raw.toString();
+            // Extra safety: some pre-parsed objects may stringify to "null"
+            // (e.g. NSNull, Boolean nulls from non-strict parsers). Treat the
+            // literal "null" string the same as a missing value.
+            if ("null".equals(value)) {
+                continue;
+            }
             if (result.length() > 0) {
                 result.append("&");
             }

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

@@ -71,7 +71,7 @@ public final class ConfigJsonMapper {
         j.put("stationaryTimeout", c.getStationaryTimeout());
         j.put("stationaryPollInterval", c.getStationaryPollInterval());
         j.put("stationaryPollFast", c.getStationaryPollFast());
-        // v4.5.2: provider hardening knobs
+        // v4.5.4: provider hardening knobs
         j.put("activityConfidenceThreshold", c.getActivityConfidenceThreshold());
         j.put("maxAcceptedAccuracy", c.getMaxAcceptedAccuracy());
 
@@ -152,7 +152,7 @@ public final class ConfigJsonMapper {
         if (j.has("stationaryTimeout") && !j.isNull("stationaryTimeout")) c.setStationaryTimeout(j.getInt("stationaryTimeout"));
         if (j.has("stationaryPollInterval") && !j.isNull("stationaryPollInterval")) c.setStationaryPollInterval(j.getInt("stationaryPollInterval"));
         if (j.has("stationaryPollFast") && !j.isNull("stationaryPollFast")) c.setStationaryPollFast(j.getInt("stationaryPollFast"));
-        // v4.5.2
+        // v4.5.4
         if (j.has("activityConfidenceThreshold") && !j.isNull("activityConfidenceThreshold")) c.setActivityConfidenceThreshold(j.getInt("activityConfidenceThreshold"));
         if (j.has("maxAcceptedAccuracy") && !j.isNull("maxAcceptedAccuracy")) c.setMaxAcceptedAccuracy((float) j.getDouble("maxAcceptedAccuracy"));
 

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

@@ -1,18 +1,18 @@
-package com.marianhello.bgloc.data;
-
-import java.util.Collection;
-
-/**
- * DAO for the current recording session locations.
- * Session is independent of sync: locations are kept until startSession() or clearSession().
- */
-public interface SessionLocationDAO {
-    /** Clear session table and set session active. Call when user starts a route. */
-    void startSession();
-    /** Clear session table and set session inactive. Call when route is finished and sync OK. */
-    void clearSession();
-    boolean isSessionActive();
-    void persistSessionLocation(BackgroundLocation location);
-    Collection<BackgroundLocation> getSessionLocations();
-    int getSessionLocationsCount();
-}
+package com.marianhello.bgloc.data;
+
+import java.util.Collection;
+
+/**
+ * DAO for the current recording session locations.
+ * Session is independent of sync: locations are kept until startSession() or clearSession().
+ */
+public interface SessionLocationDAO {
+    /** Clear session table and set session active. Call when user starts a route. */
+    void startSession();
+    /** Clear session table and set session inactive. Call when route is finished and sync OK. */
+    void clearSession();
+    boolean isSessionActive();
+    void persistSessionLocation(BackgroundLocation location);
+    Collection<BackgroundLocation> getSessionLocations();
+    int getSessionLocationsCount();
+}

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

@@ -1,74 +1,74 @@
-package com.marianhello.bgloc.data.sqlite;
-
-import android.provider.BaseColumns;
-
-import static com.marianhello.bgloc.data.sqlite.SQLiteOpenHelper.COMMA_SEP;
-import static com.marianhello.bgloc.data.sqlite.SQLiteOpenHelper.INTEGER_TYPE;
-import static com.marianhello.bgloc.data.sqlite.SQLiteOpenHelper.REAL_TYPE;
-import static com.marianhello.bgloc.data.sqlite.SQLiteOpenHelper.TEXT_TYPE;
-
-/**
- * Contract for the "session" location table.
- * Stores all locations for the current recording session (route).
- * Cleared on startSession() and clearSession(); not cleared when sync succeeds.
- */
-public final class SQLiteSessionContract {
-
-    public SQLiteSessionContract() {}
-
-    public static abstract class SessionEntry implements BaseColumns {
-        public static final String TABLE_NAME = "location_session";
-        public static final String COLUMN_NAME_NULLABLE = "NULLHACK";
-        public static final String COLUMN_NAME_TIME = "time";
-        public static final String COLUMN_NAME_ACCURACY = "accuracy";
-        public static final String COLUMN_NAME_VERTICAL_ACCURACY = "vertical_accuracy";
-        public static final String COLUMN_NAME_SPEED = "speed";
-        public static final String COLUMN_NAME_BEARING = "bearing";
-        public static final String COLUMN_NAME_ALTITUDE = "altitude";
-        public static final String COLUMN_NAME_LATITUDE = "latitude";
-        public static final String COLUMN_NAME_LONGITUDE = "longitude";
-        public static final String COLUMN_NAME_RADIUS = "radius";
-        public static final String COLUMN_NAME_HAS_ACCURACY = "has_accuracy";
-        public static final String COLUMN_NAME_HAS_VERTICAL_ACCURACY = "has_vertical_accuracy";
-        public static final String COLUMN_NAME_HAS_SPEED = "has_speed";
-        public static final String COLUMN_NAME_HAS_BEARING = "has_bearing";
-        public static final String COLUMN_NAME_HAS_ALTITUDE = "has_altitude";
-        public static final String COLUMN_NAME_HAS_RADIUS = "has_radius";
-        public static final String COLUMN_NAME_PROVIDER = "provider";
-        public static final String COLUMN_NAME_LOCATION_PROVIDER = "service_provider";
-        public static final String COLUMN_NAME_STATUS = "valid";
-        public static final String COLUMN_NAME_BATCH_START_MILLIS = "batch_start";
-        public static final String COLUMN_NAME_MOCK_FLAGS = "mock_flags";
-
-        public static final String SQL_CREATE_SESSION_TABLE =
-                "CREATE TABLE " + SessionEntry.TABLE_NAME + " (" +
-                        SessionEntry._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
-                        SessionEntry.COLUMN_NAME_TIME + INTEGER_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_ACCURACY + REAL_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_VERTICAL_ACCURACY + REAL_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_SPEED + REAL_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_BEARING + REAL_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_ALTITUDE + REAL_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_LATITUDE + REAL_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_LONGITUDE + REAL_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_RADIUS + REAL_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_HAS_ACCURACY + INTEGER_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_HAS_VERTICAL_ACCURACY + INTEGER_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_HAS_SPEED + INTEGER_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_HAS_BEARING + INTEGER_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_HAS_ALTITUDE + INTEGER_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_HAS_RADIUS + INTEGER_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_PROVIDER + TEXT_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_LOCATION_PROVIDER + INTEGER_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_STATUS + INTEGER_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_BATCH_START_MILLIS + INTEGER_TYPE + COMMA_SEP +
-                        SessionEntry.COLUMN_NAME_MOCK_FLAGS + INTEGER_TYPE +
-                        " )";
-
-        public static final String SQL_DROP_SESSION_TABLE =
-                "DROP TABLE IF EXISTS " + SessionEntry.TABLE_NAME;
-
-        public static final String SQL_CREATE_SESSION_TABLE_TIME_IDX =
-                "CREATE INDEX session_time_idx ON " + SessionEntry.TABLE_NAME + " (" + SessionEntry.COLUMN_NAME_TIME + ")";
-    }
-}
+package com.marianhello.bgloc.data.sqlite;
+
+import android.provider.BaseColumns;
+
+import static com.marianhello.bgloc.data.sqlite.SQLiteOpenHelper.COMMA_SEP;
+import static com.marianhello.bgloc.data.sqlite.SQLiteOpenHelper.INTEGER_TYPE;
+import static com.marianhello.bgloc.data.sqlite.SQLiteOpenHelper.REAL_TYPE;
+import static com.marianhello.bgloc.data.sqlite.SQLiteOpenHelper.TEXT_TYPE;
+
+/**
+ * Contract for the "session" location table.
+ * Stores all locations for the current recording session (route).
+ * Cleared on startSession() and clearSession(); not cleared when sync succeeds.
+ */
+public final class SQLiteSessionContract {
+
+    public SQLiteSessionContract() {}
+
+    public static abstract class SessionEntry implements BaseColumns {
+        public static final String TABLE_NAME = "location_session";
+        public static final String COLUMN_NAME_NULLABLE = "NULLHACK";
+        public static final String COLUMN_NAME_TIME = "time";
+        public static final String COLUMN_NAME_ACCURACY = "accuracy";
+        public static final String COLUMN_NAME_VERTICAL_ACCURACY = "vertical_accuracy";
+        public static final String COLUMN_NAME_SPEED = "speed";
+        public static final String COLUMN_NAME_BEARING = "bearing";
+        public static final String COLUMN_NAME_ALTITUDE = "altitude";
+        public static final String COLUMN_NAME_LATITUDE = "latitude";
+        public static final String COLUMN_NAME_LONGITUDE = "longitude";
+        public static final String COLUMN_NAME_RADIUS = "radius";
+        public static final String COLUMN_NAME_HAS_ACCURACY = "has_accuracy";
+        public static final String COLUMN_NAME_HAS_VERTICAL_ACCURACY = "has_vertical_accuracy";
+        public static final String COLUMN_NAME_HAS_SPEED = "has_speed";
+        public static final String COLUMN_NAME_HAS_BEARING = "has_bearing";
+        public static final String COLUMN_NAME_HAS_ALTITUDE = "has_altitude";
+        public static final String COLUMN_NAME_HAS_RADIUS = "has_radius";
+        public static final String COLUMN_NAME_PROVIDER = "provider";
+        public static final String COLUMN_NAME_LOCATION_PROVIDER = "service_provider";
+        public static final String COLUMN_NAME_STATUS = "valid";
+        public static final String COLUMN_NAME_BATCH_START_MILLIS = "batch_start";
+        public static final String COLUMN_NAME_MOCK_FLAGS = "mock_flags";
+
+        public static final String SQL_CREATE_SESSION_TABLE =
+                "CREATE TABLE " + SessionEntry.TABLE_NAME + " (" +
+                        SessionEntry._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
+                        SessionEntry.COLUMN_NAME_TIME + INTEGER_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_ACCURACY + REAL_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_VERTICAL_ACCURACY + REAL_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_SPEED + REAL_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_BEARING + REAL_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_ALTITUDE + REAL_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_LATITUDE + REAL_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_LONGITUDE + REAL_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_RADIUS + REAL_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_HAS_ACCURACY + INTEGER_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_HAS_VERTICAL_ACCURACY + INTEGER_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_HAS_SPEED + INTEGER_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_HAS_BEARING + INTEGER_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_HAS_ALTITUDE + INTEGER_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_HAS_RADIUS + INTEGER_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_PROVIDER + TEXT_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_LOCATION_PROVIDER + INTEGER_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_STATUS + INTEGER_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_BATCH_START_MILLIS + INTEGER_TYPE + COMMA_SEP +
+                        SessionEntry.COLUMN_NAME_MOCK_FLAGS + INTEGER_TYPE +
+                        " )";
+
+        public static final String SQL_DROP_SESSION_TABLE =
+                "DROP TABLE IF EXISTS " + SessionEntry.TABLE_NAME;
+
+        public static final String SQL_CREATE_SESSION_TABLE_TIME_IDX =
+                "CREATE INDEX session_time_idx ON " + SessionEntry.TABLE_NAME + " (" + SessionEntry.COLUMN_NAME_TIME + ")";
+    }
+}