Skip to content
Snippets Groups Projects
Commit 2880c8e9 authored by Lennart Goedhart's avatar Lennart Goedhart
Browse files

Add mechanism to login to CareLink and retrieve HMAC and key for the attached device. 

Remove hardcoded keys.
parent fc0b862d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/src/main/res/layout/adb.xml
+ 28
− 23
View file @ 2880c8e9
...@@ -4,17 +4,6 @@ ...@@ -4,17 +4,6 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="15dp"> android:paddingTop="15dp">
<TextView
android:id="@+id/demoTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="70sp"
android:gravity="center"
android:textStyle="bold"
android:text="@string/hello" />
<ScrollView <ScrollView
android:id="@+id/demoScroller" android:id="@+id/demoScroller"
...@@ -22,20 +11,36 @@ ...@@ -22,20 +11,36 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp"> android:padding="10dp">
<TextView <LinearLayout
android:id="@+id/demoText" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:textSize="30sp"
<TextView
android:gravity="left" /> android:id="@+id/demoTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="50sp"
android:gravity="center"
android:textStyle="bold"
android:text="@string/hello" />
<TextView
android:id="@+id/demoText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="20sp"
android:gravity="left" />
<LinearLayout android:id="@+id/container"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
</LinearLayout>
</LinearLayout>
</ScrollView> </ScrollView>
<LinearLayout android:id="@+id/container"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
</LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/menu/menu.xml
+ 2
− 17
View file @ 2880c8e9
...@@ -6,23 +6,8 @@ ...@@ -6,23 +6,8 @@
android:title="Preferences"> android:title="Preferences">
</item> </item>
<item <item
android:id="@+id/readPumpInfo" android:id="@+id/registerCNL"
android:orderInCategory="100" android:orderInCategory="100"
android:title="Read Pump Info."> android:title="Register USB Stick">
</item>
<item
android:id="@+id/refreshCalFactor"
android:orderInCategory="100"
android:title="Get Cal Factor!">
</item>
<item
android:id="@+id/calibMan"
android:orderInCategory="100"
android:title="Manual Calibration.">
</item>
<item
android:id="@+id/instantCalib"
android:orderInCategory="100"
android:title="Instant Calibration.">
</item> </item>
</menu> </menu>
\ No newline at end of file
app/src/main/res/values-v11/styles.xml
+ 1
− 1
View file @ 2880c8e9
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
Base application theme for API 11+. This theme completely replaces Base application theme for API 11+. This theme completely replaces
AppBaseTheme from res/values/styles.xml on API 11+ devices. AppBaseTheme from res/values/styles.xml on API 11+ devices.
--> -->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light"> <style name="AppBaseTheme" parent="android:Theme.DeviceDefault">
<!-- API 11 theme customizations can go here. --> <!-- API 11 theme customizations can go here. -->
</style> </style>
......
app/src/main/res/values-v14/styles.xml
+ 1
− 1
View file @ 2880c8e9
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
AppBaseTheme from BOTH res/values/styles.xml and AppBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 14+ devices. res/values-v11/styles.xml on API 14+ devices.
--> -->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar"> <style name="AppBaseTheme" parent="android:Theme.DeviceDefault">
<!-- API 14 theme customizations can go here. --> <!-- API 14 theme customizations can go here. -->
</style> </style>
......
app/src/main/res/values-v21/styles.xml 0 → 100644
+ 7
− 0
View file @ 2880c8e9
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AppBaseTheme" parent="android:Theme.DeviceDefault">
<!-- API 11 theme customizations can go here. -->
</style>
</resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
+ 14
− 0
View file @ 2880c8e9
...@@ -99,4 +99,18 @@ ...@@ -99,4 +99,18 @@
<item>10</item> <item>10</item>
<item>11</item> <item>11</item>
</string-array> </string-array>
<string name="title_activity_login">CareLink login</string>
<!-- Strings related to login -->
<string name="prompt_username">CareLink Username</string>
<string name="prompt_password">Password</string>
<string name="action_sign_in">Retrieve keys for USB</string>
<string name="action_sign_in_short">Retrieve keys</string>
<string name="error_invalid_username">This username is invalid</string>
<string name="error_invalid_password">This password is too short</string>
<string name="error_incorrect_password">The Username or password is incorrect</string>
<string name="error_field_required">This field is required</string>
<string name="permission_rationale">"Contacts permissions are needed for providing email
completions."
</string>
</resources> </resources>
build/intermediates/dex-cache/cache.xml
+ 1
− 46
View file @ 2880c8e9
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<items version="2" > <items version="2" />
<item
jar="/Users/lgoedhart/StudioProjects/MedtronicUploader/app/libs/physicaloidlibrary.jar"
jumboMode="true"
revision="23.0.1"
sha1="391534fe92fec965996d9aaf3a328b5f0c2b0740">
<dex dex="/Users/lgoedhart/StudioProjects/MedtronicUploader/app/build/intermediates/transforms/dex/debug/folders/1000/2/physicaloidlibrary_9ccb0a9459a35113b137cb56f3f46bde93a6197b/classes.dex" />
</item>
<item
jar="/Users/lgoedhart/StudioProjects/MedtronicUploader/app/libs/logback-android-1.1.1-3.jar"
jumboMode="true"
revision="23.0.1"
sha1="9df53e0d7c6a4d8b31979a012722d48a275e5d28">
<dex dex="/Users/lgoedhart/StudioProjects/MedtronicUploader/app/build/intermediates/transforms/dex/debug/folders/1000/2/logback-android-1.1.1-3_26faaac8eb6179a49c85c550f2570a85dcf9ec77/classes.dex" />
</item>
<item
jar="/Users/lgoedhart/StudioProjects/MedtronicUploader/app/build/intermediates/incremental-runtime-classes/debug/instant-run.jar"
jumboMode="true"
revision="23.0.1"
sha1="8a0b448c242e45651aa3eff4da2565f5d2472c67">
<dex dex="/Users/lgoedhart/StudioProjects/MedtronicUploader/app/build/intermediates/transforms/dex/debug/folders/1000/10/instant-run_ab0e4833222d2576fa652ea70850f6721d7c4c56/classes.dex" />
</item>
<item
jar="/Users/lgoedhart/StudioProjects/MedtronicUploader/app/libs/mongo-java-driver-3.0.2.jar"
jumboMode="true"
revision="23.0.1"
sha1="7d3880dec6c8a2f07c1f544776c326834b513712">
<dex dex="/Users/lgoedhart/StudioProjects/MedtronicUploader/app/build/intermediates/transforms/dex/debug/folders/1000/2/mongo-java-driver-3.0.2_cf135c838ae634eaa0bde6ebd7ab91ae93691ade/classes.dex" />
</item>
<item
jar="/Users/lgoedhart/StudioProjects/MedtronicUploader/app/build/intermediates/incremental-classes/debug/instant-run-bootstrap.jar"
jumboMode="true"
revision="23.0.1"
sha1="028bcebc4e2ad003732150e4f2c394474c8eff42">
<dex dex="/Users/lgoedhart/StudioProjects/MedtronicUploader/app/build/intermediates/transforms/dex/debug/folders/1000/10/instant-run-bootstrap_a4562f9a19a66a867fdb86514799366913b783f6/classes.dex" />
</item>
<item
jar="/Users/lgoedhart/StudioProjects/MedtronicUploader/app/libs/slf4j-api-1.7.2.jar"
jumboMode="true"
revision="23.0.1"
sha1="0081d61b7f33ebeab314e07de0cc596f8e858d97">
<dex dex="/Users/lgoedhart/StudioProjects/MedtronicUploader/app/build/intermediates/transforms/dex/debug/folders/1000/2/slf4j-api-1.7.2_aba40428135bcd9ffb23cf7b91dad2955f2763e7/classes.dex" />
</item>
</items>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment