-Bug fixes

--G4 fixes for serial numbers that start with a null character?
-Added regular updates to android notification
-General code cleanup
-Switched dates to epoch in EGVRecord and DownloadObject rather than Date object.

mobile/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.ktind.cgm.bgscout"
         minSdkVersion 16
         targetSdkVersion 20
-        versionCode 3
-        versionName "1.0.3"
+        versionCode 6
+        versionName "1.0.6"
     }
     buildTypes {
         release {

mobile/src/main/java/com/ktind/cgm/bgscout/AbstractDevice.java

@@ -190,12 +190,14 @@ public GlucoseUnit getUnit() {
     }
 
     public void stopMonitors(){
-//        state=State.STOPPING;
+        if (monitors==null) {
+            Log.w(TAG, "monitors is null. A stop was previously issued. How did I get here?");
+            return;
+        }
         Log.d(TAG,"stopMonitors called");
         for (AbstractMonitor monitor:monitors){
             monitor.stop();
         }
-//        state=State.STOPPED;
         monitors=null;
     }
 
@@ -204,18 +206,19 @@ public void setUnit(GlucoseUnit unit) {
     }
 
     @Override
-    public void fireMonitors() {
+    public void fireMonitors(DownloadObject dl) {
         stats.startMonitorTimer();
         Log.d(TAG,"Firing monitors");
         // FIXME why is monitors set to null here sometimes?
         if (monitors==null)
             return;
         for (AbstractMonitor monitor:monitors){
-            try {
-                monitor.process(getLastDownloadObject());
-            } catch (DeviceException e) {
-                Log.w(TAG,e.getMessage());
-            }
+//            try {
+//                monitor.process(getLastDownloadObject());
+                monitor.process(dl);
+//            } catch (DeviceException e) {
+//                Log.w(TAG,e.getMessage());
+//            }
         }
         stats.stopMonitorTimer();
     }
@@ -289,37 +292,36 @@ public Date getNextReadingTime() {
 
     public int getLastBG() throws NoDataException {
         int lastIndex= 0;
-        lastIndex = getLastDownloadObject().getEgvRecords().length-1;
+        lastIndex = getLastDownloadObject().getEgvArrayListRecords().size()-1;
         if (lastIndex<0)
             throw new NoDataException("No previous download available");
-        return getLastDownloadObject().getEgvRecords()[lastIndex].getEgv();
+        return getLastDownloadObject().getEgvArrayListRecords().get(lastIndex).getEgv();
     }
 
     public Trend getLastTrend() throws NoDataException {
         int lastIndex = 0;
-        lastIndex = getLastDownloadObject().getEgvRecords().length - 1;
+        lastIndex = getLastDownloadObject().getEgvArrayListRecords().size() - 1;
         if (lastIndex<0)
             throw new NoDataException("No previous download available");
-        return getLastDownloadObject().getEgvRecords()[lastIndex].getTrend();
+        return getLastDownloadObject().getEgvArrayListRecords().get(lastIndex).getTrend();
     }
 
-    protected void onDownload(){
+    protected void onDownload(DownloadObject dl){
         sendToUI();
-        try {
+//        try {
             if (Looper.getMainLooper().getThread()==Thread.currentThread())
                 Log.d(TAG,"ON THE MAIN Thread!!!");
             else
                 Log.d(TAG, "Not on the MAIN Thread ("+Thread.currentThread().getName()+"/"+Thread.currentThread().getState()+")");
             SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
             SharedPreferences.Editor editor = sharedPref.edit();
-            // FIXME should this really be "last_g4_download"? Perhaps it should be "driver"
-            editor.putLong(deviceIDStr +"_last_"+driver, getLastDownloadObject().getLastReadingDate().getTime());
+            editor.putLong(deviceIDStr +"_last_"+driver, dl.getLastReadingDate().getTime());
             editor.apply();
-        } catch (NoDataException e) {
-            Log.i(TAG,"No data on download");
-//            e.printStackTrace();
-        }
-        fireMonitors();
+//        } catch (NoDataException e) {
+//            Log.i(TAG,"No data on download");
+////            e.printStackTrace();
+//        }
+        fireMonitors(dl);
     }
 
     public void sendToUI(){

mobile/src/main/java/com/ktind/cgm/bgscout/AbstractMonitor.java

@@ -50,6 +50,7 @@ abstract public class AbstractMonitor implements MonitorInterface {
     protected Context context;
     protected SharedPreferences sharedPref;
     protected long lastSuccessDate;
+    protected State state;
 //    protected EGVLimits egvLimits;
 
     public AbstractMonitor(String n,int devID,Context context, String monitorName){
@@ -148,6 +149,7 @@ public void savelastSuccessDate(Date date){
 
     @Override
     public void stop(){
+        state=State.STOPPED;
         Log.i(TAG,"Stopping monitor "+monitorType+" for "+name);
     }
 

mobile/src/main/java/com/ktind/cgm/bgscout/AbstractPollDevice.java

@@ -121,17 +121,18 @@ public void run() {
                 stats.startDownloadTimer();
                 Tracker tracker=((BGScout) context.getApplicationContext()).getTracker();
                 long downloadTimeStart=System.currentTimeMillis();
-                doDownload();
+                DownloadObject dl=doDownload();
                 tracker.send(new HitBuilders.TimingBuilder()
-                                .setCategory("Download")
+                                .setCategory("Device Download")
                                 .setLabel(driver)
                                 .setValue(System.currentTimeMillis() - downloadTimeStart)
+                                .setVariable(driver)
                                 .build()
                 );
                 Log.d(TAG,"Sent timing to GA: "+(System.currentTimeMillis()-downloadTimeStart));
                 stats.stopDownloadTimer();
                 Log.i(TAG,"Download complete in download thread");
-                onDownload();
+                onDownload(dl);
             }
         },"Download_"+deviceIDStr).start();
         Log.i(TAG,"After download thread creation");
@@ -164,7 +165,8 @@ public long nextFire(){
     public long nextFire(long millis){
         try {
             // FIXME consider using system time to determine the offset for the next reading rather than the display time to get rid of the time sync problems.
-            long lastDLlong=getLastDownloadObject().getEgvRecords()[getLastDownloadObject().getEgvRecords().length-1].getDate().getTime();
+//            long lastDLlong=getLastDownloadObject().getEgvRecords()[getLastDownloadObject().getEgvRecords().length-1].getDate().getTime();
+            long lastDLlong=getLastDownloadObject().getLastRecordReadingDate().getTime();
             Log.d(TAG,"nextFire calculated last dl to be: "+lastDLlong + " currentMillis: "+System.currentTimeMillis());
             long diff=(millis-(System.currentTimeMillis() - lastDLlong));
             Log.d(TAG,"nextFire calculated to be: "+diff+" for "+getName()+" using a poll interval of "+millis);

mobile/src/main/java/com/ktind/cgm/bgscout/AbstractPushDevice.java

@@ -1,7 +1,6 @@
 package com.ktind.cgm.bgscout;
 
 import android.content.Context;
-import android.os.Handler;
 
 /**
  Copyright (c) 2014, Kevin Lee ([email protected])
@@ -36,9 +35,9 @@ public AbstractPushDevice(String n, int deviceID, Context appContext, String dri
 //    abstract void onDataReady(DownloadObject ddo);
 
     @Override
-    public void onDownload(){
+    public void onDownload(DownloadObject dl){
         stats.addDownload();
-        super.onDownload();
+        super.onDownload(dl);
     }
     @Override
     public void start() {