Merge pull request #44 from tamslinn/master

Don't cache requests, try to Fix #27

Author: glynhudson

app/src/main/java/org/emoncms/myapps/HTTPClient.java

@@ -30,6 +30,7 @@ public RequestQueue getRequestQueue() {
             // getApplicationContext() is key, it keeps you from leaking the
             // Activity or BroadcastReceiver if someone passes one in.
             mRequestQueue = Volley.newRequestQueue(mCtx.getApplicationContext());
+            mRequestQueue.getCache().clear();
         }
         return mRequestQueue;
     }
@@ -41,6 +42,7 @@ public void cancellAll(String TAG) {
     }
 
     public <T> void addToRequestQueue(Request<T> req) {
+        req.setShouldCache(false);
         req.setRetryPolicy(new DefaultRetryPolicy(2500, 0, 1f));
         getRequestQueue().add(req);
     }

app/src/main/java/org/emoncms/myapps/chart/PowerChart.java

@@ -38,7 +38,7 @@ public PowerChart(LineChart powerChart,  Context context) {
         chartValues = new ArrayList<>();
 
         setFormatting();
-        powerData = createDataSet();
+        powerData = createData();
 
     }
 
@@ -58,7 +58,7 @@ public void clearData() {
     }
 
     public void setChartLength(int length) {
-        powerData = createDataSet();
+        powerData = createData();
         powerChartLength = length;
         requiresReset = true;
     }
@@ -91,6 +91,11 @@ public void refreshChart() {
 
         LineDataSet dataSet = (LineDataSet) powerData.getDataSetByLabel("watts", true);
         dataSet.clear();
+        //powerData.clearValues();
+        //powerData.addDataSet(createDataSet());
+
+
+
 
         for (int i = 0; i < chartLabels.size(); i++) {
 
@@ -144,7 +149,16 @@ private boolean validNonNullSavedData(List<String> savedChartLabels, double[] sa
 
 
 
-    private LineData createDataSet() {
+    private LineData createData() {
+        LineDataSet powerDataset = createDataSet();
+
+        LineData ld = new LineData();
+        ld.addDataSet(powerDataset);
+        powerChart.setData(ld);
+        return  ld;
+    }
+
+    private LineDataSet createDataSet() {
         LineDataSet powerDataset = new LineDataSet(null, "watts");
         powerDataset.setColor(ContextCompat.getColor(context, R.color.chartBlue));
         powerDataset.setValueTextColor(ContextCompat.getColor(context, R.color.lightGrey));
@@ -154,12 +168,10 @@ private LineData createDataSet() {
         powerDataset.setDrawValues(false);
         powerDataset.setValueTextSize(R.integer.chartValueTextSize);
         powerDataset.setHighlightEnabled(false);
-        LineData ld = new LineData();
-        ld.addDataSet(powerDataset);
-        powerChart.setData(ld);
-        return  ld;
+        return powerDataset;
     }
-    
+
+
     private void setFormatting() {
         powerChart.setDrawGridBackground(false);
         powerChart.getLegend().setEnabled(false);