Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

6

600SeriesAndroidUploader
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Incidents

Snippets Groups Projects

9fe2dfb8

Commit 9fe2dfb8 authored 8 years ago by wright-david

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/pazaan/640gAndroidUploader

parents 519fdfcc 07321c47

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/info/nightscout/android/dexcom/DexcomG4Service.java 0 additions, 36 deletions

.../java/info/nightscout/android/dexcom/DexcomG4Service.java
app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java 44 additions, 17 deletions

...o/nightscout/android/medtronic/GetHmacAndKeyActivity.java
app/src/main/java/info/nightscout/android/medtronic/Medtronic640gActivity.java 9 additions, 9 deletions

...o/nightscout/android/medtronic/Medtronic640gActivity.java
app/src/main/java/info/nightscout/android/medtronic/MedtronicCGMService.java 1 addition, 40 deletions

...nfo/nightscout/android/medtronic/MedtronicCGMService.java
app/src/main/java/info/nightscout/android/medtronic/MedtronicCNLReader.java 4 additions, 4 deletions

...info/nightscout/android/medtronic/MedtronicCNLReader.java
app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java 2 additions, 37 deletions

...tscout/android/medtronic/service/MedtronicCNLService.java
app/src/main/java/info/nightscout/android/upload/MedtronicNG/CGMRecord.java 2 additions, 2 deletions

...info/nightscout/android/upload/MedtronicNG/CGMRecord.java
app/src/main/java/info/nightscout/android/upload/UploadHelper.java 2 additions, 2 deletions

...ain/java/info/nightscout/android/upload/UploadHelper.java
app/src/main/res/layout/activity_login.xml 59 additions, 32 deletions

app/src/main/res/layout/activity_login.xml
app/src/main/res/menu/menu.xml 1 addition, 1 deletion

app/src/main/res/menu/menu.xml
app/src/main/res/values/strings.xml 4 additions, 1 deletion

app/src/main/res/values/strings.xml
app/src/main/res/xml/preferences.xml 1 addition, 10 deletions

app/src/main/res/xml/preferences.xml

with 129 additions and 191 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment