Synced with newest version of API

marvinmarnold · Aug 24, 2015 · 398d90f · 398d90f
1 parent 22accf9
commit 398d90f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 107 deletions.
diff --git a/app/src/main/java/org/stingraymappingproject/api/app/MainActivity.java b/app/src/main/java/org/stingraymappingproject/api/app/MainActivity.java
@@ -119,8 +119,8 @@ public void onErrorResponse(VolleyError error) {
                 Log.d(TAG, "onErrorResponse");
             }
         };
-        RecurringRequest recurringFactoidsRequest = new RecurringRequest(FREQUENCY_VALUE, FREQUENCY_UNIT, nearbyRequester);
-        mStingrayStingrayAPIClientService.addRecurringRequest(recurringFactoidsRequest);
+        RecurringRequest recurringRequest = new RecurringRequest(FREQUENCY_VALUE, FREQUENCY_UNIT, nearbyRequester);
+        mStingrayStingrayAPIClientService.addRecurringRequest(recurringRequest);
     }
 
     public void scheduleFactoidsRequester() {
@@ -139,8 +139,8 @@ public void onErrorResponse(VolleyError error) {
                 Log.d(TAG, "onErrorResponse");
             }
         };
-        RecurringRequest recurringFactoidsRequest = new RecurringRequest(FREQUENCY_VALUE, FREQUENCY_UNIT, factoidsRequester);
-        mStingrayStingrayAPIClientService.addRecurringRequest(recurringFactoidsRequest);
+        RecurringRequest recurringRequest = new RecurringRequest(FREQUENCY_VALUE, FREQUENCY_UNIT, factoidsRequester);
+        mStingrayStingrayAPIClientService.addRecurringRequest(recurringRequest);
     }
 
     public void schedulePostStingrayReadingRequester() {
@@ -157,14 +157,12 @@ protected String getRequestParams() {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
                 }
-
                 return datum.toString();
             }
 
             @Override
             public void onResponse(StingrayReading response) {
                 Log.d(TAG, "onResponse");
-                Log.d(TAG, "location: " + response.getLocation());
             }
 
             @Override
@@ -173,7 +171,7 @@ public void onErrorResponse(VolleyError error) {
             }
         };
 
-        RecurringRequest postStingrayReadingRequest = new RecurringRequest(FREQUENCY_VALUE, FREQUENCY_UNIT, postStingrayReadingRequester);
-        mStingrayStingrayAPIClientService.addRecurringRequest(postStingrayReadingRequest);
+        RecurringRequest recurringRequest = new RecurringRequest(FREQUENCY_VALUE, FREQUENCY_UNIT, postStingrayReadingRequester);
+        mStingrayStingrayAPIClientService.addRecurringRequest(recurringRequest);
     }
 }
diff --git a/clientandroid/stingray-api-client.iml b/clientandroid/stingray-api-client.iml
diff --git a/...nt/src/main/java/org/stingraymappingproject/api/clientandroid/models/StingrayReading.java b/...nt/src/main/java/org/stingraymappingproject/api/clientandroid/models/StingrayReading.java
@@ -12,23 +12,23 @@ public String getId() {
         return id;
     }
 
-    public String getObserved_at() {
+    public String getObservedAt() {
         return observed_at;
     }
 
     public String getLocation() {
         return location;
     }
 
-    public String getThreat_level() {
+    public String getThreatLevel() {
         return threat_level;
     }
 
-    public String getUpdated_at() {
+    public String getUpdatedAt() {
         return updated_at;
     }
 
-    public String getCreated_at() {
+    public String getCreatedAt() {
         return created_at;
     }
 
@@ -42,6 +42,15 @@ public String getVersion() {
     String updated_at;
     String created_at;
     String version;
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
     String latitude;
     String longitude;
 }