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

Though I couldn't repro #2, seeing if this helps @wright-david.

parent 9cf7767b
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 22
− 20
View file @ b0cad169
...@@ -11,9 +11,7 @@ ...@@ -11,9 +11,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ffce6e62-d498-4e17-b121-42833fbda3f5" name="Default" comment=""> <list default="true" id="ffce6e62-d498-4e17-b121-42833fbda3f5" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.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/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
</list> </list>
<ignored path="Medtronic640gUploader.iws" /> <ignored path="Medtronic640gUploader.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -34,10 +32,10 @@ ...@@ -34,10 +32,10 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Medtronic640gActivity.java" pinned="false" current-in-tab="true"> <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"> <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.0638766"> <state vertical-scroll-proportion="-17.88889">
<caret line="411" column="114" selection-start-line="411" selection-start-column="114" selection-end-line="411" selection-end-column="114" /> <caret line="411" column="114" selection-start-line="411" selection-start-column="114" selection-end-line="411" selection-end-column="114" />
<folding> <folding>
<element signature="e#15673#15939#0" expanded="true" /> <element signature="e#15673#15939#0" expanded="true" />
...@@ -69,12 +67,14 @@ ...@@ -69,12 +67,14 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="GetHmacAndKeyActivity.java" pinned="false" current-in-tab="false"> <file leaf-file-name="GetHmacAndKeyActivity.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="11.074074"> <state vertical-scroll-proportion="0.33259913">
<caret line="115" column="59" selection-start-line="115" selection-start-column="54" selection-end-line="115" selection-end-column="76" /> <caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
<folding /> <folding>
<element signature="e#4031#4073#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1783,10 +1783,10 @@ ...@@ -1783,10 +1783,10 @@
<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/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/DexcomG4Activity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/LoginActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/LoginActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java" /> <option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java" />
<option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -2420,7 +2420,7 @@ ...@@ -2420,7 +2420,7 @@
<window_info id="Palette&#9;" 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="false" content_ui="tabs" /> <window_info id="Palette&#9;" 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="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="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.33" sideWeight="0.5" order="7" side_tool="true" 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="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="true" show_stripe_button="true" weight="0.2633864" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Android Monitor" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2633864" sideWeight="0.5" 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.33" sideWeight="0.5" 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.33" 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.3299566" sideWeight="0.5" order="2" 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.3299566" 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.3299566" sideWeight="0.5" order="7" 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.3299566" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
...@@ -2805,14 +2805,6 @@ ...@@ -2805,14 +2805,6 @@
</state> </state>
</provider> </provider>
</entry> </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="11.074074">
<caret line="115" column="59" selection-start-line="115" selection-start-column="54" selection-end-line="115" selection-end-column="76" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/info/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"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.259259"> <state vertical-scroll-proportion="-7.259259">
...@@ -2833,7 +2825,7 @@ ...@@ -2833,7 +2825,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.0638766"> <state vertical-scroll-proportion="-17.88889">
<caret line="411" column="114" selection-start-line="411" selection-start-column="114" selection-end-line="411" selection-end-column="114" /> <caret line="411" column="114" selection-start-line="411" selection-start-column="114" selection-end-line="411" selection-end-column="114" />
<folding> <folding>
<element signature="e#15673#15939#0" expanded="true" /> <element signature="e#15673#15939#0" expanded="true" />
...@@ -2842,5 +2834,15 @@ ...@@ -2842,5 +2834,15 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.33259913">
<caret line="114" column="12" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
<folding>
<element signature="e#4031#4073#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java
+ 1
− 1
View file @ b0cad169
...@@ -112,7 +112,7 @@ public class GetHmacAndKeyActivity extends Activity implements LoaderCallbacks<C ...@@ -112,7 +112,7 @@ public class GetHmacAndKeyActivity extends Activity implements LoaderCallbacks<C
View focusView = null; View focusView = null;
// Check for a valid password, if the user entered one. // Check for a valid password, if the user entered one.
if (!TextUtils.isEmpty(password) && !isPasswordValid(password)) { if (TextUtils.isEmpty(password)) {
mPasswordView.setError(getString(R.string.error_invalid_password)); mPasswordView.setError(getString(R.string.error_invalid_password));
focusView = mPasswordView; focusView = mPasswordView;
cancel = true; cancel = true;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment