diff --git a/phoneClients/android/.idea/workspace.xml b/phoneClients/android/.idea/workspace.xml
index dd24812..6b57a65 100644
--- a/phoneClients/android/.idea/workspace.xml
+++ b/phoneClients/android/.idea/workspace.xml
@@ -44,6 +44,7 @@
+
@@ -110,33 +111,54 @@
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -586,7 +608,7 @@
+
-
-
-
-
+
+
+
@@ -985,7 +1007,7 @@
-
+
@@ -1424,7 +1446,7 @@
-
+
@@ -1440,14 +1462,14 @@
-
+
-
+
@@ -1524,12 +1546,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1547,12 +1569,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1563,12 +1585,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1586,12 +1608,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1616,12 +1638,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1682,12 +1704,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1710,12 +1732,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1738,12 +1760,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1766,12 +1788,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1851,13 +1873,6 @@
-
-
-
-
-
-
-
@@ -1955,38 +1970,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1997,14 +1980,55 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/phoneClients/android/app/build.gradle b/phoneClients/android/app/build.gradle
index 095b333..55fdb4d 100644
--- a/phoneClients/android/app/build.gradle
+++ b/phoneClients/android/app/build.gradle
@@ -8,8 +8,8 @@
applicationId "com.websmithing.gpstracker"
minSdkVersion 10
targetSdkVersion 20
- versionCode 8
- versionName "3.2.8"
+ versionCode 9
+ versionName "3.2.9"
}
buildTypes {
release {
diff --git a/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java b/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java
index 45762d2..bd092f6 100644
--- a/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java
+++ b/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/GpsTrackerActivity.java
@@ -111,12 +111,6 @@
private void cancelAlarmManager() {
Log.d(TAG, "cancelAlarmManager");
-/*
- if (alarmManager != null) {
- alarmManager.cancel(pendingIntent);
- alarmManager = null;
- }
-*/
Context context = getBaseContext();
Intent gpsTrackerIntent = new Intent(context, GpsTrackerAlarmReceiver.class);
diff --git a/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/LocationService.java b/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/LocationService.java
index a88078e..d10ad9b 100644
--- a/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/LocationService.java
+++ b/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/LocationService.java
@@ -116,9 +116,9 @@
requestParams.put("locationmethod", location.getProvider());
if (totalDistanceInMeters > 0) {
- requestParams.put("distance", Float.toString(totalDistanceInMeters / 1609)); // in miles,
+ requestParams.put("distance", String.format("%.1f", totalDistanceInMeters / 1609)); // in miles,
} else {
- requestParams.put("distance", 0); // in miles
+ requestParams.put("distance", "0.0"); // in miles
}
requestParams.put("username", sharedPreferences.getString("userName", ""));
@@ -141,7 +141,7 @@
LoopjHttpClient.get(uploadWebsite, requestParams, new AsyncHttpResponseHandler() {
@Override
public void onSuccess(int statusCode, org.apache.http.Header[] headers, byte[] responseBody) {
- // LoopjHttpClient.debugLoopJ(TAG, "sendLocationDataToWebsite - success", uploadWebsite, requestParams, responseBody, headers, statusCode, null);
+ LoopjHttpClient.debugLoopJ(TAG, "sendLocationDataToWebsite - success", uploadWebsite, requestParams, responseBody, headers, statusCode, null);
stopSelf();
}
@Override
diff --git a/phoneClients/android/build/intermediates/dex-cache/cache.xml b/phoneClients/android/build/intermediates/dex-cache/cache.xml
index 63b6e3c..c4acab9 100644
--- a/phoneClients/android/build/intermediates/dex-cache/cache.xml
+++ b/phoneClients/android/build/intermediates/dex-cache/cache.xml
@@ -2,37 +2,37 @@