diff --git a/.idea/.name b/.idea/.name
index 16ab592f5ca311144e4e8ba65ade3623e0ce5044..5c650700e9b66f0c1d66c75d3390011727f4810c 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-MedtronicUploader
\ No newline at end of file
+Medtronic640gUploader
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2ab1e27fe5ea65d84061efef84c22ecf1f2170ae..58992cc7d25da1b1baf026a67b2d18321f3082a7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,6 @@
<option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" />
- <option name="gradleJvm" value="1.8" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 45c8774f7df8f10c479c8ef6b7570caba9a0d4b4..0000000000000000000000000000000000000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="InspectionProjectProfileManager">
- <profile version="1.0">
- <option name="myName" value="Project Default" />
- <inspection_tool class="AndroidLintRtlHardcoded" enabled="false" level="WARNING" enabled_by_default="false" />
- <inspection_tool class="AndroidLintUselessParent" enabled="false" level="WARNING" enabled_by_default="false" />
- <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
- <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
- <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
- </inspection_tool>
- </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b312839bf2e939fea3ebdef15630a4b33e57caf..0000000000000000000000000000000000000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
- <settings>
- <option name="PROJECT_PROFILE" value="Project Default" />
- <option name="USE_PROJECT_PROFILE" value="true" />
- <version value="1.0" />
- </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/appcompat_v7_21_0_3.xml b/.idea/libraries/appcompat_v7_21_0_3.xml
index 52ea574e89cf839e9ed2760007ab7219830ba164..3139fdd38024854d25f4a58894601a1ee8e740b2 100644
--- a/.idea/libraries/appcompat_v7_21_0_3.xml
+++ b/.idea/libraries/appcompat_v7_21_0_3.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="appcompat-v7-21.0.3">
<CLASSES>
- <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/jars/classes.jar!/" />
+ <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/support_v4_21_0_3.xml b/.idea/libraries/support_v4_21_0_3.xml
index 064682a5d37ef40677a278bf6451f8faaf831377..177d8fd0e9fae145d8b114e0a137b57187b6497c 100644
--- a/.idea/libraries/support_v4_21_0_3.xml
+++ b/.idea/libraries/support_v4_21_0_3.xml
@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="support-v4-21.0.3">
<CLASSES>
+ <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/classes.jar!/" />
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/res" />
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/libs/internal_impl-21.0.3.jar!/" />
- <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb68289f4352bf149aa31a2c9940faa99174224..5d19981032aa01b060f5a568641d7a8840cc90dc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 074653b092962ebc128a63da7ea8e79c849037ef..49852060b7acfb7b360cd7f6c8a09e9505350860 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/MedtronicUploader.iml" filepath="$PROJECT_DIR$/MedtronicUploader.iml" />
+ <module fileurl="file://$PROJECT_DIR$/Medtronic640gUploader.iml" filepath="$PROJECT_DIR$/Medtronic640gUploader.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 51b1b8bed761cee6de041dfcd4832514297c577c..62e12966ddbf739cc87659a8ed6ad548c5c7c17a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,74 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="AnalysisUIOptions">
- <option name="SCOPE_TYPE" value="3" />
- </component>
- <component name="AndroidConfiguredLogFilters">
- <filters>
- <filter>
- <option name="logLevel" value="verbose" />
- <option name="logMessagePattern" value="" />
- <option name="logTagPattern" value="" />
- <option name="name" value="Nightscout" />
- <option name="packageNamePattern" value="" />
- <option name="pid" value="4336" />
- </filter>
- </filters>
- </component>
- <component name="AndroidLayouts">
- <shared>
- <config>
- <target>android-19</target>
- </config>
- </shared>
- <layouts>
- <layout url="file://$PROJECT_DIR$/.idea/misc.xml">
- <config>
- <theme>@style/AppBaseTheme</theme>
- </config>
- </layout>
- <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/adb.xml">
- <config>
- <theme>@android:style/Theme.DeviceDefault</theme>
- </config>
- </layout>
- </layouts>
- </component>
- <component name="AndroidLogFilters">
- <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
- </component>
<component name="ChangeListManager">
- <list default="true" id="73c0df16-fbb3-4a39-b542-4a9ed61c734a" name="Default" comment="Commit working version of Uploader before refactoring messages to be "classier".">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/appcompat_v7_21_0_3.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/commons_lang3_3_4.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/support_annotations_21_0_3.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/support_v4_21_0_3.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/LoginActivity.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigContract.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigDbHelper.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ReadInfoResponseMessage.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
+ <list default="true" id="ffce6e62-d498-4e17-b121-42833fbda3f5" name="Default" comment="">
+ <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.name" afterPath="$PROJECT_DIR$/.idea/.name" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/gradle.xml" afterPath="$PROJECT_DIR$/.idea/gradle.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/appcompat_v7_21_0_3.xml" afterPath="$PROJECT_DIR$/.idea/libraries/appcompat_v7_21_0_3.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/support_v4_21_0_3.xml" afterPath="$PROJECT_DIR$/.idea/libraries/support_v4_21_0_3.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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/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/MedtronicCNLSession.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLSession.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/res/layout/adb.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/adb.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/menu/menu.xml" afterPath="$PROJECT_DIR$/app/src/main/res/menu/menu.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values-v11/styles.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values-v11/styles.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values-v14/styles.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values-v14/styles.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" afterPath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" />
</list>
- <ignored path="MedtronicUploader.iws" />
+ <ignored path="Medtronic640gUploader.iws" />
<ignored path=".idea/workspace.xml" />
- <ignored path="$PROJECT_DIR$/build/classes/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -81,35 +28,16 @@
<option name="PATCH_PATH" value="" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
- <component name="ExternalProjectsManager">
- <system id="GRADLE">
- <state>
- <projects_view />
- </state>
- </system>
- </component>
<component name="FavoritesManager">
- <favorites_list name="MedtronicUploader" />
+ <favorites_list name="Medtronic640gUploader" />
</component>
<component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="DexcomG4Activity.java" pinned="false" current-in-tab="false">
+ <leaf>
+ <file leaf-file-name="DexcomG4Activity.java" pinned="false" current-in-tab="true">
<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="0.0">
- <caret line="382" column="34" selection-start-line="382" selection-start-column="34" selection-end-line="382" selection-end-column="34" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="MedtronicCNLService.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.6199095">
- <caret line="147" column="0" selection-start-line="147" selection-start-column="0" selection-end-line="147" selection-end-column="0" />
+ <state vertical-scroll-proportion="0.11312217">
+ <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
<folding />
</state>
</provider>
@@ -119,7 +47,7 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="185" column="9" selection-start-line="185" selection-start-column="9" selection-end-line="185" selection-end-column="9" />
+ <caret line="43" column="13" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
<folding />
</state>
</provider>
@@ -127,15 +55,6 @@
</file>
</leaf>
</component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="Interface" />
- <option value="valueResourceFile" />
- <option value="Class" />
- </list>
- </option>
- </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
@@ -145,7 +64,7 @@
<entry>
<key>
<ExternalProjectPojo>
- <option name="name" value="MedtronicUploader" />
+ <option name="name" value="Medtronic640gUploader" />
<option name="path" value="$PROJECT_DIR$" />
</ExternalProjectPojo>
</key>
@@ -156,7 +75,7 @@
<option name="path" value="$PROJECT_DIR$/app" />
</ExternalProjectPojo>
<ExternalProjectPojo>
- <option name="name" value="MedtronicUploader" />
+ <option name="name" value="Medtronic640gUploader" />
<option name="path" value="$PROJECT_DIR$" />
</ExternalProjectPojo>
</list>
@@ -170,22 +89,22 @@
<value>
<list>
<ExternalTaskPojo>
- <option name="description" value="Displays all buildscript dependencies declared in root project 'MedtronicUploader'." />
+ <option name="description" value="Displays all buildscript dependencies declared in root project 'Medtronic640gUploader'." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="buildEnvironment" />
</ExternalTaskPojo>
<ExternalTaskPojo>
- <option name="description" value="Displays the components produced by root project 'MedtronicUploader'. [incubating]" />
+ <option name="description" value="Displays the components produced by root project 'Medtronic640gUploader'. [incubating]" />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="components" />
</ExternalTaskPojo>
<ExternalTaskPojo>
- <option name="description" value="Displays all dependencies declared in root project 'MedtronicUploader'." />
+ <option name="description" value="Displays all dependencies declared in root project 'Medtronic640gUploader'." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="dependencies" />
</ExternalTaskPojo>
<ExternalTaskPojo>
- <option name="description" value="Displays the insight into a specific dependency in root project 'MedtronicUploader'." />
+ <option name="description" value="Displays the insight into a specific dependency in root project 'Medtronic640gUploader'." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="dependencyInsight" />
</ExternalTaskPojo>
@@ -200,22 +119,22 @@
<option name="name" value="init" />
</ExternalTaskPojo>
<ExternalTaskPojo>
- <option name="description" value="Displays the configuration model of root project 'MedtronicUploader'. [incubating]" />
+ <option name="description" value="Displays the configuration model of root project 'Medtronic640gUploader'. [incubating]" />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="model" />
</ExternalTaskPojo>
<ExternalTaskPojo>
- <option name="description" value="Displays the sub-projects of root project 'MedtronicUploader'." />
+ <option name="description" value="Displays the sub-projects of root project 'Medtronic640gUploader'." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="projects" />
</ExternalTaskPojo>
<ExternalTaskPojo>
- <option name="description" value="Displays the properties of root project 'MedtronicUploader'." />
+ <option name="description" value="Displays the properties of root project 'Medtronic640gUploader'." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="properties" />
</ExternalTaskPojo>
<ExternalTaskPojo>
- <option name="description" value="Displays the tasks runnable from root project 'MedtronicUploader' (some of the displayed tasks may belong to subprojects)." />
+ <option name="description" value="Displays the tasks runnable from root project 'Medtronic640gUploader' (some of the displayed tasks may belong to subprojects)." />
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
<option name="name" value="tasks" />
</ExternalTaskPojo>
@@ -1708,94 +1627,11 @@
<projects_view />
</option>
</component>
- <component name="IdeDocumentHistory">
- <option name="CHANGED_PATHS">
- <list>
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/USB/UsbHidDriver.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/TestService.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/service/AbstractService.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/service/ServiceManager.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/USB/UsbDriver.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/Message.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ChecksumException.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/BayerBinaryMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/BayerBinaryMessageHandler.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/BaseMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MessageHandler.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkMessageHandler.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkCommandMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkBinaryMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ChannelNegotiateMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/EncryptionException.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/BeginEHSMMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/PumpTimeRequestMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/PumpTimeResponseMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/EGVRecord.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/PumpStatusRequestMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/PumpStatusResponseMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicSendMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/EndEHSMMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicReceiveMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/UnexpectedMessageException.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/Medtronic640gPumpRecord.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/UploadHelper.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/settings/SettingsFragment.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/eula/Eula.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/adb.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/values-v11/styles.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/values-v21/styles.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/values-v14/styles.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/menu/menu.xml" />
- <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigContract.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/DexcomG4Activity.java" />
- <option value="$PROJECT_DIR$/app/build.gradle" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigDbHelper.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/LoginActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MessageUtils.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ReadInfoResponseMessage.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLSession.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java" />
- </list>
- </option>
- </component>
- <component name="MavenImportPreferences">
- <option name="generalSettings">
- <MavenGeneralSettings>
- <option name="mavenHome" value="Bundled (Maven 3)" />
- </MavenGeneralSettings>
- </option>
- </component>
<component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="width" value="1400" />
<option name="height" value="807" />
</component>
- <component name="ProjectInspectionProfilesVisibleTreeState">
- <entry key="Project Default">
- <profile-state>
- <expanded-state>
- <State>
- <id />
- </State>
- <State>
- <id>Android > Lint > Correctness</id>
- </State>
- </expanded-state>
- <selected-state>
- <State>
- <id>AndroidLintSimpleDateFormat</id>
- </State>
- </selected-state>
- </profile-state>
- </entry>
- </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
@@ -1821,70 +1657,54 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="ProjectPane" />
<pane id="AndroidView">
<subPane>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="MedtronicUploader" />
+ <option name="myItemId" value="Medtronic640gUploader" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Medtronic640gUploader" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="Gradle Scripts" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidBuildScriptsGroupNode" />
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="MedtronicUploader" />
+ <option name="myItemId" value="Medtronic640gUploader" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <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>
</subPane>
</pane>
- <pane id="Scope" />
<pane id="PackagesPane" />
+ <pane id="Scope" />
<pane id="Scratches" />
+ <pane id="ProjectPane" />
</panes>
</component>
<component name="PropertiesComponent">
- <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+ <property name="settings.editor.selected.configurable" value="android.sdk-updates" />
<property name="settings.editor.splitter.proportion" value="0.2" />
- <property name="recentsLimit" value="5" />
- <property name="android.project.structure.last.selected" value="Project" />
- <property name="android.project.structure.proportion" value="0.15" />
- <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="d1cd921" />
- <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="Nexus_5_API_23_x86" />
- <property name="restartRequiresConfirmation" value="true" />
- <property name="SearchEverywhereHistoryKey" value="messageu	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/java/com/nightscout/android/medtronic/message/MessageUtils.java adb	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/res/layout/adb.xml string	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/res/values/strings.xml 640g	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/java/com/nightscout/android/upload/Medtronic640gPumpRecord.java e	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/java/com/nightscout/android/dexcom/EGVRecord.java egv	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/java/com/nightscout/android/dexcom/EGVRecord.java medtronicme	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/java/com/nightscout/android/medtronic/message/MedtronicMessage.java chann	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/java/com/nightscout/android/medtronic/message/ChannelNegotiateMessage.java binary	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkBinaryMessage.java nego	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/java/com/nightscout/android/medtronic/message/ChannelNegotiateMessage.java commandme	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkCommandMessage.java contourne	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkMessage.java con	FILE	file:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkMessage.java" />
- <property name="last_opened_file_path" value="$USER_HOME$/Desktop" />
- <property name="device.picker.selection" value="192.168.0.115:5555" />
- </component>
- <component name="RecentsManager">
- <key name="CreateClassDialog.RecentsKey">
- <recent name="com.nightscout.android.medtronic.message" />
- </key>
- <key name="android.template.packageName">
- <recent name="com.nightscout.android.dexcom" />
- <recent name="values-v21" />
- </key>
- <key name="IntroduceConstantDialog.RECENTS_KEY">
- <recent name="com.nightscout.android.medtronic.MedtronicCNLReader" />
- </key>
- <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
- <recent name="com.nightscout.android.medtronic.data" />
- <recent name="com.nightscout.android.USB" />
- <recent name="com.nightscout.android.medtronic.service" />
- <recent name="com.nightscout.android" />
- </key>
- <key name="CopyClassDialog.RECENTS_KEY">
- <recent name="com.nightscout.android.medtronic.message" />
- <recent name="com.nightscout.android.USB" />
- <recent name="com.nightscout.android.medtronic" />
- </key>
- <key name="android.template.parentActivityClass">
- <recent name="" />
- </key>
+ <property name="SearchEverywhereHistoryKey" value="g4	PSI	JAVA://com.nightscout.android.dexcom.DexcomG4Activity cnlread	PSI	JAVA://com.nightscout.android.medtronic.MedtronicCNLReader" />
</component>
<component name="RunManager" selected="Android Application.app">
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
@@ -1921,39 +1741,6 @@
<option name="ACTIVITY_CLASS" value="" />
<method />
</configuration>
- <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
- <module name="" />
- <option name="TESTING_TYPE" value="0" />
- <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
- <option name="METHOD_NAME" value="" />
- <option name="CLASS_NAME" value="" />
- <option name="PACKAGE_NAME" value="" />
- <option name="EXTRA_OPTIONS" value="" />
- <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
- <option name="PREFERRED_AVD" value="" />
- <option name="CLEAR_LOGCAT" value="false" />
- <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
- <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
- <option name="FORCE_STOP_RUNNING_APP" value="true" />
- <option name="DEBUGGER_TYPE" value="Java" />
- <option name="USE_LAST_SELECTED_DEVICE" value="false" />
- <option name="PREFERRED_AVD" value="" />
- <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
- <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
- <Native>
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- </Native>
- <Java />
- <Hybrid>
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- </Hybrid>
- <Profilers>
- <option name="GAPID_DISABLE_PCS" value="false" />
- </Profilers>
- <method />
- </configuration>
<configuration default="true" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" />
@@ -1993,48 +1780,6 @@
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
</method>
</configuration>
- <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <envs />
- <patterns />
- <method />
- </configuration>
- <configuration default="true" type="JarApplication" factoryName="JAR Application">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="SCRATCH_FILE_ID" value="0" />
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="" />
- <envs />
- <method />
- </configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -2056,35 +1801,7 @@
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="OUTPUT_DIRECTORY" />
- <option name="ANNOTATION_TYPE" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <option name="USE_DEFAULT_REPORTERS" value="false" />
- <option name="PROPERTIES_FILE" />
- <envs />
- <properties />
- <listeners />
- <method />
- </configuration>
- <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
+ <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="OUTPUT_DIRECTORY" />
<option name="ANNOTATION_TYPE" />
<option name="ENV_VARIABLES" />
@@ -2099,7 +1816,7 @@
<listeners />
<method />
</configuration>
- <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android Application" activateToolWindowBeforeRun="false">
+ <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android Application">
<module name="app" />
<option name="DEPLOY" value="true" />
<option name="ARTIFACT_NAME" value="" />
@@ -2113,40 +1830,6 @@
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
<option name="FORCE_STOP_RUNNING_APP" value="true" />
<option name="DEBUGGER_TYPE" value="Java" />
- <option name="USE_LAST_SELECTED_DEVICE" value="true" />
- <option name="PREFERRED_AVD" value="" />
- <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
- <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
- <Native>
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- </Native>
- <Java />
- <Hybrid>
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- </Hybrid>
- <Profilers>
- <option name="GAPID_DISABLE_PCS" value="false" />
- </Profilers>
- <option name="DEEP_LINK" value="" />
- <option name="ACTIVITY_CLASS" value="" />
- <method />
- </configuration>
- <configuration default="false" name="LoginActivity" type="AndroidRunConfigurationType" factoryName="Android Application" activateToolWindowBeforeRun="false">
- <module name="app" />
- <option name="DEPLOY" value="true" />
- <option name="ARTIFACT_NAME" value="" />
- <option name="PM_INSTALL_OPTIONS" value="" />
- <option name="ACTIVITY_EXTRA_FLAGS" value="" />
- <option name="MODE" value="specific_activity" />
- <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
- <option name="PREFERRED_AVD" value="" />
- <option name="CLEAR_LOGCAT" value="false" />
- <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
- <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
- <option name="FORCE_STOP_RUNNING_APP" value="true" />
- <option name="DEBUGGER_TYPE" value="Java" />
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
<option name="PREFERRED_AVD" value="" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
@@ -2164,12 +1847,11 @@
<option name="GAPID_DISABLE_PCS" value="false" />
</Profilers>
<option name="DEEP_LINK" value="" />
- <option name="ACTIVITY_CLASS" value="com.nightscout.android.dexcom.LoginActivity" />
+ <option name="ACTIVITY_CLASS" value="" />
<method />
</configuration>
- <list size="2">
+ <list size="1">
<item index="0" class="java.lang.String" itemvalue="Android Application.app" />
- <item index="1" class="java.lang.String" itemvalue="Android Application.LoginActivity" />
</list>
<configuration name="<template>" type="Applet" default="true" selected="false">
<option name="MAIN_CLASS_NAME" />
@@ -2185,479 +1867,71 @@
</configuration>
</component>
<component name="ShelveChangesManager" show_recycled="false" />
- <component name="StructureViewFactory">
- <option name="ACTIVE_ACTIONS" value=",ALPHA_COMPARATOR" />
- </component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
- <changelist id="73c0df16-fbb3-4a39-b542-4a9ed61c734a" name="Default" comment="" />
- <created>1458694399637</created>
+ <changelist id="ffce6e62-d498-4e17-b121-42833fbda3f5" name="Default" comment="" />
+ <created>1462881899283</created>
<option name="number" value="Default" />
- <updated>1458694399637</updated>
- </task>
- <task id="LOCAL-00001" summary="Commit working version of Uploader before refactoring messages to be "classier".">
- <created>1458970961158</created>
- <option name="number" value="00001" />
- <option name="project" value="LOCAL" />
- <updated>1458970961158</updated>
+ <updated>1462881899283</updated>
</task>
- <option name="localTasksCounter" value="2" />
<servers />
</component>
- <component name="TodoView">
- <todo-panel id="selected-file">
- <is-autoscroll-to-source value="true" />
- </todo-panel>
- <todo-panel id="all">
- <are-packages-shown value="true" />
- <is-autoscroll-to-source value="true" />
- </todo-panel>
- </component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1400" height="807" extended-state="0" />
<editor active="true" />
<layout>
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32833582" sideWeight="0.4970545" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32833582" sideWeight="0.48821798" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2496318" sideWeight="0.50800914" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Palette	" 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="2" side_tool="false" content_ui="tabs" />
- <window_info id="Capture Analysis" 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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.70464766" sideWeight="0.52061856" order="7" side_tool="true" content_ui="tabs" />
- <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.748191" sideWeight="0.47938144" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298351" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32706222" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47178003" sideWeight="0.4867452" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Captures" 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="2" side_tool="false" content_ui="tabs" />
- <window_info id="Capture Tool" 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="2" side_tool="false" content_ui="tabs" />
- <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.49199083" order="0" side_tool="false" content_ui="combo" />
- <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="2" side_tool="true" 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.32850942" sideWeight="0.47864506" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" 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="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Palette	" 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="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Build Variants" 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="-1" side_tool="true" content_ui="tabs" />
+ <window_info id="Capture Analysis" 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="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Event Log" 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="-1" side_tool="true" content_ui="tabs" />
+ <window_info id="Android Monitor" 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="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" 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="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Terminal" 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="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Capture Tool" 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="-1" side_tool="false" content_ui="tabs" />
+ <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="-1" 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="-1" 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.5" order="0" 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="-1" 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.25" sideWeight="0.5" order="1" 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.4" sideWeight="0.5" order="3" side_tool="false" 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="-1" side_tool="true" 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="-1" side_tool="true" 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" />
- <window_info id="Application Servers" 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="false" content_ui="tabs" />
- <window_info id="Maven Projects" 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="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+ <window_info id="Find" 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="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3988006" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298969" sideWeight="0.5" order="3" 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.6049204" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
- <component name="UpdateCopyrightCheckinHandler">
- <option name="UPDATE_COPYRIGHT" value="true" />
- </component>
- <component name="Vcs.Log.UiProperties">
- <option name="RECENTLY_FILTERED_USER_GROUPS">
- <collection />
- </option>
- <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
- <collection />
- </option>
- </component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
- <component name="VcsManagerConfiguration">
- <option name="CHECK_CODE_CLEANUP_BEFORE_PROJECT_COMMIT" value="true" />
- <MESSAGE value="Commit working version of Uploader before refactoring messages to be "classier"." />
- <option name="LAST_COMMIT_MESSAGE" value="Commit working version of Uploader before refactoring messages to be "classier"." />
- <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
- <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
- <option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />
- </component>
<component name="XDebuggerManager">
- <breakpoint-manager>
- <breakpoints>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/service/MedtronicCNLService.java</url>
- <line>257</line>
- <properties />
- <option name="timeStamp" value="66" />
- </line-breakpoint>
- </breakpoints>
- <breakpoints-dialog>
- <breakpoints-dialog />
- </breakpoints-dialog>
- <option name="time" value="96" />
- </breakpoint-manager>
+ <breakpoint-manager />
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/settings/SettingsActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.28169015">
- <caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/settings/SettingsFragment.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.12254902">
- <caret line="22" column="46" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="52" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/USB/UsbDriver.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.25821596">
- <caret line="29" column="17" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/USB/HidBridge.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.18779343">
- <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/assets/EULA">
- <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" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/preferences.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.024390243">
- <caret line="1" column="0" selection-start-line="51" selection-start-column="29" selection-end-line="51" selection-end-column="40" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/device_filter.xml">
- <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" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/widget_main.xml">
- <provider 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" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/widget_lock.xml">
- <provider 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" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/example_appwidget_info.xml">
- <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" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values-w820dp/dimens.xml">
- <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" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values-v14/dimens.xml">
- <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" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/dimens.xml">
- <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" />
- </state>
- </provider>
- </entry>
- <entry file="android-dummy:///Users/lgoedhart/StudioProjects/MedtronicUploader//Theme Editor">
- <provider selected="true" editor-type-id="themeEditor">
- <state theme-name="AppBaseTheme" module-name="app" proportion="0.67" />
- </provider>
- </entry>
- <entry file="android-dummy:///Users/lgoedhart/StudioProjects/MedtronicUploader/app/Translations Editor">
- <provider selected="true" editor-type-id="string-resource-editor">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-xhdpi/ic_launcher.png">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-mdpi/ic_launcher.png">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-hdpi/ic_launcher.png">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-ldpi/icon36x36.png">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-hdpi/ic_action_warning.png">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values-v14/styles.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.17857143">
- <caret line="7" column="66" selection-start-line="7" selection-start-column="66" selection-end-line="7" selection-end-column="66" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values-v11/styles.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.15306123">
- <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values-v21/styles.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.07653061">
- <caret line="3" column="66" selection-start-line="3" selection-start-column="66" selection-end-line="3" selection-end-column="66" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/Medtronic640gPumpRecord.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.7183099">
- <caret line="100" column="29" selection-start-line="100" selection-start-column="29" selection-end-line="100" selection-end-column="29" />
- </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="2.4744897">
- <caret line="97" column="42" selection-start-line="97" selection-start-column="34" selection-end-line="97" selection-end-column="42" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/menu.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.19512194">
- <caret line="8" column="40" selection-start-line="8" selection-start-column="40" selection-end-line="8" selection-end-column="40" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/settings.gradle">
- <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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/local.properties">
- <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" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
- <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" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/eula/Eula.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-3.9629629">
- <caret line="72" column="23" selection-start-line="72" selection-start-column="18" selection-end-line="72" selection-end-column="23" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/upload/UploadHelper.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-7.851852">
- <caret line="477" column="64" selection-start-line="477" selection-start-column="54" selection-end-line="477" selection-end-column="64" />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/Library/Android/sdk/sources/android-21/android/content/res/Resources.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.33333334">
- <caret line="1405" column="0" selection-start-line="1405" selection-start-column="0" selection-end-line="1405" selection-end-column="0" />
- </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.7892157">
- <caret line="110" column="71" selection-start-line="110" selection-start-column="71" selection-end-line="110" selection-end-column="71" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adb.xml">
- <provider editor-type-id="text-editor">
- <state vertical-scroll-proportion="-3.75">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer">
- <state />
- </provider>
- </entry>
- <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.4/5fe28b9518e58819180a43a850fbc0dd24b7c050/commons-lang3-3.4.jar!/org/apache/commons/lang3/ArrayUtils.class">
- <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" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigContract.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.29411766">
- <caret line="13" column="44" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="44" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/build.gradle">
- <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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.47511312">
- <caret line="21" column="51" selection-start-line="21" selection-start-column="51" selection-end-line="21" selection-end-column="51" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/Library/Android/sdk/sources/android-21/android/os/AsyncTask.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.022624435">
- <caret line="295" column="0" selection-start-line="295" selection-start-column="0" selection-end-line="295" selection-end-column="0" />
- </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="0.0">
- <caret line="382" column="34" selection-start-line="382" selection-start-column="34" selection-end-line="382" selection-end-column="34" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml">
- <provider editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.0">
- <caret line="0" column="42" selection-start-line="0" selection-start-column="40" selection-end-line="0" selection-end-column="42" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/USB/UsbHidDriver.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5233786">
- <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/MessageUtils.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.77375567">
- <caret line="47" column="45" selection-start-line="47" selection-start-column="45" selection-end-line="47" selection-end-column="45" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/dexcom/LoginActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="266" column="50" selection-start-line="266" selection-start-column="50" selection-end-line="266" selection-end-column="50" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ReadInfoResponseMessage.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.18099548">
- <caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/PumpTimeResponseMessage.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.4524887">
- <caret line="23" column="1" selection-start-line="10" selection-start-column="37" selection-end-line="23" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/message/ContourNextLinkBinaryMessage.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.33333334">
- <caret line="23" column="8" selection-start-line="23" selection-start-column="8" selection-end-line="23" selection-end-column="8" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/data/CNLConfigDbHelper.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.34633029">
- <caret line="87" column="113" selection-start-line="87" selection-start-column="26" selection-end-line="87" selection-end-column="113" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="185" column="9" selection-start-line="185" selection-start-column="9" selection-end-line="185" selection-end-column="9" />
+ <caret line="43" column="13" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLSession.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.22624435">
- <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
- <folding>
- <element signature="e#1552#1553#0" expanded="true" />
- <element signature="e#1584#1585#0" expanded="true" />
- <element signature="e#1624#1625#0" expanded="true" />
- <element signature="e#1654#1655#0" expanded="true" />
- </folding>
- </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/com/nightscout/android/dexcom/DexcomG4Activity.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.6199095">
- <caret line="147" column="0" selection-start-line="147" selection-start-column="0" selection-end-line="147" selection-end-column="0" />
+ <state vertical-scroll-proportion="0.11312217">
+ <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
<folding />
</state>
</provider>
diff --git a/Medtronic640gUploader.iml b/Medtronic640gUploader.iml
new file mode 100644
index 0000000000000000000000000000000000000000..ecac07ef6afaa43b593e91b76dc0d42d8c2200f5
--- /dev/null
+++ b/Medtronic640gUploader.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="Medtronic640gUploader" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="java-gradle" name="Java-Gradle">
+ <configuration>
+ <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+ <option name="BUILDABLE" value="false" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 2ffd9f0ef19eb21d225e2041fc33a91039c2434c..7af68e6da0376e46710f5c5bfa91c6df3520e2ea 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MedtronicUploader" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Medtronic640gUploader" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
index fba8db89fe63019a522cb871f7d4ffd430d79e79..f575b601a1fddf4025a71a42bd4692e3928e95c5 100644
--- a/build/intermediates/dex-cache/cache.xml
+++ b/build/intermediates/dex-cache/cache.xml
@@ -1,2 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
-<items version="2" />
+<items version="2" >
+
+ <item
+ jar="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/libs/physicaloidlibrary.jar"
+ jumboMode="false"
+ revision="23.0.1"
+ sha1="391534fe92fec965996d9aaf3a328b5f0c2b0740">
+ <dex dex="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/build/intermediates/pre-dexed/debug/physicaloidlibrary_ba6669aea876d7502a5b698d14800ea8d95cf339.jar" />
+ </item>
+ <item
+ jar="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/libs/mongo-java-driver-3.0.2.jar"
+ jumboMode="false"
+ revision="23.0.1"
+ sha1="7d3880dec6c8a2f07c1f544776c326834b513712">
+ <dex dex="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/build/intermediates/pre-dexed/debug/mongo-java-driver-3.0.2_d5ecf0146aebdccc94687d9f08b62a3c7e737f5b.jar" />
+ </item>
+ <item
+ jar="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/jars/classes.jar"
+ jumboMode="false"
+ revision="23.0.1"
+ sha1="81d42bf983a8741f4888a6e333e454e4a5e0eeb7">
+ <dex dex="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/build/intermediates/pre-dexed/debug/com.android.support-appcompat-v7-21.0.3_21134420c5846cc0d2d179a2014ddcabb03fb4b0.jar" />
+ </item>
+ <item
+ jar="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/libs/internal_impl-21.0.3.jar"
+ jumboMode="false"
+ revision="23.0.1"
+ sha1="01ec05bfbafcc07646ba813000bf2ef11742dd03">
+ <dex dex="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/build/intermediates/pre-dexed/debug/internal_impl-21.0.3_43796b4a0d623417de5114d9e7177a65c2106f8e.jar" />
+ </item>
+ <item
+ jar="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/libs/slf4j-api-1.7.2.jar"
+ jumboMode="false"
+ revision="23.0.1"
+ sha1="0081d61b7f33ebeab314e07de0cc596f8e858d97">
+ <dex dex="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/build/intermediates/pre-dexed/debug/slf4j-api-1.7.2_f582621c2cde1f38567941eaf1da589d457ffebd.jar" />
+ </item>
+ <item
+ jar="/Users/lgoedhart/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3.jar"
+ jumboMode="false"
+ revision="23.0.1"
+ sha1="4b74cefe1f0c1b819e7260c8627a14674e37fd35">
+ <dex dex="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/build/intermediates/pre-dexed/debug/support-annotations-21.0.3_a445ce2925b3697fd529404c528857502e2eb740.jar" />
+ </item>
+ <item
+ jar="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/classes.jar"
+ jumboMode="false"
+ revision="23.0.1"
+ sha1="2c91c949a45a21cdecf26e03951e46c7beec9ad8">
+ <dex dex="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/build/intermediates/pre-dexed/debug/com.android.support-support-v4-21.0.3_026a8125a4e6c4ec52d4a638c74865564d130336.jar" />
+ </item>
+ <item
+ jar="/Users/lgoedhart/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.4/5fe28b9518e58819180a43a850fbc0dd24b7c050/commons-lang3-3.4.jar"
+ jumboMode="false"
+ revision="23.0.1"
+ sha1="5fe28b9518e58819180a43a850fbc0dd24b7c050">
+ <dex dex="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/build/intermediates/pre-dexed/debug/commons-lang3-3.4_608330f79f14212ab443b3cb1114d108c5b04d64.jar" />
+ </item>
+ <item
+ jar="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/libs/logback-android-1.1.1-3.jar"
+ jumboMode="false"
+ revision="23.0.1"
+ sha1="9df53e0d7c6a4d8b31979a012722d48a275e5d28">
+ <dex dex="/Users/lgoedhart/StudioProjects/Medtronic640gUploader/app/build/intermediates/pre-dexed/debug/logback-android-1.1.1-3_db4686fd4aab9bc1bde766a7a2dbe6565bcba6d9.jar" />
+ </item>
+
+</items>