diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a421251c625fa52a44eb10a1bb149bd698f05a4b..4552c5d113db3eddec6fca667aa7a8adedc93df0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,15 +10,81 @@
</component>
<component name="ChangeListManager">
<list default="true" id="ffce6e62-d498-4e17-b121-42833fbda3f5" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/Medtronic640gPumpRecord.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/MedtronicNG/CGMRecord.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicCalibration.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCalibration.java" afterPath="" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/USB/CommonUsbDriver.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/USB/CommonUsbDriver.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/USB/HidBridge.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/USB/HidBridge.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/USB/USBPower.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/USB/USBPower.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/USB/UsbDriver.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/USB/UsbDriver.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/USB/UsbHidDriver.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/USB/UsbHidDriver.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/CSVWriter.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/CSVWriter.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Service.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/DexcomG4Service.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomReader.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/DexcomReader.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/EGVRecord.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/EGVRecord.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/LoginActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/ResultSetHelper.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/ResultSetHelper.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/ResultSetHelperService.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/ResultSetHelperService.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/USB/CdcAcmSerialDriver.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/USB/CdcAcmSerialDriver.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/USB/CommonUsbSerialDriver.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/USB/CommonUsbSerialDriver.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/USB/HexDump.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/USB/HexDump.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/USB/SerialInputOutputManager.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/USB/SerialInputOutputManager.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/USB/UsbSerialDriver.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/USB/UsbSerialDriver.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/USB/UsbSerialProber.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/USB/UsbSerialProber.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/eula/Eula.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/eula/Eula.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/CommandSenderThread.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/CommandSenderThread.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/DataLog.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/DataLog.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/HistoricGetterThread.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/HistoricGetterThread.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCGMService.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicCGMService.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLReader.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLSession.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLSession.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicConstants.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicConstants.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicReader.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicReader.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigContract.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/data/CNLConfigContract.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigDbHelper.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/data/CNLConfigDbHelper.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/BeginEHSMMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/BeginEHSMMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ChannelNegotiateMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/ChannelNegotiateMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ChecksumException.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/ChecksumException.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkBinaryMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkBinaryMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkCommandMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkCommandMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkMessageHandler.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkMessageHandler.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/EncryptionException.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/EncryptionException.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/EndEHSMMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/EndEHSMMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicReceiveMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicReceiveMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicSendMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicSendMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MessageUtils.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/MessageUtils.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/PumpStatusRequestMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/PumpStatusRequestMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/PumpStatusResponseMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/PumpStatusResponseMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/PumpTimeRequestMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeRequestMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/PumpTimeResponseMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeResponseMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ReadInfoResponseMessage.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/ReadInfoResponseMessage.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/UnexpectedMessageException.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/UnexpectedMessageException.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/TestService.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/service/TestService.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/service/AbstractService.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/service/AbstractService.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/service/ServiceManager.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/service/ServiceManager.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/settings/SettingsActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/settings/SettingsActivity.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/settings/SettingsFragment.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/settings/SettingsFragment.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/DeviceRecord.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/DeviceRecord.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/GlucometerRecord.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/GlucometerRecord.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/MedtronicNG/CGMRecord.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/MedtronicNG/CGMRecord.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/MedtronicPumpRecord.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/MedtronicPumpRecord.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/MedtronicSensorRecord.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/MedtronicSensorRecord.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/Record.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/Record.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/UploadHelper.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/UploadHelper.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/utils/CustomSwitchPreference.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/utils/CustomSwitchPreference.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/widget/CGMWidget.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/widget/CGMWidget.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/widget/CGMWidgetUpdater.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/widget/CGMWidgetUpdater.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MessageUtils.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MessageUtils.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/DeviceRecord.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/DeviceRecord.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/UploadHelper.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/UploadHelper.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
+ <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/layout/activity_login.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" afterPath="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" />
</list>
<ignored path="Medtronic640gUploader.iws" />
<ignored path=".idea/workspace.xml" />
@@ -39,18 +105,28 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="DexcomG4Activity.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java">
+ <file leaf-file-name="Medtronic640gActivity.java" pinned="false" current-in-tab="false">
+ <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="75.55556">
- <caret line="150" column="0" selection-start-line="150" selection-start-column="0" selection-end-line="150" selection-end-column="0" />
+ <state vertical-scroll-proportion="-2.7777777">
+ <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ResultSetHelperService.java" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/ResultSetHelperService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.33333334">
+ <caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UploadHelper.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/UploadHelper.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/UploadHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-10.0">
<caret line="688" column="43" selection-start-line="688" selection-start-column="43" selection-end-line="688" selection-end-column="43" />
@@ -62,7 +138,7 @@
</entry>
</file>
<file leaf-file-name="MedtronicCNLService.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.6296296">
<caret line="145" column="0" selection-start-line="145" selection-start-column="0" selection-end-line="145" selection-end-column="0" />
@@ -73,18 +149,18 @@
</provider>
</entry>
</file>
- <file leaf-file-name="MedtronicCNLReader.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java">
+ <file leaf-file-name="MedtronicCNLReader.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLReader.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.59431523">
- <caret line="332" column="0" selection-start-line="332" selection-start-column="0" selection-end-line="332" selection-end-column="0" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="331" column="0" selection-start-line="331" selection-start-column="0" selection-end-line="331" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PumpStatusRecord.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="20" column="56" selection-start-line="20" selection-start-column="56" selection-end-line="20" selection-end-column="56" />
@@ -1395,7 +1471,7 @@
</option>
<option name="modificationStamps">
<map>
- <entry key="$PROJECT_DIR$" value="4387678967000" />
+ <entry key="$PROJECT_DIR$" value="4388083622000" />
</map>
</option>
<option name="projectBuildClasspath">
@@ -1784,6 +1860,12 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/UploadHelper.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java" />
+ <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
+ <option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/DexcomG4Activity.java" />
+ <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/Medtronic640gActivity.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/GetHmacAndKeyActivity.java" />
</list>
</option>
</component>
@@ -1840,14 +1922,6 @@
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xml" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1859,26 +1933,16 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="values" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="Medtronic640gUploader" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
+ <option name="myItemId" value="android" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
+ <option name="myItemId" value="widget" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
@@ -1891,26 +1955,16 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="layout" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="Medtronic640gUploader" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
+ <option name="myItemId" value="android" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="assets" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
+ <option name="myItemId" value="utils" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
@@ -1930,6 +1984,10 @@
<option name="myItemId" value="android" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="USB" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1971,11 +2029,7 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="upload" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="MedtronicNG" />
+ <option name="myItemId" value="settings" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -1997,7 +2051,7 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="medtronic" />
+ <option name="myItemId" value="service" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -2022,10 +2076,6 @@
<option name="myItemId" value="medtronic" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -2044,14 +2094,6 @@
<option name="myItemId" value="android" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="medtronic" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="data" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -2062,6 +2104,18 @@
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="android" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="dexcom" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
</subPane>
</pane>
@@ -2079,6 +2133,8 @@
</component>
<component name="RecentsManager">
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="info.nightscout.android.medtronic" />
+ <recent name="info.nightscout" />
<recent name="com.nightscout.android.upload.MedtronicNG" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
@@ -2380,12 +2436,12 @@
<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2496318" sideWeight="0.4949349" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3299566" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3299566" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2496318" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39942113" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39942113" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -2416,7 +2472,7 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java">
+ <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.0">
<caret line="166" column="77" selection-start-line="166" selection-start-column="71" selection-end-line="166" selection-end-column="77" />
@@ -2424,7 +2480,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/UploadHelper.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/UploadHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="397" column="29" selection-start-line="397" selection-start-column="17" selection-end-line="397" selection-end-column="29" />
@@ -2434,7 +2490,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="138" column="37" selection-start-line="138" selection-start-column="35" selection-end-line="138" selection-end-column="37" />
@@ -2444,7 +2500,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLReader.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -2452,7 +2508,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java">
+ <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.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -2460,7 +2516,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/UploadHelper.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/UploadHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="397" column="29" selection-start-line="397" selection-start-column="17" selection-end-line="397" selection-end-column="29" />
@@ -2470,7 +2526,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="138" column="37" selection-start-line="138" selection-start-column="35" selection-end-line="138" selection-end-column="37" />
@@ -2480,7 +2536,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java">
+ <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.0">
<caret line="166" column="77" selection-start-line="166" selection-start-column="71" selection-end-line="166" selection-end-column="77" />
@@ -2488,7 +2544,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/UploadHelper.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/UploadHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="397" column="29" selection-start-line="397" selection-start-column="17" selection-end-line="397" selection-end-column="29" />
@@ -2498,7 +2554,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -2508,7 +2564,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLReader.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="329" column="11" selection-start-line="329" selection-start-column="11" selection-end-line="329" selection-end-column="11" />
@@ -2516,7 +2572,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java">
+ <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.0">
<caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
@@ -2531,7 +2587,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLReader.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="43" column="13" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
@@ -2539,36 +2595,21 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/CommandSenderThread.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/CommandSenderThread.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="31" column="22" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="22" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.09803922">
- <caret line="4" column="21" selection-start-line="4" selection-start-column="18" selection-end-line="4" selection-end-column="21" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.6103286">
- <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/CommandSenderThread.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/CommandSenderThread.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="31" column="22" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="22" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/USB/USBPower.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/USB/USBPower.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.33333334">
<caret line="20" column="24" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
@@ -2596,21 +2637,21 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCGMService.java">
+ <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/com/nightscout/android/medtronic/data/CNLConfigDbHelper.java">
+ <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">
<caret line="119" column="25" selection-start-line="119" selection-start-column="25" selection-end-line="119" selection-end-column="25" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Service.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/DexcomG4Service.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.094339624">
<caret line="104" column="25" selection-start-line="104" selection-start-column="20" selection-end-line="104" selection-end-column="25" />
@@ -2640,7 +2681,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MessageUtils.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/message/MessageUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.3167421">
<caret line="65" column="94" selection-start-line="65" selection-start-column="94" selection-end-line="65" selection-end-column="94" />
@@ -2658,7 +2699,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/MedtronicPumpRecord.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/MedtronicPumpRecord.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.09049774">
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
@@ -2666,7 +2707,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/GlucometerRecord.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/GlucometerRecord.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.09049774">
<caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
@@ -2674,26 +2715,18 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="75.55556">
- <caret line="150" column="0" selection-start-line="150" selection-start-column="0" selection-end-line="150" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/DeviceRecord.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/DeviceRecord.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6511628">
<caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
<folding>
- <element signature="e#395#396#0" expanded="true" />
- <element signature="e#430#431#0" expanded="true" />
+ <element signature="e#396#397#0" expanded="true" />
+ <element signature="e#431#432#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/UploadHelper.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/UploadHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-10.0">
<caret line="688" column="43" selection-start-line="688" selection-start-column="43" selection-end-line="688" selection-end-column="43" />
@@ -2703,7 +2736,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.6296296">
<caret line="145" column="0" selection-start-line="145" selection-start-column="0" selection-end-line="145" selection-end-column="0" />
@@ -2713,7 +2746,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/MedtronicNG/CGMRecord.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/MedtronicNG/CGMRecord.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.61085975">
<caret line="32" column="6" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="6" />
@@ -2721,7 +2754,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="20" column="56" selection-start-line="20" selection-start-column="56" selection-end-line="20" selection-end-column="56" />
@@ -2729,10 +2762,53 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.18518518">
+ <caret line="4" column="21" selection-start-line="4" selection-start-column="18" selection-end-line="4" selection-end-column="21" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="3.3333333">
+ <caret line="78" column="43" selection-start-line="78" selection-start-column="43" selection-end-line="78" selection-end-column="43" />
+ <folding>
+ <element signature="e#1665#1683#0" expanded="true" />
+ <element signature="e#2005#2023#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLReader.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="331" column="0" selection-start-line="331" selection-start-column="0" selection-end-line="331" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </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.59431523">
- <caret line="332" column="0" selection-start-line="332" selection-start-column="0" selection-end-line="332" selection-end-column="0" />
+ <state vertical-scroll-proportion="0.2413793">
+ <caret line="48" column="13" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" />
+ <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="-2.7777777">
+ <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/dexcom/ResultSetHelperService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.33333334">
+ <caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
<folding />
</state>
</provider>
diff --git a/app/app.iml b/app/app.iml
index 9a64822a65a4d03265a046c848d0dd7f61c9843a..e01893b80a06899390b236bf3e0d47d87a8dff69 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -64,14 +64,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -80,9 +72,16 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
diff --git a/app/build.gradle b/app/build.gradle
index 9e81a6bc1fda906014610fcf153c0a885a47d60b..a0a2b832805fef1461872a3108f80b1d162c68ad 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
buildToolsVersion "23.0.1"
defaultConfig {
- applicationId "com.nightscout.android"
+ applicationId "info.nightscout.android"
minSdkVersion 15
targetSdkVersion 21
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c451ba5d338a56428c0f8c1ea060a7edf5f9d898..dd172c406fde8bcb7cd255aaf73a01288072c0dc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.nightscout.android"
+ package="info.nightscout.android"
android:versionCode="1"
android:versionName="1.0" >
@@ -36,9 +36,9 @@
<!-- I have set screenOrientation to "portrait" to avoid the restart of AsyncTasks when you rotate the phone -->
<activity
- android:name=".dexcom.DexcomG4Activity"
+ android:name=".medtronic.Medtronic640gActivity"
android:icon="@drawable/ic_launcher"
- android:label="NightScout"
+ android:label="@string/app_name"
android:launchMode="singleTask"
android:screenOrientation="portrait" >
<intent-filter android:icon="@drawable/ic_launcher" >
@@ -64,11 +64,6 @@
android:name=".dexcom.DexcomG4Service"
android:icon="@drawable/ic_launcher" >
</service>
- <!--
- <service android:icon="@drawable/ic_launcher"
- android:label="NightScout" android:name=".medtronic.MedtronicCGMService">
- </service>
- -->
<service
android:name=".medtronic.service.MedtronicCNLService"
android:icon="@drawable/ic_launcher" >
@@ -81,7 +76,7 @@
<service
android:name=".widget.CGMWidgetUpdater"
android:icon="@drawable/ic_launcher"
- android:label="NightScout" >
+ android:label="@string/app_name" >
</service>
<receiver android:name=".widget.CGMWidget" >
@@ -95,7 +90,7 @@
</receiver>
<activity
- android:name=".dexcom.LoginActivity"
+ android:name=".medtronic.GetHmacAndKeyActivity"
android:label="@string/title_activity_login" >
</activity>
</application>
diff --git a/app/src/main/java/com/nightscout/android/medtronic/MedtronicCalibration.java b/app/src/main/java/com/nightscout/android/medtronic/MedtronicCalibration.java
deleted file mode 100644
index 315e74965f33cf55c948638f940311bf45e76e81..0000000000000000000000000000000000000000
--- a/app/src/main/java/com/nightscout/android/medtronic/MedtronicCalibration.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.nightscout.android.medtronic;
-
-public class MedtronicCalibration {
-
-}
diff --git a/app/src/main/java/com/nightscout/android/USB/CommonUsbDriver.java b/app/src/main/java/info/nightscout/android/USB/CommonUsbDriver.java
similarity index 98%
rename from app/src/main/java/com/nightscout/android/USB/CommonUsbDriver.java
rename to app/src/main/java/info/nightscout/android/USB/CommonUsbDriver.java
index 08054dc397542225be403d4952f670c0f495580f..f3406d509878c59ea7c08a46945aee0dff7efb43 100644
--- a/app/src/main/java/com/nightscout/android/USB/CommonUsbDriver.java
+++ b/app/src/main/java/info/nightscout/android/USB/CommonUsbDriver.java
@@ -18,7 +18,7 @@
* Project home page: http://code.google.com/p/usb-serial-for-android/
*/
-package com.nightscout.android.USB;
+package info.nightscout.android.USB;
import android.hardware.usb.UsbDevice;
import android.hardware.usb.UsbDeviceConnection;
diff --git a/app/src/main/java/com/nightscout/android/USB/HidBridge.java b/app/src/main/java/info/nightscout/android/USB/HidBridge.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/USB/HidBridge.java
rename to app/src/main/java/info/nightscout/android/USB/HidBridge.java
index 26e4d37836058dfe32258188fde5a9c9ad425b0c..57ed36a474d2ac4966dae9685b39b678d72ae0ad 100644
--- a/app/src/main/java/com/nightscout/android/USB/HidBridge.java
+++ b/app/src/main/java/info/nightscout/android/USB/HidBridge.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.USB;
+package info.nightscout.android.USB;
import android.content.BroadcastReceiver;
import android.app.PendingIntent;
@@ -10,7 +10,6 @@ import android.hardware.usb.UsbDeviceConnection;
import android.hardware.usb.UsbEndpoint;
import android.hardware.usb.UsbInterface;
import android.hardware.usb.UsbManager;
-import android.os.Build;
import android.util.Log;
import java.util.HashMap;
diff --git a/app/src/main/java/com/nightscout/android/USB/USBPower.java b/app/src/main/java/info/nightscout/android/USB/USBPower.java
similarity index 97%
rename from app/src/main/java/com/nightscout/android/USB/USBPower.java
rename to app/src/main/java/info/nightscout/android/USB/USBPower.java
index 0c0a03440d11af5e94a6fc5df3ca51b17f245158..92890b8e0f3577c2a6f4966b2f002da4b65a57ff 100644
--- a/app/src/main/java/com/nightscout/android/USB/USBPower.java
+++ b/app/src/main/java/info/nightscout/android/USB/USBPower.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.USB;
+package info.nightscout.android.USB;
import java.io.DataOutputStream;
diff --git a/app/src/main/java/com/nightscout/android/USB/UsbDriver.java b/app/src/main/java/info/nightscout/android/USB/UsbDriver.java
similarity index 98%
rename from app/src/main/java/com/nightscout/android/USB/UsbDriver.java
rename to app/src/main/java/info/nightscout/android/USB/UsbDriver.java
index 7569a8c9eda0c7a507b47aa5f4e55175bc43b0d9..28e8759d4d89e8a01867d9026361dea5d2262290 100644
--- a/app/src/main/java/com/nightscout/android/USB/UsbDriver.java
+++ b/app/src/main/java/info/nightscout/android/USB/UsbDriver.java
@@ -18,7 +18,7 @@
* Project home page: http://code.google.com/p/usb-serial-for-android/
*/
-package com.nightscout.android.USB;
+package info.nightscout.android.USB;
import java.io.IOException;
diff --git a/app/src/main/java/com/nightscout/android/USB/UsbHidDriver.java b/app/src/main/java/info/nightscout/android/USB/UsbHidDriver.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/USB/UsbHidDriver.java
rename to app/src/main/java/info/nightscout/android/USB/UsbHidDriver.java
index 0b0c3fc960f29f48a9e02da47a06dd963aca9f4b..0332d977861152613f1fdc3090435a4b03cb80cb 100644
--- a/app/src/main/java/com/nightscout/android/USB/UsbHidDriver.java
+++ b/app/src/main/java/info/nightscout/android/USB/UsbHidDriver.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.USB;
+package info.nightscout.android.USB;
import android.hardware.usb.UsbDevice;
import android.hardware.usb.UsbDeviceConnection;
diff --git a/app/src/main/java/com/nightscout/android/dexcom/CSVWriter.java b/app/src/main/java/info/nightscout/android/dexcom/CSVWriter.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/dexcom/CSVWriter.java
rename to app/src/main/java/info/nightscout/android/dexcom/CSVWriter.java
index 127895784e5805c512aa802716c8b8acd04979fe..dbe42c231d7d20963c8bc6d31338b8e0dabf18ab 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/CSVWriter.java
+++ b/app/src/main/java/info/nightscout/android/dexcom/CSVWriter.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.dexcom;
+package info.nightscout.android.dexcom;
/**
Copyright 2005 Bytecode Pty Ltd.
diff --git a/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Service.java b/app/src/main/java/info/nightscout/android/dexcom/DexcomG4Service.java
similarity index 97%
rename from app/src/main/java/com/nightscout/android/dexcom/DexcomG4Service.java
rename to app/src/main/java/info/nightscout/android/dexcom/DexcomG4Service.java
index 93fb63eb218ddad47113ce1694585d646cdde7a2..c83082527017668dd713b42e7d3144d6285025bb 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Service.java
+++ b/app/src/main/java/info/nightscout/android/dexcom/DexcomG4Service.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.dexcom;
+package info.nightscout.android.dexcom;
import android.annotation.SuppressLint;
import android.app.Notification;
@@ -21,12 +21,12 @@ import android.view.Gravity;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
-import com.nightscout.android.R;
-import com.nightscout.android.dexcom.USB.SerialInputOutputManager;
-import com.nightscout.android.USB.USBPower;
-import com.nightscout.android.dexcom.USB.UsbSerialDriver;
-import com.nightscout.android.dexcom.USB.UsbSerialProber;
-import com.nightscout.android.upload.UploadHelper;
+import info.nightscout.android.R;
+import info.nightscout.android.dexcom.USB.SerialInputOutputManager;
+import info.nightscout.android.USB.USBPower;
+import info.nightscout.android.dexcom.USB.UsbSerialDriver;
+import info.nightscout.android.dexcom.USB.UsbSerialProber;
+import info.nightscout.android.upload.UploadHelper;
import java.io.IOException;
import java.text.ParseException;
diff --git a/app/src/main/java/com/nightscout/android/dexcom/DexcomReader.java b/app/src/main/java/info/nightscout/android/dexcom/DexcomReader.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/dexcom/DexcomReader.java
rename to app/src/main/java/info/nightscout/android/dexcom/DexcomReader.java
index f0259af29431e89648c6d2e855c202db6f4dac6f..4bf28c60ec805b8e1c015983dd9ba38c3179c94f 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/DexcomReader.java
+++ b/app/src/main/java/info/nightscout/android/dexcom/DexcomReader.java
@@ -1,11 +1,11 @@
-package com.nightscout.android.dexcom;
+package info.nightscout.android.dexcom;
import android.content.Context;
import android.hardware.usb.UsbManager;
import android.os.AsyncTask;
import android.util.Log;
-import com.nightscout.android.dexcom.USB.UsbSerialDriver;
-import com.nightscout.android.dexcom.USB.UsbSerialProber;
+import info.nightscout.android.dexcom.USB.UsbSerialDriver;
+import info.nightscout.android.dexcom.USB.UsbSerialProber;
import java.io.*;
import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/nightscout/android/dexcom/EGVRecord.java b/app/src/main/java/info/nightscout/android/dexcom/EGVRecord.java
similarity index 86%
rename from app/src/main/java/com/nightscout/android/dexcom/EGVRecord.java
rename to app/src/main/java/info/nightscout/android/dexcom/EGVRecord.java
index 9b0f08d7df65b05f6948506910b4842ceb831af6..1f715a5303e4d452c38d12769259d120dd2bb233 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/EGVRecord.java
+++ b/app/src/main/java/info/nightscout/android/dexcom/EGVRecord.java
@@ -1,8 +1,8 @@
-package com.nightscout.android.dexcom;
+package info.nightscout.android.dexcom;
import java.io.Serializable;
-import com.nightscout.android.upload.Record;
+import info.nightscout.android.upload.Record;
public class EGVRecord extends Record implements Serializable {
public String bGValue = "---";
diff --git a/app/src/main/java/com/nightscout/android/dexcom/ResultSetHelper.java b/app/src/main/java/info/nightscout/android/dexcom/ResultSetHelper.java
similarity index 95%
rename from app/src/main/java/com/nightscout/android/dexcom/ResultSetHelper.java
rename to app/src/main/java/info/nightscout/android/dexcom/ResultSetHelper.java
index b30d3f59b11b8200e212a1e9173589760ac48eee..7eb7c49272b83d980ff82a693ff85982f2f803d7 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/ResultSetHelper.java
+++ b/app/src/main/java/info/nightscout/android/dexcom/ResultSetHelper.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.dexcom;
+package info.nightscout.android.dexcom;
/**
Copyright 2005 Bytecode Pty Ltd.
diff --git a/app/src/main/java/com/nightscout/android/dexcom/ResultSetHelperService.java b/app/src/main/java/info/nightscout/android/dexcom/ResultSetHelperService.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/dexcom/ResultSetHelperService.java
rename to app/src/main/java/info/nightscout/android/dexcom/ResultSetHelperService.java
index 78ae6cf3ea06547fec4495e5546cc1b9bc77ece8..373671be09f94a4f1117db80efb16a2fad987f9b 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/ResultSetHelperService.java
+++ b/app/src/main/java/info/nightscout/android/dexcom/ResultSetHelperService.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.dexcom;
+package info.nightscout.android.dexcom;
/**
Copyright 2005 Bytecode Pty Ltd.
diff --git a/app/src/main/java/com/nightscout/android/dexcom/USB/CdcAcmSerialDriver.java b/app/src/main/java/info/nightscout/android/dexcom/USB/CdcAcmSerialDriver.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/dexcom/USB/CdcAcmSerialDriver.java
rename to app/src/main/java/info/nightscout/android/dexcom/USB/CdcAcmSerialDriver.java
index 2edfa3ca4292058524295607a7220ddfa40d22b5..97fc8b6654a60217df6f4da1b435fffb415e4ddd 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/USB/CdcAcmSerialDriver.java
+++ b/app/src/main/java/info/nightscout/android/dexcom/USB/CdcAcmSerialDriver.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.dexcom.USB;
+package info.nightscout.android.dexcom.USB;
import android.hardware.usb.*;
import android.util.Log;
diff --git a/app/src/main/java/com/nightscout/android/dexcom/USB/CommonUsbSerialDriver.java b/app/src/main/java/info/nightscout/android/dexcom/USB/CommonUsbSerialDriver.java
similarity index 98%
rename from app/src/main/java/com/nightscout/android/dexcom/USB/CommonUsbSerialDriver.java
rename to app/src/main/java/info/nightscout/android/dexcom/USB/CommonUsbSerialDriver.java
index 2bc88650a06be67375530e88cf429b645a95e10a..12efe9afd989e2fdf8b4c7e2c62526dc64a07254 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/USB/CommonUsbSerialDriver.java
+++ b/app/src/main/java/info/nightscout/android/dexcom/USB/CommonUsbSerialDriver.java
@@ -18,7 +18,7 @@
* Project home page: http://code.google.com/p/usb-serial-for-android/
*/
-package com.nightscout.android.dexcom.USB;
+package info.nightscout.android.dexcom.USB;
import android.hardware.usb.UsbDevice;
import android.hardware.usb.UsbDeviceConnection;
diff --git a/app/src/main/java/com/nightscout/android/dexcom/USB/HexDump.java b/app/src/main/java/info/nightscout/android/dexcom/USB/HexDump.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/dexcom/USB/HexDump.java
rename to app/src/main/java/info/nightscout/android/dexcom/USB/HexDump.java
index a292071973e998d34e7f384185cb31e2e48ff47c..360808374d583b849fa06afa980d16682fd2c340 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/USB/HexDump.java
+++ b/app/src/main/java/info/nightscout/android/dexcom/USB/HexDump.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.nightscout.android.dexcom.USB;
+package info.nightscout.android.dexcom.USB;
/**
* Clone of Android's HexDump class, for use in debugging. Cosmetic changes
diff --git a/app/src/main/java/com/nightscout/android/dexcom/USB/SerialInputOutputManager.java b/app/src/main/java/info/nightscout/android/dexcom/USB/SerialInputOutputManager.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/dexcom/USB/SerialInputOutputManager.java
rename to app/src/main/java/info/nightscout/android/dexcom/USB/SerialInputOutputManager.java
index 5a54a4c125490b74aa76037d3999e033e89ec12f..5e364dd61e573775e569501b0bab967eaf7b0d77 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/USB/SerialInputOutputManager.java
+++ b/app/src/main/java/info/nightscout/android/dexcom/USB/SerialInputOutputManager.java
@@ -18,7 +18,7 @@
* Project home page: http://code.google.com/p/usb-serial-for-android/
*/
-package com.nightscout.android.dexcom.USB;
+package info.nightscout.android.dexcom.USB;
import android.util.Log;
diff --git a/app/src/main/java/com/nightscout/android/dexcom/USB/UsbSerialDriver.java b/app/src/main/java/info/nightscout/android/dexcom/USB/UsbSerialDriver.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/dexcom/USB/UsbSerialDriver.java
rename to app/src/main/java/info/nightscout/android/dexcom/USB/UsbSerialDriver.java
index 4b269114058802f6417c57cf7b585da88eec21ed..1c6fde076fe7f86f374597dcaa666b593a1b2c40 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/USB/UsbSerialDriver.java
+++ b/app/src/main/java/info/nightscout/android/dexcom/USB/UsbSerialDriver.java
@@ -18,7 +18,7 @@
* Project home page: http://code.google.com/p/usb-serial-for-android/
*/
-package com.nightscout.android.dexcom.USB;
+package info.nightscout.android.dexcom.USB;
import java.io.IOException;
diff --git a/app/src/main/java/com/nightscout/android/dexcom/USB/UsbSerialProber.java b/app/src/main/java/info/nightscout/android/dexcom/USB/UsbSerialProber.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/dexcom/USB/UsbSerialProber.java
rename to app/src/main/java/info/nightscout/android/dexcom/USB/UsbSerialProber.java
index c1bdfc1379653e16da5693248fa6b0e17c9be650..6daa6b869300f5b5d1ea94bf6261d2cb39f3bcf5 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/USB/UsbSerialProber.java
+++ b/app/src/main/java/info/nightscout/android/dexcom/USB/UsbSerialProber.java
@@ -18,7 +18,7 @@
* Project home page: http://code.google.com/p/usb-serial-for-android/
*/
-package com.nightscout.android.dexcom.USB;
+package info.nightscout.android.dexcom.USB;
import android.hardware.usb.UsbDevice;
import android.hardware.usb.UsbDeviceConnection;
diff --git a/app/src/main/java/com/nightscout/android/eula/Eula.java b/app/src/main/java/info/nightscout/android/eula/Eula.java
similarity index 98%
rename from app/src/main/java/com/nightscout/android/eula/Eula.java
rename to app/src/main/java/info/nightscout/android/eula/Eula.java
index f3994dd15b261151e58bffc07cb62bc209593fbc..eb90972fab98f861737962719e7e33f4c769b7d2 100644
--- a/app/src/main/java/com/nightscout/android/eula/Eula.java
+++ b/app/src/main/java/info/nightscout/android/eula/Eula.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.eula;
+package info.nightscout.android.eula;
/*
* Copyright (C) 2008 The Android Open Source Project
*
@@ -27,7 +27,7 @@ import java.io.InputStreamReader;
import java.io.Closeable;
import java.util.Map;
-import com.nightscout.android.R;
+import info.nightscout.android.R;
/**
* Displays an EULA ("End User License Agreement") that the user has to accept before
diff --git a/app/src/main/java/com/nightscout/android/medtronic/CommandSenderThread.java b/app/src/main/java/info/nightscout/android/medtronic/CommandSenderThread.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/medtronic/CommandSenderThread.java
rename to app/src/main/java/info/nightscout/android/medtronic/CommandSenderThread.java
index 5cbe91aa34a43b3cc9db8b6db84544d073515f2b..52f9b9851d867b28a847ab8866949a4b5e24d455 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/CommandSenderThread.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/CommandSenderThread.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic;
+package info.nightscout.android.medtronic;
import android.os.Bundle;
import android.os.Handler;
@@ -7,7 +7,7 @@ import android.os.Messenger;
import android.os.RemoteException;
import android.util.Log;
-import com.nightscout.android.dexcom.USB.HexDump;
+import info.nightscout.android.dexcom.USB.HexDump;
import com.physicaloid.lib.Physicaloid;
import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/com/nightscout/android/medtronic/DataLog.java b/app/src/main/java/info/nightscout/android/medtronic/DataLog.java
similarity index 83%
rename from app/src/main/java/com/nightscout/android/medtronic/DataLog.java
rename to app/src/main/java/info/nightscout/android/medtronic/DataLog.java
index 896f8f0716ac28bd6ef2a59d34208065fc6d7773..2c7db1304357df31e62e613e617e9e710ccb9a1c 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/DataLog.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/DataLog.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic;
+package info.nightscout.android.medtronic;
import java.util.Date;
diff --git a/app/src/main/java/com/nightscout/android/dexcom/LoginActivity.java b/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java
similarity index 97%
rename from app/src/main/java/com/nightscout/android/dexcom/LoginActivity.java
rename to app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java
index 534f0e407d359b01e4ee2195b654823842f5fa2c..5ecb3f96a725e6b60f9543e18be0e7e9dcc2d7ba 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/LoginActivity.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.dexcom;
+package info.nightscout.android.medtronic;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
@@ -19,10 +19,10 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
-import com.nightscout.android.R;
-import com.nightscout.android.medtronic.data.CNLConfigContract;
-import com.nightscout.android.medtronic.data.CNLConfigDbHelper;
-import com.nightscout.android.medtronic.message.MessageUtils;
+import info.nightscout.android.R;
+import info.nightscout.android.medtronic.data.CNLConfigContract;
+import info.nightscout.android.medtronic.data.CNLConfigDbHelper;
+import info.nightscout.android.medtronic.message.MessageUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.http.HttpResponse;
@@ -46,7 +46,7 @@ import java.util.List;
/**
* A login screen that offers login via username/password.
*/
-public class LoginActivity extends Activity implements LoaderCallbacks<Cursor> {
+public class GetHmacAndKeyActivity extends Activity implements LoaderCallbacks<Cursor> {
/**
* Keep track of the login task to ensure we can cancel it if requested.
diff --git a/app/src/main/java/com/nightscout/android/medtronic/HistoricGetterThread.java b/app/src/main/java/info/nightscout/android/medtronic/HistoricGetterThread.java
similarity index 98%
rename from app/src/main/java/com/nightscout/android/medtronic/HistoricGetterThread.java
rename to app/src/main/java/info/nightscout/android/medtronic/HistoricGetterThread.java
index 7788b99198eace3e842759d1cc93746182d77fb7..af556d5a7e2cdc66fdaa3ddb353c32cbebc9915c 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/HistoricGetterThread.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/HistoricGetterThread.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic;
+package info.nightscout.android.medtronic;
import java.util.ArrayList;
import java.util.Arrays;
@@ -7,7 +7,7 @@ import java.util.HashMap;
import android.os.Handler;
import android.os.Messenger;
-import com.nightscout.android.dexcom.USB.HexDump;
+import info.nightscout.android.dexcom.USB.HexDump;
import com.physicaloid.lib.Physicaloid;
public class HistoricGetterThread extends CommandSenderThread {
diff --git a/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java b/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java
similarity index 94%
rename from app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java
rename to app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java
index d40010777c48d0f432abf8cddb1cd77e1223d15a..622d8d2a81f5ed435345a084e832bb2111e9a36d 100644
--- a/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.dexcom;
+package info.nightscout.android.medtronic;
import android.app.Activity;
import android.app.ActivityManager;
@@ -34,17 +34,16 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.TextView.BufferType;
-import com.nightscout.android.R;
-import com.nightscout.android.eula.Eula;
-import com.nightscout.android.eula.Eula.OnEulaAgreedTo;
-import com.nightscout.android.medtronic.MedtronicCGMService;
-import com.nightscout.android.medtronic.MedtronicConstants;
-import com.nightscout.android.medtronic.service.MedtronicCNLService;
-import com.nightscout.android.service.ServiceManager;
-import com.nightscout.android.settings.SettingsActivity;
-import com.nightscout.android.upload.MedtronicNG.CGMRecord;
-import com.nightscout.android.upload.MedtronicNG.PumpStatusRecord;
-import com.nightscout.android.upload.Record;
+import info.nightscout.android.R;
+import info.nightscout.android.dexcom.DexcomG4Service;
+import info.nightscout.android.eula.Eula;
+import info.nightscout.android.eula.Eula.OnEulaAgreedTo;
+import info.nightscout.android.medtronic.service.MedtronicCNLService;
+import info.nightscout.android.service.ServiceManager;
+import info.nightscout.android.settings.SettingsActivity;
+import info.nightscout.android.upload.MedtronicNG.CGMRecord;
+import info.nightscout.android.upload.MedtronicNG.PumpStatusRecord;
+import info.nightscout.android.upload.Record;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,15 +53,15 @@ import java.io.FileInputStream;
import java.io.ObjectInputStream;
import java.text.DecimalFormat;
-/* Main activity for the DexcomG4Activity program */
-public class DexcomG4Activity extends Activity implements OnSharedPreferenceChangeListener, OnEulaAgreedTo {
- private Logger log = (Logger) LoggerFactory.getLogger(DexcomG4Activity.class.getName());
+/* Main activity for the Medtronic640gActivity program */
+public class Medtronic640gActivity extends Activity implements OnSharedPreferenceChangeListener, OnEulaAgreedTo {
+ private Logger log = (Logger) LoggerFactory.getLogger(Medtronic640gActivity.class.getName());
//CGMs supported
public static final int DEXCOMG4 = 0;
public static final int MEDTRONIC_CGM = 1;
public static final int CNL_24 = 2;
- private static final String TAG = DexcomG4Activity.class.getSimpleName();
+ private static final String TAG = Medtronic640gActivity.class.getSimpleName();
private int cgmSelected = CNL_24;
private int calibrationSelected = MedtronicConstants.CALIBRATION_GLUCOMETER;
@@ -382,7 +381,7 @@ public class DexcomG4Activity extends Activity implements OnSharedPreferenceChan
startActivity(settingsIntent);
break;
case R.id.registerCNL:
- Intent loginIntent = new Intent(this, LoginActivity.class);
+ Intent loginIntent = new Intent(this, GetHmacAndKeyActivity.class);
startActivity(loginIntent);
break;
default:
@@ -405,7 +404,7 @@ public class DexcomG4Activity extends Activity implements OnSharedPreferenceChan
//cgmService.start();
break;
default:
- startService(new Intent(DexcomG4Activity.this, DexcomG4Service.class));
+ startService(new Intent(Medtronic640gActivity.this, DexcomG4Service.class));
}
return;
}
@@ -424,7 +423,7 @@ public class DexcomG4Activity extends Activity implements OnSharedPreferenceChan
}
break;
default:
- stopService(new Intent(DexcomG4Activity.this, DexcomG4Service.class));
+ stopService(new Intent(Medtronic640gActivity.this, DexcomG4Service.class));
}
return;
}
diff --git a/app/src/main/java/com/nightscout/android/medtronic/MedtronicCGMService.java b/app/src/main/java/info/nightscout/android/medtronic/MedtronicCGMService.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/medtronic/MedtronicCGMService.java
rename to app/src/main/java/info/nightscout/android/medtronic/MedtronicCGMService.java
index 51c6fe042ebfbfe9c141c48d8e12babf0327c9f9..e80e57adcb4a9e82ef0ac78476f5f3fdfabf73e2 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/MedtronicCGMService.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/MedtronicCGMService.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic;
+package info.nightscout.android.medtronic;
import java.io.File;
import java.io.FileInputStream;
@@ -52,12 +52,12 @@ import com.mongodb.MongoCredential;
import com.mongodb.ServerAddress;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
-import com.nightscout.android.dexcom.DexcomG4Activity;
-import com.nightscout.android.dexcom.USB.HexDump;
-import com.nightscout.android.upload.GlucometerRecord;
-import com.nightscout.android.upload.MedtronicSensorRecord;
-import com.nightscout.android.upload.Record;
-import com.nightscout.android.upload.UploadHelper;
+
+import info.nightscout.android.dexcom.USB.HexDump;
+import info.nightscout.android.upload.GlucometerRecord;
+import info.nightscout.android.upload.MedtronicSensorRecord;
+import info.nightscout.android.upload.Record;
+import info.nightscout.android.upload.UploadHelper;
import com.physicaloid.lib.Physicaloid;
import com.physicaloid.lib.usb.driver.uart.ReadLisener;
import com.physicaloid.lib.usb.driver.uart.UartConfig;
@@ -1055,7 +1055,7 @@ public class MedtronicCGMService extends Service implements
if ((recordsNotUploaded.length() > 0 || recordsNotUploadedJson.length() > 0) && !isDestroying) {
log.debug("to upload old records");
uploader = new UploadHelper(getApplicationContext(),
- DexcomG4Activity.MEDTRONIC_CGM,
+ Medtronic640gActivity.MEDTRONIC_CGM,
mClients);
if (!isDBInitialized){
isDBInitialized = initializeDB();
@@ -1160,7 +1160,7 @@ public class MedtronicCGMService extends Service implements
if (params.length > 0) {
synchronized (reloadLostLock) {
uploader = new UploadHelper(getApplicationContext(),
- DexcomG4Activity.MEDTRONIC_CGM,
+ Medtronic640gActivity.MEDTRONIC_CGM,
mClients);
if (!isDBInitialized){
isDBInitialized = initializeDB();
diff --git a/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java b/app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLReader.java
similarity index 86%
rename from app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java
rename to app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLReader.java
index 7ff4d9b47fcb927d8fa1f8863fae84cfde58e9e6..76445d357768017da19babac6036a5c16564617e 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLReader.java
@@ -1,29 +1,28 @@
-package com.nightscout.android.medtronic;
+package info.nightscout.android.medtronic;
import android.util.Log;
-import com.nightscout.android.USB.UsbHidDriver;
-import com.nightscout.android.dexcom.DexcomG4Activity;
-import com.nightscout.android.dexcom.USB.HexDump;
-import com.nightscout.android.medtronic.message.BeginEHSMMessage;
-import com.nightscout.android.medtronic.message.ChannelNegotiateMessage;
-import com.nightscout.android.medtronic.message.ChecksumException;
-import com.nightscout.android.medtronic.message.ContourNextLinkBinaryMessage;
-import com.nightscout.android.medtronic.message.ContourNextLinkCommandMessage;
-import com.nightscout.android.medtronic.message.ContourNextLinkMessage;
-import com.nightscout.android.medtronic.message.ContourNextLinkMessageHandler;
-import com.nightscout.android.medtronic.message.EncryptionException;
-import com.nightscout.android.medtronic.message.EndEHSMMessage;
-import com.nightscout.android.medtronic.message.MedtronicMessage;
-import com.nightscout.android.medtronic.message.MessageUtils;
-import com.nightscout.android.medtronic.message.PumpStatusRequestMessage;
-import com.nightscout.android.medtronic.message.PumpStatusResponseMessage;
-import com.nightscout.android.medtronic.message.PumpTimeRequestMessage;
-import com.nightscout.android.medtronic.message.PumpTimeResponseMessage;
-import com.nightscout.android.medtronic.message.ReadInfoResponseMessage;
-import com.nightscout.android.medtronic.message.UnexpectedMessageException;
-import com.nightscout.android.medtronic.service.MedtronicCNLService;
-import com.nightscout.android.upload.MedtronicNG.CGMRecord;
+import info.nightscout.android.USB.UsbHidDriver;
+import info.nightscout.android.dexcom.USB.HexDump;
+import info.nightscout.android.medtronic.message.BeginEHSMMessage;
+import info.nightscout.android.medtronic.message.ChannelNegotiateMessage;
+import info.nightscout.android.medtronic.message.ChecksumException;
+import info.nightscout.android.medtronic.message.ContourNextLinkBinaryMessage;
+import info.nightscout.android.medtronic.message.ContourNextLinkCommandMessage;
+import info.nightscout.android.medtronic.message.ContourNextLinkMessage;
+import info.nightscout.android.medtronic.message.ContourNextLinkMessageHandler;
+import info.nightscout.android.medtronic.message.EncryptionException;
+import info.nightscout.android.medtronic.message.EndEHSMMessage;
+import info.nightscout.android.medtronic.message.MedtronicMessage;
+import info.nightscout.android.medtronic.message.MessageUtils;
+import info.nightscout.android.medtronic.message.PumpStatusRequestMessage;
+import info.nightscout.android.medtronic.message.PumpStatusResponseMessage;
+import info.nightscout.android.medtronic.message.PumpTimeRequestMessage;
+import info.nightscout.android.medtronic.message.PumpTimeResponseMessage;
+import info.nightscout.android.medtronic.message.ReadInfoResponseMessage;
+import info.nightscout.android.medtronic.message.UnexpectedMessageException;
+import info.nightscout.android.medtronic.service.MedtronicCNLService;
+import info.nightscout.android.upload.MedtronicNG.CGMRecord;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -285,7 +284,7 @@ public class MedtronicCNLReader implements ContourNextLinkMessageHandler {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
pumpRecord.displayTime = dateFormat.format(pumpDate);
- DexcomG4Activity.pumpStatusRecord.pumpDate = pumpDate;
+ Medtronic640gActivity.pumpStatusRecord.pumpDate = pumpDate;
}
public void getPumpStatus(CGMRecord pumpRecord) throws IOException, EncryptionException, ChecksumException, TimeoutException {
@@ -310,7 +309,7 @@ public class MedtronicCNLReader implements ContourNextLinkMessageHandler {
// Read the data into the record
long rawActiveInsulin = statusBuffer.getShort(0x33) & 0x0000ffff;
- DexcomG4Activity.pumpStatusRecord.activeInsulin = new BigDecimal( rawActiveInsulin / 10000f ).setScale(3, BigDecimal.ROUND_HALF_UP);
+ Medtronic640gActivity.pumpStatusRecord.activeInsulin = new BigDecimal( rawActiveInsulin / 10000f ).setScale(3, BigDecimal.ROUND_HALF_UP);
pumpRecord.sensorBGL = statusBuffer.getShort(0x35) & 0x0000ffff; // In mg/DL. 0 means no CGM reading
long rtc;
long offset;
@@ -326,11 +325,11 @@ public class MedtronicCNLReader implements ContourNextLinkMessageHandler {
pumpRecord.setTrend(CGMRecord.fromMessageByte( statusBuffer.get(0x40)));
}
pumpRecord.sensorBGLDate = MessageUtils.decodeDateTime(rtc, offset);
- DexcomG4Activity.pumpStatusRecord.recentBolusWizard = statusBuffer.get(0x48) != 0;
- DexcomG4Activity.pumpStatusRecord.bolusWizardBGL = statusBuffer.getShort(0x49); // In mg/DL
+ Medtronic640gActivity.pumpStatusRecord.recentBolusWizard = statusBuffer.get(0x48) != 0;
+ Medtronic640gActivity.pumpStatusRecord.bolusWizardBGL = statusBuffer.getShort(0x49); // In mg/DL
long rawReservoirAmount = statusBuffer.getInt(0x2b) & 0xffffffff;
- DexcomG4Activity.pumpStatusRecord.reservoirAmount = new BigDecimal( rawReservoirAmount / 10000f ).setScale(3, BigDecimal.ROUND_HALF_UP);
- DexcomG4Activity.pumpStatusRecord.batteryPercentage = ( statusBuffer.get(0x2a) );
+ Medtronic640gActivity.pumpStatusRecord.reservoirAmount = new BigDecimal( rawReservoirAmount / 10000f ).setScale(3, BigDecimal.ROUND_HALF_UP);
+ Medtronic640gActivity.pumpStatusRecord.batteryPercentage = ( statusBuffer.get(0x2a) );
}
public void endEHSMSession() throws EncryptionException, IOException, TimeoutException {
diff --git a/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLSession.java b/app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLSession.java
similarity index 93%
rename from app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLSession.java
rename to app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLSession.java
index ba470a204e3da0fbcdd108d775578658174f1c81..6c1ac2f55a6295cb70d7ada74b9825bd6755926f 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLSession.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLSession.java
@@ -1,6 +1,4 @@
-package com.nightscout.android.medtronic;
-
-import com.nightscout.android.medtronic.message.MessageUtils;
+package info.nightscout.android.medtronic;
/**
* Created by lgoedhart on 26/03/2016.
diff --git a/app/src/main/java/info/nightscout/android/medtronic/MedtronicCalibration.java b/app/src/main/java/info/nightscout/android/medtronic/MedtronicCalibration.java
new file mode 100644
index 0000000000000000000000000000000000000000..e44e6c4dfe1d7ed79a9aaa932b403fa66fed1e1a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/android/medtronic/MedtronicCalibration.java
@@ -0,0 +1,5 @@
+package info.nightscout.android.medtronic;
+
+public class MedtronicCalibration {
+
+}
diff --git a/app/src/main/java/com/nightscout/android/medtronic/MedtronicConstants.java b/app/src/main/java/info/nightscout/android/medtronic/MedtronicConstants.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/medtronic/MedtronicConstants.java
rename to app/src/main/java/info/nightscout/android/medtronic/MedtronicConstants.java
index 284540cd2891edf2c1c8f79838a3a19c51939e2b..1919da9f2234e3a7d428a1fd023ca36847734d6f 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/MedtronicConstants.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/MedtronicConstants.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic;
+package info.nightscout.android.medtronic;
public class MedtronicConstants {
diff --git a/app/src/main/java/com/nightscout/android/medtronic/MedtronicReader.java b/app/src/main/java/info/nightscout/android/medtronic/MedtronicReader.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/medtronic/MedtronicReader.java
rename to app/src/main/java/info/nightscout/android/medtronic/MedtronicReader.java
index 67a8dc8677ef8c0282af1281a2f66998c3e9fbdc..0e5726a243be469bba3a407ab4761751e0c9a637 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/MedtronicReader.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/MedtronicReader.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic;
+package info.nightscout.android.medtronic;
import java.io.File;
import java.io.FileOutputStream;
@@ -12,13 +12,10 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Locale;
-import java.util.concurrent.atomic.AtomicBoolean;
import org.slf4j.LoggerFactory;
-import android.app.AlertDialog;
import android.content.Context;
-import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.Handler;
@@ -26,18 +23,15 @@ import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
import android.preference.PreferenceManager;
-import android.text.InputType;
import android.util.Log;
-import android.widget.EditText;
-import android.widget.TextView.BufferType;
import ch.qos.logback.classic.Logger;
-import com.nightscout.android.dexcom.USB.HexDump;
-import com.nightscout.android.upload.GlucometerRecord;
-import com.nightscout.android.upload.MedtronicPumpRecord;
-import com.nightscout.android.upload.MedtronicSensorRecord;
-import com.nightscout.android.upload.Record;
+import info.nightscout.android.dexcom.USB.HexDump;
+import info.nightscout.android.upload.GlucometerRecord;
+import info.nightscout.android.upload.MedtronicPumpRecord;
+import info.nightscout.android.upload.MedtronicSensorRecord;
+import info.nightscout.android.upload.Record;
import com.physicaloid.lib.Physicaloid;
/**
diff --git a/app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigContract.java b/app/src/main/java/info/nightscout/android/medtronic/data/CNLConfigContract.java
similarity index 93%
rename from app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigContract.java
rename to app/src/main/java/info/nightscout/android/medtronic/data/CNLConfigContract.java
index dbfbf3b3ce29445c87de69d368bb2687ab247922..49250a772bb4c068598d29d6cf8a9cbaca471ff5 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigContract.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/data/CNLConfigContract.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic.data;
+package info.nightscout.android.medtronic.data;
import android.provider.BaseColumns;
diff --git a/app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigDbHelper.java b/app/src/main/java/info/nightscout/android/medtronic/data/CNLConfigDbHelper.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigDbHelper.java
rename to app/src/main/java/info/nightscout/android/medtronic/data/CNLConfigDbHelper.java
index 7fe755d347c9ba02e6b27411b6737832510b131b..22ecae852a02d254a0d43df0e5a6355005ea6951 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigDbHelper.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/data/CNLConfigDbHelper.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic.data;
+package info.nightscout.android.medtronic.data;
import android.content.ContentValues;
import android.content.Context;
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/BeginEHSMMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/BeginEHSMMessage.java
similarity index 80%
rename from app/src/main/java/com/nightscout/android/medtronic/message/BeginEHSMMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/BeginEHSMMessage.java
index 14249523f4cca3265448953885feac3117cae07b..ed1c7d8f18c7cc61920428de4ec47ed5f6a1dc91 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/BeginEHSMMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/BeginEHSMMessage.java
@@ -1,6 +1,6 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
-import com.nightscout.android.medtronic.MedtronicCNLSession;
+import info.nightscout.android.medtronic.MedtronicCNLSession;
/**
* Created by lgoedhart on 26/03/2016.
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/ChannelNegotiateMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/ChannelNegotiateMessage.java
similarity index 90%
rename from app/src/main/java/com/nightscout/android/medtronic/message/ChannelNegotiateMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/ChannelNegotiateMessage.java
index e1889410035b81b2198b56ce314961311985c0be..cce33d28ea977c9f978269c0d1938bb189e0cff2 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/ChannelNegotiateMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/ChannelNegotiateMessage.java
@@ -1,6 +1,6 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
-import com.nightscout.android.medtronic.MedtronicCNLSession;
+import info.nightscout.android.medtronic.MedtronicCNLSession;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/ChecksumException.java b/app/src/main/java/info/nightscout/android/medtronic/message/ChecksumException.java
similarity index 77%
rename from app/src/main/java/com/nightscout/android/medtronic/message/ChecksumException.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/ChecksumException.java
index 728182aa0df36051a820c248306c871a51dd3615..1cdfe5341906933a69ece4385c4ea6d91c64bc1a 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/ChecksumException.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/ChecksumException.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
/**
* Created by lgoedhart on 26/03/2016.
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkBinaryMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkBinaryMessage.java
similarity index 96%
rename from app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkBinaryMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkBinaryMessage.java
index 964ed9f24bc06314e26d95e4cc0ca987230708e4..c0c8db8cc06318fdc2ad53a93510d1a2672fbe27 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkBinaryMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkBinaryMessage.java
@@ -1,6 +1,6 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
-import com.nightscout.android.medtronic.MedtronicCNLSession;
+import info.nightscout.android.medtronic.MedtronicCNLSession;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkCommandMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkCommandMessage.java
similarity index 80%
rename from app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkCommandMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkCommandMessage.java
index 91021b2847b637946739441c8fe6d6c32886f27c..ad114c682a2eeac28d4e1e19a0f42a1131a72c26 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkCommandMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkCommandMessage.java
@@ -1,6 +1,4 @@
-package com.nightscout.android.medtronic.message;
-
-import java.nio.ByteBuffer;
+package info.nightscout.android.medtronic.message;
/**
* Created by lgoedhart on 26/03/2016.
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkMessage.java
similarity index 93%
rename from app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkMessage.java
index 3c4a5034872f51390434d845f3ced5387bbbf34c..2a44cfdeede51c0ec2d21d6b6128aa17a04cbd10 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkMessage.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkMessageHandler.java b/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkMessageHandler.java
similarity index 82%
rename from app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkMessageHandler.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkMessageHandler.java
index 434a0a9a677867b2a7b5d05181e66d3e6a87abb9..1d669f67b84cd9118e11c91966db05ff95f8738c 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkMessageHandler.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/ContourNextLinkMessageHandler.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
import java.io.IOException;
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/EncryptionException.java b/app/src/main/java/info/nightscout/android/medtronic/message/EncryptionException.java
similarity index 78%
rename from app/src/main/java/com/nightscout/android/medtronic/message/EncryptionException.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/EncryptionException.java
index 5e867743949b49722ae6ca12cc57dc67ad10c7ac..a86847431c501032a8ed3c9c27bb1087bf0ee288 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/EncryptionException.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/EncryptionException.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
/**
* Created by lgoedhart on 26/03/2016.
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/EndEHSMMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/EndEHSMMessage.java
similarity index 79%
rename from app/src/main/java/com/nightscout/android/medtronic/message/EndEHSMMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/EndEHSMMessage.java
index 46f119b21b462a974b57a0d83c306dbebf25270e..fe1adae580d34b37306f8a7ed30d536bff49448b 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/EndEHSMMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/EndEHSMMessage.java
@@ -1,6 +1,6 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
-import com.nightscout.android.medtronic.MedtronicCNLSession;
+import info.nightscout.android.medtronic.MedtronicCNLSession;
/**
* Created by lgoedhart on 26/03/2016.
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicMessage.java
similarity index 89%
rename from app/src/main/java/com/nightscout/android/medtronic/message/MedtronicMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/MedtronicMessage.java
index d27b36623bac3ebe8b495011fee719aeb1689d35..aed8d129f378cd16c779c13f83b3d0c857ccce81 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicMessage.java
@@ -1,17 +1,11 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
-import com.nightscout.android.medtronic.MedtronicCNLSession;
+import info.nightscout.android.medtronic.MedtronicCNLSession;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicReceiveMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicReceiveMessage.java
similarity index 96%
rename from app/src/main/java/com/nightscout/android/medtronic/message/MedtronicReceiveMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/MedtronicReceiveMessage.java
index 2d7401ab0e0d88287ed2cbbd32c801ae15d771ad..63d854a6e12871c1a6fae098011f5ecfb120dbb3 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicReceiveMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicReceiveMessage.java
@@ -1,6 +1,6 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
-import com.nightscout.android.medtronic.MedtronicCNLSession;
+import info.nightscout.android.medtronic.MedtronicCNLSession;
import java.nio.ByteBuffer;
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicSendMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicSendMessage.java
similarity index 96%
rename from app/src/main/java/com/nightscout/android/medtronic/message/MedtronicSendMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/MedtronicSendMessage.java
index f187f3dd41b4e89455dca3809a4ac212ba19476f..61d416c81b8dc87f7185d32f9a37c0690c2cf4c4 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicSendMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/MedtronicSendMessage.java
@@ -1,6 +1,6 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
-import com.nightscout.android.medtronic.MedtronicCNLSession;
+import info.nightscout.android.medtronic.MedtronicCNLSession;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/MessageUtils.java b/app/src/main/java/info/nightscout/android/medtronic/message/MessageUtils.java
similarity index 97%
rename from app/src/main/java/com/nightscout/android/medtronic/message/MessageUtils.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/MessageUtils.java
index 666a09237c8bc838646d2e7b2911422184bde178..5b800808e7ab294f9f115f66589d971ac8dffa32 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/MessageUtils.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/MessageUtils.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
import java.util.Calendar;
import java.util.Date;
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/PumpStatusRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/PumpStatusRequestMessage.java
similarity index 72%
rename from app/src/main/java/com/nightscout/android/medtronic/message/PumpStatusRequestMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/PumpStatusRequestMessage.java
index 4d2e4e8a5888048a8bf4e62f7ebec5606f608da3..aba4dc62d0db5aea298fa4fcc8160b3e7162185a 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/PumpStatusRequestMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/PumpStatusRequestMessage.java
@@ -1,6 +1,6 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
-import com.nightscout.android.medtronic.MedtronicCNLSession;
+import info.nightscout.android.medtronic.MedtronicCNLSession;
/**
* Created by lgoedhart on 26/03/2016.
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/PumpStatusResponseMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/PumpStatusResponseMessage.java
similarity index 86%
rename from app/src/main/java/com/nightscout/android/medtronic/message/PumpStatusResponseMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/PumpStatusResponseMessage.java
index bc31af2a125725d35c516fa2502b6e57012d8523..bbd3c3b63c916c6ee20439a83dbc70223d54bf8a 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/PumpStatusResponseMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/PumpStatusResponseMessage.java
@@ -1,6 +1,6 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
-import com.nightscout.android.medtronic.MedtronicCNLSession;
+import info.nightscout.android.medtronic.MedtronicCNLSession;
/**
* Created by lgoedhart on 27/03/2016.
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/PumpTimeRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeRequestMessage.java
similarity index 71%
rename from app/src/main/java/com/nightscout/android/medtronic/message/PumpTimeRequestMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeRequestMessage.java
index abcb9e75ed2940fd69aae122ff647b8caaae8716..97fb82065755fe04806bb1862ea38940c8f1c40d 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/PumpTimeRequestMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeRequestMessage.java
@@ -1,6 +1,6 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
-import com.nightscout.android.medtronic.MedtronicCNLSession;
+import info.nightscout.android.medtronic.MedtronicCNLSession;
/**
* Created by lgoedhart on 26/03/2016.
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/PumpTimeResponseMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeResponseMessage.java
similarity index 81%
rename from app/src/main/java/com/nightscout/android/medtronic/message/PumpTimeResponseMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeResponseMessage.java
index 410e54efdf34b897e573d69363e8c38946bf39da..940f9afa38015f6bb9dc185fdd84a28baf4d1a8e 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/PumpTimeResponseMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeResponseMessage.java
@@ -1,9 +1,6 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
-import com.nightscout.android.medtronic.MedtronicCNLSession;
-
-import java.nio.ByteBuffer;
-import java.util.Date;
+import info.nightscout.android.medtronic.MedtronicCNLSession;
/**
* Created by lgoedhart on 27/03/2016.
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/ReadInfoResponseMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/ReadInfoResponseMessage.java
similarity index 86%
rename from app/src/main/java/com/nightscout/android/medtronic/message/ReadInfoResponseMessage.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/ReadInfoResponseMessage.java
index ccab256c2deb3356b4c68ee28f35cabbb376f401..980392929a454a5cd841d74de46f5e46b7669aef 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/ReadInfoResponseMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/ReadInfoResponseMessage.java
@@ -1,6 +1,6 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
-import com.nightscout.android.medtronic.MedtronicCNLSession;
+import info.nightscout.android.medtronic.MedtronicCNLSession;
/**
* Created by lgoedhart on 10/05/2016.
diff --git a/app/src/main/java/com/nightscout/android/medtronic/message/UnexpectedMessageException.java b/app/src/main/java/info/nightscout/android/medtronic/message/UnexpectedMessageException.java
similarity index 79%
rename from app/src/main/java/com/nightscout/android/medtronic/message/UnexpectedMessageException.java
rename to app/src/main/java/info/nightscout/android/medtronic/message/UnexpectedMessageException.java
index 0fe4e94ec1fad4de52637d937e63471c6321578c..71ec46969f14e8caf316b27ed30c3666144df880 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/message/UnexpectedMessageException.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/UnexpectedMessageException.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic.message;
+package info.nightscout.android.medtronic.message;
/**
* Created by lgoedhart on 26/03/2016.
diff --git a/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java
similarity index 77%
rename from app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java
rename to app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java
index 1896fe72538ae78d905a228e5574cd4e6b706113..da0e8902a5aafb6d5c5227f59217308441484023 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic.service;
+package info.nightscout.android.medtronic.service;
import android.annotation.SuppressLint;
import android.app.Notification;
@@ -18,18 +18,18 @@ import android.os.Message;
import android.preference.PreferenceManager;
import android.util.Log;
-import com.nightscout.android.R;
-import com.nightscout.android.USB.UsbHidDriver;
-import com.nightscout.android.dexcom.DexcomG4Activity;
-import com.nightscout.android.medtronic.MedtronicCNLReader;
-import com.nightscout.android.medtronic.data.CNLConfigDbHelper;
-import com.nightscout.android.medtronic.message.ChecksumException;
-import com.nightscout.android.medtronic.message.EncryptionException;
-import com.nightscout.android.medtronic.message.MessageUtils;
-import com.nightscout.android.medtronic.message.UnexpectedMessageException;
-import com.nightscout.android.service.AbstractService;
-import com.nightscout.android.upload.MedtronicNG.CGMRecord;
-import com.nightscout.android.upload.UploadHelper;
+import info.nightscout.android.R;
+import info.nightscout.android.USB.UsbHidDriver;
+import info.nightscout.android.medtronic.Medtronic640gActivity;
+import info.nightscout.android.medtronic.MedtronicCNLReader;
+import info.nightscout.android.medtronic.data.CNLConfigDbHelper;
+import info.nightscout.android.medtronic.message.ChecksumException;
+import info.nightscout.android.medtronic.message.EncryptionException;
+import info.nightscout.android.medtronic.message.MessageUtils;
+import info.nightscout.android.medtronic.message.UnexpectedMessageException;
+import info.nightscout.android.service.AbstractService;
+import info.nightscout.android.upload.MedtronicNG.CGMRecord;
+import info.nightscout.android.upload.UploadHelper;
import java.io.File;
import java.io.FileInputStream;
@@ -105,18 +105,18 @@ public class MedtronicCNLService extends AbstractService {
// Load the initial data to the display
CGMRecord pumpRecord = loadData();
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_DATA, pumpRecord));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_DATA, pumpRecord));
if (!isOnline()) {
String title = "Internet connection error";
String msg = "Please check that you're connected to the Internet";
//showNotification(title, msg);
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_ERROR, title + "\n" + msg));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_ERROR, title + "\n" + msg));
} else if (mHidDevice == null) {
String title = "USB connection error";
String msg = "Is the Bayer Contour NextLink plugged in?";
//showNotification(title, msg);
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_ERROR, title + "\n" + msg));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_ERROR, title + "\n" + msg));
} else {
try {
mHidDevice.open();
@@ -131,7 +131,7 @@ public class MedtronicCNLService extends AbstractService {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
try {
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_STATUS, "Connecting to the Contour Next Link..."));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_STATUS, "Connecting to the Contour Next Link..."));
cnlReader.requestDeviceInfo();
// Is the device already configured?
@@ -141,10 +141,10 @@ public class MedtronicCNLService extends AbstractService {
String key = configDbHelper.getKey( cnlReader.getStickSerial() );
String deviceName = String.format( "medtronic-640g://%s", cnlReader.getStickSerial() );
pumpRecord.setDeviceName( deviceName );
- DexcomG4Activity.pumpStatusRecord.setDeviceName( deviceName );
+ Medtronic640gActivity.pumpStatusRecord.setDeviceName( deviceName );
if( hmac.equals( "" ) || key.equals("") ) {
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_ERROR, "Before you can use the Contour Next Link, you need to register it with the app. Select 'Register USB Stick' from the menu."));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_ERROR, "Before you can use the Contour Next Link, you need to register it with the app. Select 'Register USB Stick' from the menu."));
return;
}
@@ -158,42 +158,42 @@ public class MedtronicCNLService extends AbstractService {
cnlReader.requestReadInfo();
byte radioChannel = cnlReader.negotiateChannel();
if (radioChannel == 0) {
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_ERROR, "Could not communicate with the 640g. Are you near the pump?"));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_ERROR, "Could not communicate with the 640g. Are you near the pump?"));
Log.i(TAG, "Could not communicate with the 640g. Are you near the pump?");
} else {
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_STATUS, String.format("Connected to Contour Next Link on channel %d.", (int) radioChannel)));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_STATUS, String.format("Connected to Contour Next Link on channel %d.", (int) radioChannel)));
Log.d(TAG, String.format("Connected to Contour Next Link on channel %d.", (int) radioChannel));
cnlReader.beginEHSMSession();
cnlReader.getPumpTime(pumpRecord);
cnlReader.getPumpStatus(pumpRecord);
writeData(pumpRecord);
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_DATA, pumpRecord));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_DATA, pumpRecord));
cnlReader.endEHSMSession();
}
cnlReader.closeConnection();
} catch (UnexpectedMessageException e) {
Log.e(TAG, "Unexpected Message", e);
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_ERROR, "Communication Error: " + e.getMessage()));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_ERROR, "Communication Error: " + e.getMessage()));
} finally {
cnlReader.endPassthroughMode();
cnlReader.endControlMode();
}
} catch (IOException e) {
Log.e(TAG, "Error getting BGLs", e);
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_ERROR, "Error connecting to Contour Next Link."));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_ERROR, "Error connecting to Contour Next Link."));
} catch (ChecksumException e) {
Log.e(TAG, "Checksum error", e);
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_ERROR, "Checksum error getting message from the Contour Next Link."));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_ERROR, "Checksum error getting message from the Contour Next Link."));
} catch (EncryptionException e) {
Log.e(TAG, "Encryption exception", e);
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_ERROR, "Error decrypting messages from Contour Next Link."));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_ERROR, "Error decrypting messages from Contour Next Link."));
} catch (TimeoutException e) {
Log.e(TAG, "Timeout communicating with Contour", e);
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_ERROR, "Timeout communicating with the Contour Next Link."));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_ERROR, "Timeout communicating with the Contour Next Link."));
} catch (UnexpectedMessageException e) {
Log.e(TAG, "Unexpected Message", e);
- send(Message.obtain(null, DexcomG4Activity.DexcomG4ActivityHandler.MSG_ERROR, "Could not close connection: " + e.getMessage()));
+ send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_ERROR, "Could not close connection: " + e.getMessage()));
}
mUploader.execute(pumpRecord);
@@ -246,7 +246,7 @@ public class MedtronicCNLService extends AbstractService {
// The PendingIntent to launch our activity if the user selects this notification
nm = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
- PendingIntent contentIntent = PendingIntent.getActivity(this, 0, new Intent(this, DexcomG4Activity.class), 0);
+ PendingIntent contentIntent = PendingIntent.getActivity(this, 0, new Intent(this, Medtronic640gActivity.class), 0);
Notification n = new Notification.Builder(mContext)
.setDefaults(Notification.DEFAULT_ALL)
.setContentTitle(title)
diff --git a/app/src/main/java/com/nightscout/android/medtronic/service/TestService.java b/app/src/main/java/info/nightscout/android/medtronic/service/TestService.java
similarity index 90%
rename from app/src/main/java/com/nightscout/android/medtronic/service/TestService.java
rename to app/src/main/java/info/nightscout/android/medtronic/service/TestService.java
index e3d6a82bc44492e1d648b5bd4861c646810b3f1e..0450bd1e767cb540b1ac899c25ff3a7bd01ab40c 100644
--- a/app/src/main/java/com/nightscout/android/medtronic/service/TestService.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/service/TestService.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.medtronic.service;
+package info.nightscout.android.medtronic.service;
import android.app.Notification;
import android.app.NotificationManager;
@@ -7,9 +7,9 @@ import android.content.Intent;
import android.os.Message;
import android.util.Log;
-import com.nightscout.android.R;
-import com.nightscout.android.dexcom.DexcomG4Activity;
-import com.nightscout.android.service.AbstractService;
+import info.nightscout.android.R;
+import info.nightscout.android.medtronic.Medtronic640gActivity;
+import info.nightscout.android.service.AbstractService;
import java.util.Timer;
import java.util.TimerTask;
@@ -63,7 +63,7 @@ public class TestService extends AbstractService {
String text = "Test service, yo";
Notification notification = new Notification(R.drawable.ic_launcher, text, System.currentTimeMillis());
- PendingIntent contentIntent = PendingIntent.getActivity(this, 0, new Intent(this, DexcomG4Activity.class), 0);
+ PendingIntent contentIntent = PendingIntent.getActivity(this, 0, new Intent(this, Medtronic640gActivity.class), 0);
notification.setLatestEventInfo(this, getClass().getSimpleName(), text, contentIntent);
// Send the notification.
diff --git a/app/src/main/java/com/nightscout/android/service/AbstractService.java b/app/src/main/java/info/nightscout/android/service/AbstractService.java
similarity index 98%
rename from app/src/main/java/com/nightscout/android/service/AbstractService.java
rename to app/src/main/java/info/nightscout/android/service/AbstractService.java
index d044144761df9bc4050b49f00e4a5e57febeac1e..d7f615641f1136a34561c0154c0759ab865ae3ca 100644
--- a/app/src/main/java/com/nightscout/android/service/AbstractService.java
+++ b/app/src/main/java/info/nightscout/android/service/AbstractService.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.service;
+package info.nightscout.android.service;
/*
* This example demonstrates a good way to communicate between Activity and Service.
*
diff --git a/app/src/main/java/com/nightscout/android/service/ServiceManager.java b/app/src/main/java/info/nightscout/android/service/ServiceManager.java
similarity index 99%
rename from app/src/main/java/com/nightscout/android/service/ServiceManager.java
rename to app/src/main/java/info/nightscout/android/service/ServiceManager.java
index 1459347081e5e5fdf92f2ace7fc339ea660d1caa..f87dc5b708db0035ef907fd21f4d3ea80d195ad7 100644
--- a/app/src/main/java/com/nightscout/android/service/ServiceManager.java
+++ b/app/src/main/java/info/nightscout/android/service/ServiceManager.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.service;
+package info.nightscout.android.service;
/*
* This example demonstrates a good way to communicate between Activity and Service.
diff --git a/app/src/main/java/com/nightscout/android/settings/SettingsActivity.java b/app/src/main/java/info/nightscout/android/settings/SettingsActivity.java
similarity index 90%
rename from app/src/main/java/com/nightscout/android/settings/SettingsActivity.java
rename to app/src/main/java/info/nightscout/android/settings/SettingsActivity.java
index 43314b3103cdf992ae144e9d4f7583519ec6b24f..0110a50e4ed7cb47721c12752ab591dea22f8950 100644
--- a/app/src/main/java/com/nightscout/android/settings/SettingsActivity.java
+++ b/app/src/main/java/info/nightscout/android/settings/SettingsActivity.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.settings;
+package info.nightscout.android.settings;
import android.os.Bundle;
import android.preference.PreferenceActivity;
diff --git a/app/src/main/java/com/nightscout/android/settings/SettingsFragment.java b/app/src/main/java/info/nightscout/android/settings/SettingsFragment.java
similarity index 97%
rename from app/src/main/java/com/nightscout/android/settings/SettingsFragment.java
rename to app/src/main/java/info/nightscout/android/settings/SettingsFragment.java
index 0a62144e04eda68115f8925811136c4f032d94bc..dea60c93080fce7b89c2babebef87d564f67eef4 100644
--- a/app/src/main/java/com/nightscout/android/settings/SettingsFragment.java
+++ b/app/src/main/java/info/nightscout/android/settings/SettingsFragment.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.settings;
+package info.nightscout.android.settings;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
@@ -11,7 +11,7 @@ import android.preference.PreferenceCategory;
import android.preference.PreferenceFragment;
import android.preference.SwitchPreference;
-import com.nightscout.android.R;
+import info.nightscout.android.R;
public class SettingsFragment extends PreferenceFragment implements OnSharedPreferenceChangeListener {
diff --git a/app/src/main/java/com/nightscout/android/upload/DeviceRecord.java b/app/src/main/java/info/nightscout/android/upload/DeviceRecord.java
similarity index 90%
rename from app/src/main/java/com/nightscout/android/upload/DeviceRecord.java
rename to app/src/main/java/info/nightscout/android/upload/DeviceRecord.java
index 10f749f2118f82d7a7ab3950e9f063d8fec03ee4..0d4b5b2739774506e4ae41584a7bc8850905c498 100644
--- a/app/src/main/java/com/nightscout/android/upload/DeviceRecord.java
+++ b/app/src/main/java/info/nightscout/android/upload/DeviceRecord.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.upload;
+package info.nightscout.android.upload;
import java.io.Serializable;
diff --git a/app/src/main/java/com/nightscout/android/upload/GlucometerRecord.java b/app/src/main/java/info/nightscout/android/upload/GlucometerRecord.java
similarity index 91%
rename from app/src/main/java/com/nightscout/android/upload/GlucometerRecord.java
rename to app/src/main/java/info/nightscout/android/upload/GlucometerRecord.java
index 05eda7619efde90f0bc453f9fd730116816a00e4..10dbb2c22df4d20f73d65a354a7c89f940eae596 100644
--- a/app/src/main/java/com/nightscout/android/upload/GlucometerRecord.java
+++ b/app/src/main/java/info/nightscout/android/upload/GlucometerRecord.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.upload;
+package info.nightscout.android.upload;
import java.io.Serializable;
diff --git a/app/src/main/java/com/nightscout/android/upload/MedtronicNG/CGMRecord.java b/app/src/main/java/info/nightscout/android/upload/MedtronicNG/CGMRecord.java
similarity index 96%
rename from app/src/main/java/com/nightscout/android/upload/MedtronicNG/CGMRecord.java
rename to app/src/main/java/info/nightscout/android/upload/MedtronicNG/CGMRecord.java
index a0e1113d435b54dd062cc3eb81abcd4d5b9bc553..75bc872efd9bad5aca758906b54c84ade826207d 100644
--- a/app/src/main/java/com/nightscout/android/upload/MedtronicNG/CGMRecord.java
+++ b/app/src/main/java/info/nightscout/android/upload/MedtronicNG/CGMRecord.java
@@ -1,6 +1,6 @@
-package com.nightscout.android.upload.MedtronicNG;
+package info.nightscout.android.upload.MedtronicNG;
-import com.nightscout.android.upload.DeviceRecord;
+import info.nightscout.android.upload.DeviceRecord;
import java.io.Serializable;
import java.util.Date;
diff --git a/app/src/main/java/com/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java b/app/src/main/java/info/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java
similarity index 88%
rename from app/src/main/java/com/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java
rename to app/src/main/java/info/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java
index cb4a30f2b52c109366d7378edeee879ccb9d2feb..b4ad000bf45b49a07b8bb57314a78436bd9bfff0 100644
--- a/app/src/main/java/com/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java
+++ b/app/src/main/java/info/nightscout/android/upload/MedtronicNG/PumpStatusRecord.java
@@ -1,6 +1,6 @@
-package com.nightscout.android.upload.MedtronicNG;
+package info.nightscout.android.upload.MedtronicNG;
-import com.nightscout.android.upload.DeviceRecord;
+import info.nightscout.android.upload.DeviceRecord;
import java.io.Serializable;
import java.math.BigDecimal;
diff --git a/app/src/main/java/com/nightscout/android/upload/MedtronicPumpRecord.java b/app/src/main/java/info/nightscout/android/upload/MedtronicPumpRecord.java
similarity index 98%
rename from app/src/main/java/com/nightscout/android/upload/MedtronicPumpRecord.java
rename to app/src/main/java/info/nightscout/android/upload/MedtronicPumpRecord.java
index 13f7ad7e83649fee7d699568ffbe89062eba2305..64c28c396133810aaefb867c0f7cf98ba9f259d8 100644
--- a/app/src/main/java/com/nightscout/android/upload/MedtronicPumpRecord.java
+++ b/app/src/main/java/info/nightscout/android/upload/MedtronicPumpRecord.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.upload;
+package info.nightscout.android.upload;
import java.io.Serializable;
@@ -6,9 +6,6 @@ import org.bson.Document;
import org.json.JSONException;
import org.json.JSONObject;
-import com.mongodb.DBObject;
-import com.nightscout.android.medtronic.MedtronicConstants;
-
public class MedtronicPumpRecord extends DeviceRecord implements Serializable{
/**
diff --git a/app/src/main/java/com/nightscout/android/upload/MedtronicSensorRecord.java b/app/src/main/java/info/nightscout/android/upload/MedtronicSensorRecord.java
similarity index 85%
rename from app/src/main/java/com/nightscout/android/upload/MedtronicSensorRecord.java
rename to app/src/main/java/info/nightscout/android/upload/MedtronicSensorRecord.java
index d933a6f1f3800c51e1540d31de41b4f9716134f7..29d5546631ea597184df2b278187ad4b1d272065 100644
--- a/app/src/main/java/com/nightscout/android/upload/MedtronicSensorRecord.java
+++ b/app/src/main/java/info/nightscout/android/upload/MedtronicSensorRecord.java
@@ -1,7 +1,7 @@
-package com.nightscout.android.upload;
+package info.nightscout.android.upload;
-import com.nightscout.android.dexcom.EGVRecord;
-import com.nightscout.android.medtronic.MedtronicConstants;
+import info.nightscout.android.dexcom.EGVRecord;
+import info.nightscout.android.medtronic.MedtronicConstants;
public class MedtronicSensorRecord extends EGVRecord {
/**
diff --git a/app/src/main/java/com/nightscout/android/upload/Record.java b/app/src/main/java/info/nightscout/android/upload/Record.java
similarity index 87%
rename from app/src/main/java/com/nightscout/android/upload/Record.java
rename to app/src/main/java/info/nightscout/android/upload/Record.java
index e2d70b79ebf966be54b4d85ec556ab6babe5ee0b..61a75faa79a09054a50215cc01f52a65972abb9c 100644
--- a/app/src/main/java/com/nightscout/android/upload/Record.java
+++ b/app/src/main/java/info/nightscout/android/upload/Record.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.upload;
+package info.nightscout.android.upload;
import java.io.Serializable;
diff --git a/app/src/main/java/com/nightscout/android/upload/UploadHelper.java b/app/src/main/java/info/nightscout/android/upload/UploadHelper.java
similarity index 97%
rename from app/src/main/java/com/nightscout/android/upload/UploadHelper.java
rename to app/src/main/java/info/nightscout/android/upload/UploadHelper.java
index dea8d9657c5adaf38c6f6b31cc0ecb89a8a85077..13505eaf6a6acf225b542a52c6626d1f307d02ee 100644
--- a/app/src/main/java/com/nightscout/android/upload/UploadHelper.java
+++ b/app/src/main/java/info/nightscout/android/upload/UploadHelper.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.upload;
+package info.nightscout.android.upload;
import android.content.Context;
import android.content.SharedPreferences;
@@ -18,11 +18,11 @@ import com.mongodb.ServerAddress;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.MongoDatabase;
-import com.nightscout.android.dexcom.DexcomG4Activity;
-import com.nightscout.android.dexcom.EGVRecord;
-import com.nightscout.android.medtronic.MedtronicConstants;
-import com.nightscout.android.medtronic.MedtronicReader;
-import com.nightscout.android.upload.MedtronicNG.CGMRecord;
+import info.nightscout.android.medtronic.Medtronic640gActivity;
+import info.nightscout.android.dexcom.EGVRecord;
+import info.nightscout.android.medtronic.MedtronicConstants;
+import info.nightscout.android.medtronic.MedtronicReader;
+import info.nightscout.android.upload.MedtronicNG.CGMRecord;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
@@ -72,7 +72,7 @@ public class UploadHelper extends AsyncTask<Record, Integer, Long> {
private static final int CONNECTION_TIMEOUT = 30 * 1000;
Context context;
- private int cgmSelected = DexcomG4Activity.DEXCOMG4;
+ private int cgmSelected = Medtronic640gActivity.DEXCOMG4;
private ArrayList<Messenger> mClients;
private List<JSONObject> recordsNotUploadedList = new ArrayList<JSONObject>();
private List<JSONObject> recordsNotUploadedListJson = new ArrayList<JSONObject>();
@@ -90,7 +90,7 @@ public class UploadHelper extends AsyncTask<Record, Integer, Long> {
public static Object isModifyingRecordsLock = new Object();
private MongoClient client = null;
public UploadHelper(Context context) {
- this(context, DexcomG4Activity.DEXCOMG4);
+ this(context, Medtronic640gActivity.DEXCOMG4);
}
public UploadHelper(Context context, int cgmSelected) {
@@ -342,7 +342,7 @@ public class UploadHelper extends AsyncTask<Record, Integer, Long> {
*/
private String getSelectedDeviceName(){
switch (cgmSelected){
- case DexcomG4Activity.MEDTRONIC_CGM:
+ case Medtronic640gActivity.MEDTRONIC_CGM:
return "Medtronic_CGM";
default:
return "dexcom";
@@ -671,19 +671,19 @@ public class UploadHelper extends AsyncTask<Record, Integer, Long> {
log.info("devicestatusURL: " + devicestatusURL);
JSONObject json = new JSONObject();
- json.put("uploaderBattery", DexcomG4Activity.batLevel);
- json.put("device", DexcomG4Activity.pumpStatusRecord.getDeviceName() );
+ json.put("uploaderBattery", Medtronic640gActivity.batLevel);
+ json.put("device", Medtronic640gActivity.pumpStatusRecord.getDeviceName() );
JSONObject pumpInfo = new JSONObject();
- pumpInfo.put( "clock", DexcomG4Activity.pumpStatusRecord.pumpDate );
- pumpInfo.put( "reservoir", DexcomG4Activity.pumpStatusRecord.reservoirAmount);
+ pumpInfo.put( "clock", Medtronic640gActivity.pumpStatusRecord.pumpDate );
+ pumpInfo.put( "reservoir", Medtronic640gActivity.pumpStatusRecord.reservoirAmount);
JSONObject iob = new JSONObject();
- iob.put( "timestamp", DexcomG4Activity.pumpStatusRecord.pumpDate );
- iob.put( "bolusiob", DexcomG4Activity.pumpStatusRecord.activeInsulin );
+ iob.put( "timestamp", Medtronic640gActivity.pumpStatusRecord.pumpDate );
+ iob.put( "bolusiob", Medtronic640gActivity.pumpStatusRecord.activeInsulin );
JSONObject battery = new JSONObject();
- battery.put( "percent", DexcomG4Activity.pumpStatusRecord.batteryPercentage );
+ battery.put( "percent", Medtronic640gActivity.pumpStatusRecord.batteryPercentage );
pumpInfo.put( "iob", iob );
pumpInfo.put( "battery", battery );
@@ -725,7 +725,7 @@ public class UploadHelper extends AsyncTask<Record, Integer, Long> {
json.put("device", getSelectedDeviceName());
json.put("sgv", Integer.parseInt(record.bGValue));
json.put("direction", record.trend);
- if (cgmSelected == DexcomG4Activity.MEDTRONIC_CGM && (oRecord instanceof MedtronicSensorRecord)){
+ if (cgmSelected == Medtronic640gActivity.MEDTRONIC_CGM && (oRecord instanceof MedtronicSensorRecord)){
json.put("isig", ((MedtronicSensorRecord)record).isig);
json.put("calibrationFactor", ((MedtronicSensorRecord)record).calibrationFactor);
json.put("calibrationStatus", ((MedtronicSensorRecord)record).calibrationStatus);
@@ -758,7 +758,7 @@ public class UploadHelper extends AsyncTask<Record, Integer, Long> {
json.put("device", getSelectedDeviceName());
json.put("sgv", Integer.parseInt(record.bGValue));
json.put("direction", record.trend);
- if (cgmSelected == DexcomG4Activity.MEDTRONIC_CGM && (oRecord instanceof MedtronicSensorRecord)){
+ if (cgmSelected == Medtronic640gActivity.MEDTRONIC_CGM && (oRecord instanceof MedtronicSensorRecord)){
json.put("isig", ((MedtronicSensorRecord)record).isig);
json.put("calibrationFactor", ((MedtronicSensorRecord)record).calibrationFactor);
json.put("calibrationStatus", ((MedtronicSensorRecord)record).calibrationStatus);
@@ -895,7 +895,7 @@ public class UploadHelper extends AsyncTask<Record, Integer, Long> {
testData.put("type", "sgv");
testData.put("direction", record.trend);
typeSaved = 0;
- if (cgmSelected == DexcomG4Activity.MEDTRONIC_CGM && (oRecord instanceof MedtronicSensorRecord)){
+ if (cgmSelected == Medtronic640gActivity.MEDTRONIC_CGM && (oRecord instanceof MedtronicSensorRecord)){
typeSaved = 1;
testData.put("isig", ((MedtronicSensorRecord)record).isig);
testData.put("calibrationFactor", ((MedtronicSensorRecord)record).calibrationFactor);
@@ -1028,7 +1028,7 @@ public class UploadHelper extends AsyncTask<Record, Integer, Long> {
}
if (update){
JSONObject devicestatus = new JSONObject();
- devicestatus.put("uploaderBattery", DexcomG4Activity.batLevel);
+ devicestatus.put("uploaderBattery", Medtronic640gActivity.batLevel);
devicestatus.put("created_at", new Date());
log.debug("Update Battery");
doPostRequest(httpclient, dsCollectioncUrl, apiKey, devicestatus);
@@ -1218,7 +1218,7 @@ public class UploadHelper extends AsyncTask<Record, Integer, Long> {
testData.put("type", "sgv");
testData.put("direction", record.trend);
typeSaved = 0;
- if (cgmSelected == DexcomG4Activity.MEDTRONIC_CGM && (oRecord instanceof MedtronicSensorRecord)){
+ if (cgmSelected == Medtronic640gActivity.MEDTRONIC_CGM && (oRecord instanceof MedtronicSensorRecord)){
typeSaved = 1;
testData.put("isig", ((MedtronicSensorRecord)record).isig);
testData.put("calibrationFactor", ((MedtronicSensorRecord)record).calibrationFactor);
@@ -1355,7 +1355,7 @@ public class UploadHelper extends AsyncTask<Record, Integer, Long> {
testData.put("sgv", record.bGValue);
testData.put("direction", record.trend);
typeSaved = 0;
- if (cgmSelected == DexcomG4Activity.MEDTRONIC_CGM && (oRecord instanceof MedtronicSensorRecord)){
+ if (cgmSelected == Medtronic640gActivity.MEDTRONIC_CGM && (oRecord instanceof MedtronicSensorRecord)){
typeSaved = 1;
testData.put("isig", ((MedtronicSensorRecord)record).isig);
testData.put("calibrationFactor", ((MedtronicSensorRecord)record).calibrationFactor);
@@ -1425,7 +1425,7 @@ public class UploadHelper extends AsyncTask<Record, Integer, Long> {
}
if (update){
Document devicestatus = new Document();
- devicestatus.put("uploaderBattery", DexcomG4Activity.batLevel);
+ devicestatus.put("uploaderBattery", Medtronic640gActivity.batLevel);
devicestatus.put("created_at", new Date());
log.debug("Update Battery");
dsCollection.insertOne(devicestatus);
diff --git a/app/src/main/java/com/nightscout/android/utils/CustomSwitchPreference.java b/app/src/main/java/info/nightscout/android/utils/CustomSwitchPreference.java
similarity index 98%
rename from app/src/main/java/com/nightscout/android/utils/CustomSwitchPreference.java
rename to app/src/main/java/info/nightscout/android/utils/CustomSwitchPreference.java
index 6c91b958b9edb25f799829732b2d5b1c7e0aa6de..212dc112686ac7aa676884bd88a1a66d35337490 100644
--- a/app/src/main/java/com/nightscout/android/utils/CustomSwitchPreference.java
+++ b/app/src/main/java/info/nightscout/android/utils/CustomSwitchPreference.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.utils;
+package info.nightscout.android.utils;
import android.content.Context;
import android.preference.SwitchPreference;
diff --git a/app/src/main/java/com/nightscout/android/widget/CGMWidget.java b/app/src/main/java/info/nightscout/android/widget/CGMWidget.java
similarity index 89%
rename from app/src/main/java/com/nightscout/android/widget/CGMWidget.java
rename to app/src/main/java/info/nightscout/android/widget/CGMWidget.java
index 26f0ec299f6df4d75f0fba3736cd8c4f511f820b..f507ba907c8ca5647e428b872e8cd684b950b34c 100644
--- a/app/src/main/java/com/nightscout/android/widget/CGMWidget.java
+++ b/app/src/main/java/info/nightscout/android/widget/CGMWidget.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.widget;
+package info.nightscout.android.widget;
import java.io.File;
import java.io.FileInputStream;
@@ -6,22 +6,20 @@ import java.io.ObjectInputStream;
import java.util.Calendar;
import android.app.AlarmManager;
-import android.app.AlertDialog;
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProvider;
import android.content.Context;
-import android.content.DialogInterface;
import android.content.Intent;
import android.util.Log;
import android.widget.RemoteViews;
-import com.nightscout.android.R;
-import com.nightscout.android.dexcom.DexcomG4Activity;
-import com.nightscout.android.dexcom.EGVRecord;
-import com.nightscout.android.medtronic.MedtronicConstants;
-import com.nightscout.android.upload.MedtronicSensorRecord;
-import com.nightscout.android.upload.Record;
+import info.nightscout.android.R;
+import info.nightscout.android.medtronic.Medtronic640gActivity;
+import info.nightscout.android.dexcom.EGVRecord;
+import info.nightscout.android.medtronic.MedtronicConstants;
+import info.nightscout.android.upload.MedtronicSensorRecord;
+import info.nightscout.android.upload.Record;
public class CGMWidget extends AppWidgetProvider {
private PendingIntent service = null;
@@ -33,7 +31,7 @@ public class CGMWidget extends AppWidgetProvider {
int appWidgetId = appWidgetIds[i];
// Create an Intent to launch ExampleActivity
- Intent intent = new Intent(context, DexcomG4Activity.class);
+ Intent intent = new Intent(context, Medtronic640gActivity.class);
PendingIntent pendingIntent = PendingIntent.getActivity(context, 7, intent, 0);
// Get the layout for the App Widget and attach an on-click listener
diff --git a/app/src/main/java/com/nightscout/android/widget/CGMWidgetUpdater.java b/app/src/main/java/info/nightscout/android/widget/CGMWidgetUpdater.java
similarity index 89%
rename from app/src/main/java/com/nightscout/android/widget/CGMWidgetUpdater.java
rename to app/src/main/java/info/nightscout/android/widget/CGMWidgetUpdater.java
index 96f4fa9e5e8cf287a8584d35a60d50d3652118b9..0a480145591f14e82e34e1d7cf05207db4706116 100644
--- a/app/src/main/java/com/nightscout/android/widget/CGMWidgetUpdater.java
+++ b/app/src/main/java/info/nightscout/android/widget/CGMWidgetUpdater.java
@@ -1,4 +1,4 @@
-package com.nightscout.android.widget;
+package info.nightscout.android.widget;
import java.io.File;
import java.io.FileInputStream;
@@ -17,12 +17,12 @@ import android.preference.PreferenceManager;
import android.util.Log;
import android.widget.RemoteViews;
-import com.nightscout.android.R;
-import com.nightscout.android.dexcom.DexcomG4Activity;
-import com.nightscout.android.dexcom.EGVRecord;
-import com.nightscout.android.medtronic.MedtronicConstants;
-import com.nightscout.android.upload.MedtronicSensorRecord;
-import com.nightscout.android.upload.Record;
+import info.nightscout.android.R;
+import info.nightscout.android.medtronic.Medtronic640gActivity;
+import info.nightscout.android.dexcom.EGVRecord;
+import info.nightscout.android.medtronic.MedtronicConstants;
+import info.nightscout.android.upload.MedtronicSensorRecord;
+import info.nightscout.android.upload.Record;
public class CGMWidgetUpdater extends Service{
@@ -50,7 +50,7 @@ public class CGMWidgetUpdater extends Service{
views = new RemoteViews(getPackageName(), R.layout.widget_lock);
} else {
views = new RemoteViews(getPackageName(), R.layout.widget_main);
- Intent intent = new Intent(getBaseContext(), DexcomG4Activity.class);
+ Intent intent = new Intent(getBaseContext(), Medtronic640gActivity.class);
PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), 7, intent, 0);
views.setOnClickPendingIntent(R.id.imageButton1, pendingIntent);
}
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 25dbb59e48bc3f94831edc6b3553fe3c956c7492..16cf2903673b38717731820c20f7d201f1f3c36d 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -8,7 +8,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
- tools:context="com.nightscout.android.dexcom.LoginActivity">
+ tools:context=".medtronic.GetHmacAndKeyActivity">
<!-- Login progress -->
<ProgressBar
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6f17cf6ad1f85d0a425924d003652605baafbdb6..5778ccea140a8f442c59838308ad7929fab43729 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="Monitor">
- <com.nightscout.android.utils.CustomSwitchPreference
+ <info.nightscout.android.utils.CustomSwitchPreference
android:title="mmol/l"
android:key="mmolxl"
android:disableDependentsState="false"
@@ -9,8 +9,8 @@
android:switchTextOff="mg/dl"
android:summaryOn="mmol/l. Values are shown and set in mmol/l"
android:summaryOff="mg/dl. Values are shown and set in mg/dl">
- </com.nightscout.android.utils.CustomSwitchPreference>
- <com.nightscout.android.utils.CustomSwitchPreference
+ </info.nightscout.android.utils.CustomSwitchPreference>
+ <info.nightscout.android.utils.CustomSwitchPreference
android:title="mmol/l decimals"
android:key="mmolDecimals"
android:dependency = "mmolxl"
@@ -19,15 +19,15 @@
android:switchTextOff="1"
android:summaryOn="Activated. 2 Decimal values will be shown ."
android:summaryOff="Deactivated. 1 Decimal value will be shown .">
- </com.nightscout.android.utils.CustomSwitchPreference>
+ </info.nightscout.android.utils.CustomSwitchPreference>
</PreferenceCategory>
<PreferenceCategory android:title="Sharing">
- <com.nightscout.android.utils.CustomSwitchPreference
+ <info.nightscout.android.utils.CustomSwitchPreference
android:title="REST API Upload"
android:key="EnableRESTUpload"
android:disableDependentsState="false"
android:summary="Enable upload of BGL data to Nightscout">
- </com.nightscout.android.utils.CustomSwitchPreference>
+ </info.nightscout.android.utils.CustomSwitchPreference>
<EditTextPreference
android:dependency="EnableRESTUpload"
android:title="API Base URL"
@@ -36,7 +36,7 @@
android:defaultValue="http://{YOUR-API-SERVER}/api"
android:dialogMessage="This only the base URL, the uploader will automatically append /entries for the POST of CGM data and /gdentries for the POST of glucometer data values">
</EditTextPreference>
- <com.nightscout.android.utils.CustomSwitchPreference
+ <info.nightscout.android.utils.CustomSwitchPreference
android:title="Wifi Hack"
android:key="EnableWifiHack"
android:disableDependentsState="false"
@@ -44,10 +44,10 @@
android:summaryOn="Wifi will be disabled if there is a timeout (poor wifi signal/access point), this will allow mobile data to be used instead"
android:summaryOff="The uploader won't try to disable Wifi even if there is a timeout"
>
- </com.nightscout.android.utils.CustomSwitchPreference>
+ </info.nightscout.android.utils.CustomSwitchPreference>
</PreferenceCategory>
<PreferenceCategory android:title="Disclaimer">
- <com.nightscout.android.utils.CustomSwitchPreference
+ <info.nightscout.android.utils.CustomSwitchPreference
android:title="I UNDERSTAND"
android:key="IUNDERSTAND"
android:disableDependentsState="false"
@@ -55,7 +55,7 @@
android:switchTextOff="NO"
android:summaryOn="Activated. Nightscout should not be used to make medical decisions. There is no support or any warranty of any kind. The quality and performance of the project is with you. This is a project that was created and is supported completely by volunteers"
android:summaryOff="Deactivated. Nightscout should not be used to make medical decisions. There is no support or any warranty of any kind. The quality and performance of the project is with you. This is a project that was created and is supported completely by volunteers">
- </com.nightscout.android.utils.CustomSwitchPreference>
+ </info.nightscout.android.utils.CustomSwitchPreference>
<Preference
android:key="version"
android:title="@string/version" />