Merge pull request #59 from nightscout/hotfix/calrecords

Hotfix/calrecords
nightscout · Nov 10, 2014 · 7763114 · 7763114
2 parents 70714a2 + 8c99e61
commit 7763114
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.nightscout.android"
-    android:versionCode="14"
-    android:versionName="0.1.8">
+    android:versionCode="15"
+    android:versionName="0.1.9">
 
     <uses-feature android:name="android.hardware.usb.host" />
 

diff --git a/app/src/main/java/com/nightscout/android/dexcom/ReadData.java b/app/src/main/java/com/nightscout/android/dexcom/ReadData.java
@@ -157,7 +157,6 @@ private <T> T readDataBasePage(int recordType, int page) {
         payload.add(numOfPages);
         writeCommand(Constants.READ_DATABASE_PAGES, payload);
         byte[] readData = read(2122).getData();
-        ParsePage(readData, recordType);
         return ParsePage(readData, recordType);
     }
 
@@ -193,10 +192,10 @@ private ReadPacket read(int numOfBytes) {
             // Add a 100ms delay for when multiple write/reads are occurring in series
             Thread.sleep(100);
 
-            // TODO: this debug code to print at most 30 bytes of the read, should be removed after
+            // TODO: this debug code to print data of the read, should be removed after
             // finding the source of the reading issue
             String bytes = "";
-            int readAmount = len > 30 ? 30 : len;
+            int readAmount = len;
             for (int i = 0; i < readAmount; i++) bytes += String.format("%02x", readData[i]) + " ";
             Log.d(TAG, "Read data: " + bytes);
             ////////////////////////////////////////////////////////////////////////////////////////

diff --git a/app/src/main/java/com/nightscout/android/dexcom/SyncingService.java b/app/src/main/java/com/nightscout/android/dexcom/SyncingService.java
@@ -129,7 +129,13 @@ private void handleActionSync(int numOfPages) {
                 // TODO: need to check if numOfPages if valid on ReadData side
                 SensorRecord[] sensorRecords = readData.getRecentSensorRecords(numOfPages);
                 GlucoseDataSet[] glucoseDataSets = Utils.mergeGlucoseDataRecords(recentRecords, sensorRecords);
-                CalRecord[] calRecords = readData.getRecentCalRecords();
+
+                // FIXME: This is a workaround for the new Dexcom AP which seems to have a new format
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
+                CalRecord[] calRecords = new CalRecord[1];
+                if (prefs.getBoolean("cloud_cal_data", false)) {
+                    calRecords = readData.getRecentCalRecords();
+                }
 
                 long timeSinceLastRecord = readData.getTimeSinceEGVRecord(recentRecords[recentRecords.length - 1]);
                 // TODO: determine if the logic here is correct. I suspect it assumes the last record was less than 5