diff --git a/phoneClients/android/.idea/workspace.xml b/phoneClients/android/.idea/workspace.xml index 801a0b5..55080c5 100644 --- a/phoneClients/android/.idea/workspace.xml +++ b/phoneClients/android/.idea/workspace.xml @@ -41,18 +41,10 @@ - - - - - - - - - + + - @@ -119,26 +111,11 @@ - - + + - - - - - - - - - - - - - - - - - + + @@ -147,18 +124,18 @@ - - + + - - + + - - + + @@ -970,18 +947,18 @@ - @@ -1451,7 +1428,7 @@ - + @@ -1460,22 +1437,22 @@ - - + + - + - - + + @@ -1532,7 +1509,16 @@ - + + + + file://$PROJECT_DIR$/app/src/main/java/com/websmithing/gpstracker/LocationService.java + 145 + + + + @@ -1548,9 +1534,8 @@ - - - + + @@ -1567,9 +1552,8 @@ - - - + + @@ -1579,9 +1563,8 @@ - - - + + @@ -1598,9 +1581,8 @@ - - - + + @@ -1624,9 +1606,8 @@ - - - + + @@ -1686,9 +1667,8 @@ - - - + + @@ -1710,9 +1690,8 @@ - - - + + @@ -1734,9 +1713,8 @@ - - - + + @@ -1758,9 +1736,8 @@ - - - + + @@ -1932,45 +1909,17 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1980,10 +1929,37 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 f2fa838..3b018d4 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 @@ -19,7 +19,6 @@ import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; -import com.loopj.android.http.AsyncHttpResponseHandler; import java.util.UUID; 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 d51bd32..aa6d78d 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 @@ -102,7 +102,7 @@ editor.putFloat("previousLongitude", (float)location.getLongitude()); editor.commit(); - RequestParams requestParams = new RequestParams(); + final RequestParams requestParams = new RequestParams(); requestParams.put("latitude", Double.toString(location.getLatitude())); requestParams.put("longitude", Double.toString(location.getLongitude())); @@ -136,15 +136,19 @@ Float direction = location.getBearing(); requestParams.put("direction", Integer.toString(direction.intValue())); - LoopjHttpClient.post(sharedPreferences.getString("defaultUploadWebsite", defaultUploadWebsite), requestParams, new AsyncHttpResponseHandler() { + LoopjHttpClient test = new LoopjHttpClient(); + + final String uploadWebsite = sharedPreferences.getString("defaultUploadWebsite", defaultUploadWebsite); + + LoopjHttpClient.get(uploadWebsite, requestParams, new AsyncHttpResponseHandler() { @Override public void onSuccess(int statusCode, org.apache.http.Header[] headers, byte[] responseBody) { - Log.e(TAG, "sendLocationDataToWebsite onSuccess statusCode: " + statusCode); + LoopjHttpClient.debugLoopJ(TAG, "sendLocationDataToWebsite - success", uploadWebsite, requestParams, responseBody, headers, statusCode, null); stopSelf(); } @Override public void onFailure(int statusCode, org.apache.http.Header[] headers, byte[] errorResponse, Throwable e) { - LoopjHttpClient.debugLoopJ(TAG, "sendLocationDataToWebsite", errorResponse, headers, statusCode, e); + LoopjHttpClient.debugLoopJ(TAG, "sendLocationDataToWebsite - failure", uploadWebsite, requestParams, errorResponse, headers, statusCode, e); stopSelf(); } }); diff --git a/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/LoopjHttpClient.java b/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/LoopjHttpClient.java index 4baa1e1..a11d0af 100644 --- a/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/LoopjHttpClient.java +++ b/phoneClients/android/app/src/main/java/com/websmithing/gpstracker/LoopjHttpClient.java @@ -21,7 +21,10 @@ client.post(url, requestParams, responseHandler); } - public static void debugLoopJ(String TAG, String methodName, byte[] response, Header[] headers, int statusCode, Throwable t) { + public static void debugLoopJ(String TAG, String methodName,String url, RequestParams requestParams, byte[] response, Header[] headers, int statusCode, Throwable t) { + + Log.e(TAG, client.getUrlWithQueryString(false, url, requestParams)); + if (headers != null) { Log.e(TAG, methodName) ; @@ -38,7 +41,7 @@ Log.e(TAG, "StatusCode: " + statusCode); if (response != null) { - Log.e(TAG, "Resposne: " + new String(response)); + Log.e(TAG, "Response: " + new String(response)); } } diff --git a/phoneClients/android/app/src/main/res/values/strings.xml b/phoneClients/android/app/src/main/res/values/strings.xml index 1c0a4c5..0136cf8 100644 --- a/phoneClients/android/app/src/main/res/values/strings.xml +++ b/phoneClients/android/app/src/main/res/values/strings.xml @@ -8,7 +8,6 @@ Cannot reach the website that you have entered. Did you spell it correctly? Does your website use http or https? Please fill in both fields. User names cannot have a space. Please go into Settings > Apps > All and enable Google Play Services. - user name upload website Update website every: diff --git a/servers/php/deleteroute.php b/servers/php/deleteroute.php index 1621067..2484af5 100644 --- a/servers/php/deleteroute.php +++ b/servers/php/deleteroute.php @@ -1,10 +1,9 @@ prepare('CALL prcDeleteRoute(:sessionID, :phoneNumber)'); - $stmt->execute(array(':sessionID' => $sessionid, ':phoneNumber' => $phonenumber)); + $stmt = $pdo->prepare('CALL prcDeleteRoute(:sessionID)'); + $stmt->execute(array(':sessionID' => $sessionid)); ?> diff --git a/servers/php/getrouteformap.php b/servers/php/getrouteformap.php index c290bed..dee74ae 100644 --- a/servers/php/getrouteformap.php +++ b/servers/php/getrouteformap.php @@ -1,11 +1,10 @@ prepare('CALL prcGetRouteForMap(:sessionID, :phoneNumber)'); - $stmt->execute(array(':sessionID' => $sessionid, ':phoneNumber' => $phonenumber)); + $stmt = $pdo->prepare('CALL prcGetRouteForMap(:sessionID)'); + $stmt->execute(array(':sessionID' => $sessionid)); $json = '{ "locations": ['; diff --git a/servers/php/js/maps.js b/servers/php/js/maps.js index 1492ac6..6fe74b2 100644 --- a/servers/php/js/maps.js +++ b/servers/php/js/maps.js @@ -71,7 +71,6 @@ loadRoutes(data); }, error: function (xhr, status, errorThrown) { - console.log("responseText: " + xhr.responseText); console.log("status: " + xhr.status); console.log("errorThrown: " + errorThrown); } @@ -96,8 +95,7 @@ // iterate through the routes and load them into the dropdwon box. $(json.routes).each(function(key, value){ var option = document.createElement('option'); - option.setAttribute('value', '?sessionid=' + $(this).attr('sessionID') - + '&phonenumber=' + $(this).attr('phoneNumber')); + option.setAttribute('value', '?sessionid=' + $(this).attr('sessionID')); sessionIDArray.push($(this).attr('sessionID')); @@ -116,8 +114,7 @@ if (hasMap()) { // console.log($("#routeSelect").prop("selectedIndex")); - var url = 'getrouteformap.php' + routeSelect.options[routeSelect.selectedIndex].value; - console.log("testing route: " + $('#routeSelect').val()); + var url = 'getrouteformap.php' + $('#routeSelect').val(); $.ajax({ url: url, @@ -127,7 +124,6 @@ loadGPSLocations(data); }, error: function (xhr, status, errorThrown) { - console.log("responseText: " + xhr.responseText); console.log("status: " + xhr.status); console.log("errorThrown: " + errorThrown); } @@ -281,7 +277,7 @@ gpstrackerMarker.unbindPopup(); gpstrackerMarker.on("click", function() { - var url = 'getrouteformap.php?sessionid=' + sessionID + "&phonenumber=" + phoneNumber; + var url = 'getrouteformap.php?sessionid=' + sessionID; viewingAllRoutes = false; @@ -300,7 +296,6 @@ loadGPSLocations(data); }, error: function (xhr, status, errorThrown) { - console.log("responseText: " + xhr.responseText); console.log("status: " + xhr.status); console.log("errorThrown: " + errorThrown); } @@ -346,15 +341,12 @@ var latlng = new google.maps.LatLng(lat, lng); reverseGeocoder = new google.maps.Geocoder(); reverseGeocoder.geocode({'latLng': latlng}, function(results, status) { - - if (status == google.maps.GeocoderStatus.OK) { - // results[0] is full address - if (results[1]) { - reverseGeocoderResult = results[1].formatted_address; - showPermanentMessage(reverseGeocoderResult); - } else { - console.log('No results found'); - } + if (status == google.maps.GeocoderStatus.OK) { + // results[0] is full address + if (results[1]) { + reverseGeocoderResult = results[1].formatted_address; + showPermanentMessage(reverseGeocoderResult); + } } else { console.log('Geocoder failed due to: ' + status); } @@ -381,7 +373,7 @@ } function restartInterval() { - // remember that if someone is viewing all routes and then switches to a single route + // if someone is viewing all routes and then switches to a single route // while autorefresh is on then the setInterval is going to be running with getAllRoutesForMap // and not getRouteForMap @@ -403,7 +395,7 @@ var answer = confirm("This will permanently delete this route\n from the database. Do you want to delete?"); if (answer){ - var url = 'deleteroute.php' + routeSelect.options[routeSelect.selectedIndex].value; + var url = 'deleteroute.php' + $('#routeSelect').val(); $.ajax({ url: url,