diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e864550fe457616bbc79f9ad6815b3dbd491634a..0b911e78586e52fd51068a5428c0558713a009a3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,9 +11,7 @@
<component name="ChangeListManager">
<list default="true" id="ffce6e62-d498-4e17-b121-42833fbda3f5" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" afterPath="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java" />
</list>
<ignored path="Medtronic640gUploader.iws" />
<ignored path=".idea/workspace.xml" />
@@ -34,11 +32,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="Medtronic640gActivity.java" pinned="false" current-in-tab="false">
+ <file leaf-file-name="Medtronic640gActivity.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-17.88889">
- <caret line="411" column="114" selection-start-line="411" selection-start-column="114" selection-end-line="411" selection-end-column="114" />
+ <state vertical-scroll-proportion="0.29955947">
+ <caret line="126" column="32" selection-start-line="126" selection-start-column="32" selection-end-line="126" selection-end-column="32" />
<folding>
<element signature="e#15673#15939#0" expanded="true" />
<element signature="e#15938#15939#0" expanded="true" />
@@ -69,10 +67,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="GetHmacAndKeyActivity.java" pinned="false" current-in-tab="true">
+ <file leaf-file-name="GetHmacAndKeyActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.33259913">
+ <state vertical-scroll-proportion="-5.5925927">
<caret line="114" column="42" selection-start-line="114" selection-start-column="42" selection-end-line="114" selection-end-column="42" />
<folding>
<element signature="e#4031#4073#0" expanded="true" />
@@ -1775,11 +1773,11 @@
<option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/DexcomG4Activity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/LoginActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" />
+ <option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java" />
</list>
</option>
</component>
@@ -2631,13 +2629,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicCGMService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.09653092">
- <caret line="1373" column="13" selection-start-line="1373" selection-start-column="13" selection-end-line="1373" selection-end-column="13" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/data/CNLConfigDbHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.49019608">
@@ -2796,17 +2787,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-17.88889">
- <caret line="411" column="114" selection-start-line="411" selection-start-column="114" selection-end-line="411" selection-end-column="114" />
- <folding>
- <element signature="e#15673#15939#0" expanded="true" />
- <element signature="e#15938#15939#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/values/values.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-1.6699029">
@@ -2851,7 +2831,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.33259913">
+ <state vertical-scroll-proportion="-5.5925927">
<caret line="114" column="42" selection-start-line="114" selection-start-column="42" selection-end-line="114" selection-end-column="42" />
<folding>
<element signature="e#4031#4073#0" expanded="true" />
@@ -2859,5 +2839,24 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicCGMService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.33264032">
+ <caret line="601" column="36" selection-start-line="601" selection-start-column="36" selection-end-line="601" selection-end-column="36" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.29955947">
+ <caret line="126" column="32" selection-start-line="126" selection-start-column="32" selection-end-line="126" selection-end-column="32" />
+ <folding>
+ <element signature="e#15673#15939#0" expanded="true" />
+ <element signature="e#15938#15939#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java b/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java
index e091f418b94c49b6919cde74bba0bfe029dd0752..6b2518b131391dbae89e498f298385185592cfea 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java
@@ -123,9 +123,9 @@ public class Medtronic640gActivity extends Activity implements OnSharedPreferenc
DecimalFormat df = null;
if (prefs.getBoolean("mmolDecimals", false))
- df = new DecimalFormat("#.##");
+ df = new DecimalFormat("#.00");
else
- df = new DecimalFormat("#.#");
+ df = new DecimalFormat("#.0");
String bglString = "---";
String unitsString = "mg/dL";
if (prefs.getBoolean("mmolxl", false)) {