Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
6
600SeriesAndroidUploader
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cgm
uploader
600SeriesAndroidUploader
Commits
b0cad169
Commit
b0cad169
authored
9 years ago
by
Lennart Goedhart
Browse files
Options
Downloads
Patches
Plain Diff
Though I couldn't repro #2, seeing if this helps @wright-david.
parent
9cf7767b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.idea/workspace.xml
+22
-20
22 additions, 20 deletions
.idea/workspace.xml
app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java
+1
-1
1 addition, 1 deletion
...o/nightscout/android/medtronic/GetHmacAndKeyActivity.java
with
23 additions
and
21 deletions
.idea/workspace.xml
+
22
−
20
View file @
b0cad169
...
...
@@ -11,9 +11,7 @@
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"ffce6e62-d498-4e17-b121-42833fbda3f5"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/app/app.iml"
afterPath=
"$PROJECT_DIR$/app/app.iml"
/>
<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"
/>
<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"
/>
</list>
<ignored
path=
"Medtronic640gUploader.iws"
/>
<ignored
path=
".idea/workspace.xml"
/>
...
...
@@ -34,10 +32,10 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"Medtronic640gActivity.java"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
leaf-file-name=
"Medtronic640gActivity.java"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"
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"
/>
<folding>
<element
signature=
"e#15673#15939#0"
expanded=
"true"
/>
...
...
@@ -69,12 +67,14 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"GetHmacAndKeyActivity.java"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"GetHmacAndKeyActivity.java"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<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
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>
...
...
@@ -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/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/GetHmacAndKeyActivity.java"
/>
<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/Medtronic640gActivity.java"
/>
<option
value=
"$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java"
/>
</list>
</option>
</component>
...
...
@@ -2420,7 +2420,7 @@
<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=
"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=
"Android Monitor"
active=
"
fals
e"
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=
"
tru
e"
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=
"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"
/>
...
...
@@ -2805,14 +2805,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"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"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"-7.259259"
>
...
...
@@ -2833,7 +2825,7 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"
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"
/>
<folding>
<element
signature=
"e#15673#15939#0"
expanded=
"true"
/>
...
...
@@ -2842,5 +2834,15 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
vertical-scroll-proportion=
"0.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>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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
View
focusView
=
null
;
// 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
));
focusView
=
mPasswordView
;
cancel
=
true
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment