diff --git a/.travis.yml b/.travis.yml index 0b4ea0afa..df7aabf36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,4 +30,7 @@ android: #- sys-img-armeabi-v7a-android-19 #- sys-img-x86-android-17 +before_install: + - yes | sdkmanager "platforms;android-27" + script: ./gradlew build connectedCheck --stacktrace diff --git a/CHANGELOG.md b/CHANGELOG.md index dd7c960e4..4bf3b81ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ ### Changelog +#### Version 0.25.0 +* Inital suport for Xwatch +* Move the connected device to top in control center +* Add adaptive launcher icon for Android 8.x +* No longer plot heart rate graph when device was detected as not worn +* Pebble: Small fixes for background js (e.g. Pebble-Casio-WV58DE) +* Pebble: native (non bg js) support for weather in Simply Light watchface + +#### Version 0.24.6 +* Display the chat icon for notifications coming from Kontalk and Antox +* Pebble: Fix for background js which try to send floats (e.g. TrekVolle) +* Mi Band 2: Change the way vibration patterns work, also fixes problems with missing text on newer firmwares + #### Version 0.24.5 * Fix crash in settings activity with export location * Fix notification deletion regression diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 325a10829..c898628ea 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -2,7 +2,7 @@ names () { echo -e "\n exit;\n**Contributors (sorted by number of commits):**\n"; - git log --format='%aN:%ae' origin/master | grep -Ev "FYG_.*_bot_ignore_me" | sed 's/@users.github.com/@users.noreply.github.com/g' | awk 'BEGIN{FS=":"}{ct[$1]+=1;if (length($2) > length(e[$1])) {e[$1]=$2}}END{for (i in e) { n[i]=e[i];c[i]+=ct[i] }; for (a in e) print c[a]"\t* "a" <"n[a]">";}' | sort -n -r | cut -f 2- + git log --format='%aN:%ae' origin/master | grep -Ev "(anonymous:|FYG_.*_bot_ignore_me)" | sed 's/@users.github.com/@users.noreply.github.com/g' | awk 'BEGIN{FS=":"}{match ($1, /^(%)?(.*)/, n) ; ct[n[2]]+=1; if (n[1] ~ /%/ || e[n[2]] == "" ) { e[n[2]]=$2}}END{for (i in e) { n[i]=e[i];c[i]+=ct[i] }; for (a in e) print c[a]"\t* "a" <"n[a]">";}' | sort -n -r | cut -f 2- } quine () { @@ -12,7 +12,7 @@ declare -f quine | sed -e 's/^[[:space:]]*/ /'; echo -e " quine\n"; names; - echo -e "\nAnd all the Transifex translators, which I cannot automatically list, at the moment.\n\n*To update the contributors list just run this file with bash*" + echo -e "\nAnd all the Transifex translators, which I cannot automatically list, at the moment.\n\n*To update the contributors list just run this file with bash. Prefix a name with % in .mailmap to set a contact as preferred*" } > CONTRIBUTORS.rst; exit } @@ -26,47 +26,105 @@ * Carsten Pfeiffer * Daniele Gobbetti * João Paulo Barraca +* Jonas +* Yaron Shahrabani +* protomors +* postsorino * ivanovlev +* mueller-ma +* Allan Nordhøy * Julien Pivotto +* youzhiran <2668760098@qq.com> * Steffen Liebergeld * Lem Dulfo +* naofum +* Felix Konstantin Maurer * Sergey Trofimov +* José Rebelo * JohnnySun +* Hadrián Candela * Uwe Hermann +* TaaviE * Alberto -* 0nse <0nse@users.noreply.github.com> +* Vladislav Serkov +* Vebryn * Gergely Peidl +* Bożydar +* 0nse <0nse@users.noreply.github.com> +* Tijl Schepens +* masakoodaa +* Lukas Veneziano +* Kompact +* Jasper * Christian Fischer +* c4ndel4 * 6arms1leg +* Zhong Jianxin * walkjivefly * Normano64 +* nautilusx +* Minori Hiraoka (미노리) +* Michal Novotny +* mesnevi +* LL +* Jesús +* Gilles Émilien MOREL * Avamander +* AnthonyDiGirolamo +* Andreas Kromke * Ⲇⲁⲛⲓ Φi * Yar -* Yaron Shahrabani * xzovy * xphnx +* Vitaliy Shuruta +* Tomer Rosenfeld +* Tomas Radej +* Ted Stein * Tarik Sekmen * Szymon Tomasz Stefanek +* Sami Alaoui <4ndroidgeek@gmail.com> * Roman Plevka * rober +* redking +* Quallenauge +* Pavel Motyrev +* Pascal +* Olexandr Nesterenko +* NotAFIle +* NotAFile * Nicolò Balzarotti * Natanael Arndt +* Michal Novak +* michaelneu +* McSym28 +* MaxL * Marc Schlaich +* Leonardo Amaral +* lazarosfs +* ladbsoft <30509719+ladbsoft@users.noreply.github.com> * kevlarcade * Kevin Richter +* Kaz Wolfe * Kasha +* Joseph Kim +* Jan Lolek * Ivan * Hasan Ammar -* Gilles MOREL -* Gilles Émilien MOREL +* Gideão Gomes Ferreira +* Gabe Schrecker +* freezed-or-frozen +* Frank Slezak +* Davis Mosenkovs * Daniel Hauck +* criogenic * Chris Perelstein * Carlos Ferreira +* bucala +* batataspt@gmail.com * atkyritsis * andre * Alexey Afanasev And all the Transifex translators, which I cannot automatically list, at the moment. -*To update the contributors list just run this file with bash* +*To update the contributors list just run this file with bash. Prefix a name with % in .mailmap to set a contact as preferred* diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java index a27d2474e..1afb4246d 100644 --- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java +++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java @@ -68,6 +68,7 @@ public class GBDaoGenerator { addHPlusHealthActivityKindOverlay(schema, user, device); addHPlusHealthActivitySample(schema, user, device); addNo1F1ActivitySample(schema, user, device); + addXWatchActivitySample(schema, user, device); addCalendarSyncState(schema, device); @@ -274,6 +275,17 @@ public class GBDaoGenerator { return activitySample; } + private static Entity addXWatchActivitySample(Schema schema, Entity user, Entity device) { + Entity activitySample = addEntity(schema, "XWatchActivitySample"); + activitySample.implementsSerializable(); + addCommonActivitySampleProperties("AbstractActivitySample", activitySample, user, device); + activitySample.addIntProperty(SAMPLE_STEPS).notNull().codeBeforeGetterAndSetter(OVERRIDE); + activitySample.addIntProperty(SAMPLE_RAW_KIND).notNull().codeBeforeGetterAndSetter(OVERRIDE); + activitySample.addIntProperty(SAMPLE_RAW_INTENSITY).notNull().codeBeforeGetterAndSetter(OVERRIDE); + addHeartRateProperties(activitySample); + return activitySample; + } + private static void addCommonActivitySampleProperties(String superClass, Entity activitySample, Entity user, Entity device) { activitySample.setSuperclass(superClass); activitySample.addImport(MAIN_PACKAGE + ".devices.SampleProvider"); diff --git a/README.md b/README.md index 32c8510ce..e848fad34 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ vendor's servers. * NO.1 F1 (WIP) * Liveview * Vibratissimo (experimental) +* XWatch (Affordable Chinese Casio-like smartwatches) ## Features diff --git a/app/build.gradle b/app/build.gradle index b8fe0b5cf..117282921 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,8 +26,8 @@ android { targetSdkVersion 27 // note: always bump BOTH versionCode and versionName! - versionName "0.24.5" - versionCode 122 + versionName "0.25.0" + versionCode 124 vectorDrawables.useSupportLibrary = true } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 797e976a1..c1bad1947 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,7 +37,8 @@ android:name=".GBApplication" android:allowBackup="false" android:fullBackupContent="false" - android:icon="@drawable/ic_launcher" + android:icon="@mipmap/ic_launcher" + android:roundIcon="@mipmap/ic_launcher_round" android:label="@string/app_name" android:theme="@style/GadgetbridgeTheme"> -1 && ts - lastHrSampleIndex > 1800*HeartRateUtils.MAX_HR_MEASUREMENTS_GAP_MINUTES) { heartrateEntries.add(createLineEntry(0, lastHrSampleIndex + 1)); heartrateEntries.add(createLineEntry(0, ts - 1)); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java index e9d63d800..4fb76c56e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 0nse, Alberto, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2015-2018 0nse, Alberto, Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityAnalysis.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityAnalysis.java index db82772d8..493a59702 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityAnalysis.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityAnalysis.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Vebryn This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java index aaeeb6b9a..d12f03f48 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java index d857800a4..fc6582e9e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Vebryn This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsData.java index 15b17038c..ff53f4ae1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsData.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsData.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsHost.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsHost.java index 0f92cd2c5..a61b0262f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsHost.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsHost.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CustomBarChart.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CustomBarChart.java index 44ae446b0..2942da446 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CustomBarChart.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CustomBarChart.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java index a292dfd4c..53c7563fd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SingleEntryValueAnimator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SingleEntryValueAnimator.java index 053d3ba1a..4ca0f0dfc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SingleEntryValueAnimator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SingleEntryValueAnimator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer +/* Copyright (C) 2015-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java index 419150adb..51672e5d8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepUtils.java index 81d684b6e..33ecef693 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepUtils.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SpeedZonesFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SpeedZonesFragment.java index bab6754fd..c255f3707 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SpeedZonesFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SpeedZonesFragment.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Vebryn This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TimestampValueFormatter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TimestampValueFormatter.java index 76e89f373..10631b031 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TimestampValueFormatter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TimestampValueFormatter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TrailingActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TrailingActivitySample.java index 89550ca7a..36e1f7a46 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TrailingActivitySample.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TrailingActivitySample.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java index f0ea551fe..2ee3c0eb4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java index 86cc382c6..32be63c45 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AppBlacklistAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AppBlacklistAdapter.java index f7ae70bfd..6f064168d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AppBlacklistAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AppBlacklistAdapter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2017-2018 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/DeviceCandidateAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/DeviceCandidateAdapter.java index 0741d3833..25f796869 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/DeviceCandidateAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/DeviceCandidateAdapter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java index 92292aca3..83136d116 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java index ffa6178dd..84d7ea6f7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Lem Dulfo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java index 0c1caed72..24caa31d7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ItemWithDetailsAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ItemWithDetailsAdapter.java index e35f563af..f038655d2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ItemWithDetailsAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ItemWithDetailsAdapter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/contentprovider/PebbleContentProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/contentprovider/PebbleContentProvider.java index 0e3e94cb5..515493dbf 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/contentprovider/PebbleContentProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/contentprovider/PebbleContentProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBAccess.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBAccess.java index 86caa92df..79bc38313 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBAccess.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBAccess.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHandler.java index 3b25e33a2..80d99c507 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, JohnnySun This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java index 07ba2a6da..e6d53720c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, JohnnySun +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Felix Konstantin Maurer, JohnnySun This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBOpenHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBOpenHelper.java index 0b109076d..7c4eb6c79 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBOpenHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBOpenHelper.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBUpdateScript.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBUpdateScript.java index d6e96adba..5449d15b6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBUpdateScript.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBUpdateScript.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/PeriodicExporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/PeriodicExporter.java index f9665bf4b..5c5fccb36 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/PeriodicExporter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/PeriodicExporter.java @@ -1,3 +1,19 @@ +/* Copyright (C) 2018 Carsten Pfeiffer, Felix Konstantin Maurer + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.database; import android.app.AlarmManager; @@ -65,8 +81,9 @@ public class PeriodicExporter extends BroadcastReceiver { return; } Uri dstUri = Uri.parse(dst); - OutputStream out = context.getContentResolver().openOutputStream(dstUri); - helper.exportDB(dbHandler, out); + try (OutputStream out = context.getContentResolver().openOutputStream(dstUri)) { + helper.exportDB(dbHandler, out); + } } catch (Exception ex) { GB.updateExportFailedNotification(context.getString(R.string.notif_export_failed_title), context); LOG.info("Exception while exporting DB: ", ex); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_14.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_14.java index 3e8272c3c..e0191ed2c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_14.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_14.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_15.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_15.java index e0627d2ef..b2ff50ca5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_15.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_15.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_17.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_17.java index 04c948539..707386b52 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_17.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_17.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 protomors +/* Copyright (C) 2017-2018 protomors This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/SchemaMigration.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/SchemaMigration.java index 02ad310e2..8e2f6340d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/SchemaMigration.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/SchemaMigration.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEvent.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEvent.java index d4d6518cc..f0ee21601 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEvent.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEvent.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2015-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppInfo.java index 1591975f5..fc3c17d00 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppManagement.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppManagement.java index bd2caa3c6..1000861aa 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppManagement.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppManagement.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppMessage.java index 58028151c..d835ea1c0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppMessage.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppMessage.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventBatteryInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventBatteryInfo.java index 1c6c89992..3f226e4f3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventBatteryInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventBatteryInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2015-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventCallControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventCallControl.java index 2f776a9b9..a2240865a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventCallControl.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventCallControl.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventDisplayMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventDisplayMessage.java index 12722ac7d..7b45fb427 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventDisplayMessage.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventDisplayMessage.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFindPhone.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFindPhone.java index a708ec05b..318a73340 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFindPhone.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFindPhone.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventMusicControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventMusicControl.java index 04529fc80..9dd88bc15 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventMusicControl.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventMusicControl.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventNotificationControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventNotificationControl.java index 4c2e4b990..1e7037b17 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventNotificationControl.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventNotificationControl.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventScreenshot.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventScreenshot.java index 17215e60e..1d11e9323 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventScreenshot.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventScreenshot.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSendBytes.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSendBytes.java index ea49c8bf7..4f4c4003f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSendBytes.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSendBytes.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSleepMonitorResult.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSleepMonitorResult.java index ea5863181..c6b24c5f5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSleepMonitorResult.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSleepMonitorResult.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventVersionInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventVersionInfo.java index 1ba7cb526..aa5a8f2fd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventVersionInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventVersionInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/pebble/GBDeviceEventDataLogging.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/pebble/GBDeviceEventDataLogging.java index a6b7be913..6ad638c69 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/pebble/GBDeviceEventDataLogging.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/pebble/GBDeviceEventDataLogging.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa +/* Copyright (C) 2017-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java index 46c85c820..6acbe6e4c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2015-2018 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java index 701b812be..84cc2db74 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java index 70298e5a8..45d4150eb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, JohnnySun, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java index 445d5479a..c5efed77e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. @@ -163,7 +164,10 @@ public class DeviceManager { Collections.sort(deviceList, new Comparator() { @Override public int compare(GBDevice lhs, GBDevice rhs) { - return Collator.getInstance().compare(lhs.getName(), rhs.getName()); + if (rhs.getStateOrdinal() - lhs.getStateOrdinal() == 0) { + return Collator.getInstance().compare(lhs.getName(), rhs.getName()); + } + return (rhs.getStateOrdinal() - lhs.getStateOrdinal()); } }); notifyDevicesChanged(); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java index 8d6e86939..25d974834 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Julien Pivotto, Kasha, Steffen Liebergeld, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/InstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/InstallHandler.java index af533005f..2bbfa22b0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/InstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/InstallHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/SampleProvider.java index 3af113b31..543f22777 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/SampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/SampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java index 3b9b7d9d4..e35417449 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/EXRIZUK8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/EXRIZUK8Coordinator.java index a630bb92e..1cfb0e20d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/EXRIZUK8Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/EXRIZUK8Coordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 João Paulo Barraca, Quallenauge +/* Copyright (C) 2017-2018 João Paulo Barraca, Quallenauge This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java index e8c7e6932..7989398dc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, João +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java index 0cce909b3..44499980b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, João +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java index 4a605809a..dc816addc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, João Paulo Barraca +/* Copyright (C) 2017-2018 Andreas Shimokawa, João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/MakibesF68Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/MakibesF68Coordinator.java index 23041f6d0..d04c4ea50 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/MakibesF68Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/MakibesF68Coordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 João Paulo Barraca +/* Copyright (C) 2017-2018 João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java index a920ff3d8..3a85e229a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java index a7a808350..48456e1dd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiWeatherConditions.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiWeatherConditions.java index a616fe83b..f772f8adb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiWeatherConditions.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiWeatherConditions.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa +/* Copyright (C) 2017-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java index 1489777dd..25a1f1db0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, João Paulo Barraca +/* Copyright (C) 2017-2018 Andreas Shimokawa, João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWHelper.java index bac1b4aae..a710ca2dd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWHelper.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWInstallHandler.java index 77438bc9c..605491ff6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWInstallHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipService.java index 234dbaa27..38b81f3f8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipService.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java index 4df1eb3b2..97d410a26 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, João Paulo Barraca +/* Copyright (C) 2017-2018 Andreas Shimokawa, João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWHelper.java index 4b7c38440..d5758dbda 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWHelper.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWInstallHandler.java index a13800f3d..452886c1e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWInstallHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java index e1d091102..8af4f0bef 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWHelper.java index d15ac3cf5..fd97c56c6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWHelper.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWInstallHandler.java index 05f25d8a2..d2064d6b4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWInstallHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java index 8225c5b76..5ad86070c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, João Paulo Barraca +/* Copyright (C) 2017-2018 Andreas Shimokawa, João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/JYouConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/JYouConstants.java index 8476fba57..e84d60fb6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/JYouConstants.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/JYouConstants.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Sami Alaoui +/* Copyright (C) 2017-2018 Sami Alaoui This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30Coordinator.java index b35b1d404..4d3e98dbd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30Coordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, protomors, Sami Alaoui This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewConstants.java index 6a597bef0..731f95008 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewConstants.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewConstants.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Daniele Gobbetti +/* Copyright (C) 2016-2018 Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewCoordinator.java index 1e3c716e1..7b93b6913 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWHelper.java index 16722450f..a0f0d23c9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWHelper.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWInstallHandler.java index 27a0a860c..b6e6d4651 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWInstallHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandSampleProvider.java index 1b40aa439..88aebc0f2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandSampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandSampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DateTimeDisplay.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DateTimeDisplay.java index 43f098143..bf26cc9c4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DateTimeDisplay.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DateTimeDisplay.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DoNotDisturb.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DoNotDisturb.java index 912909ae5..04c689061 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DoNotDisturb.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DoNotDisturb.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 José Rebelo +/* Copyright (C) 2017-2018 José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java index 398e05b4a..0dac10166 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2Service.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2Service.java index d18707577..1c945cdf7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2Service.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2Service.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, JohnnySun, +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, JohnnySun, José Rebelo, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java index 9807bd68e..7ddee301f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Christian +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Christian Fischer, Daniele Gobbetti, José Rebelo, Michal Novotny, Szymon Tomasz Stefanek This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java index 2cd04f320..f9a2063c4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Christian +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Christian Fischer, Daniele Gobbetti, Szymon Tomasz Stefanek This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandDateConverter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandDateConverter.java index 0495ccab0..d73daf6fa 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandDateConverter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandDateConverter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Szymon Tomasz Stefanek This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWHelper.java index 6a514f24e..46c2990ac 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWHelper.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWInstallHandler.java index 2d8d17273..766cfbd42 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWInstallHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java index 4e49ae911..e33d3c96b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java index bc222ccd5..923aa7314 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Christian +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Christian Fischer, Daniele Gobbetti, José Rebelo, Szymon Tomasz Stefanek This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandSampleProvider.java index 4842e5fa9..3a135a5c2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandSampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandSampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandService.java index c64d2c903..5de7d43a5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandService.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Kasha This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java index b09bb2e73..38dbdcd90 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Sergey Trofimov This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java index 7f7fdf588..f7a1804e2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Constants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Constants.java index 05049a2b5..11058b144 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Constants.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Constants.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 protomors +/* Copyright (C) 2017-2018 protomors This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java index fb157b677..373f59aac 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, protomors This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1SampleProvider.java index 2b7b1e5db..4bd435a70 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1SampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1SampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 protomors +/* Copyright (C) 2017-2018 protomors This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java index c12996276..a5bd601c4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java index ee2458f77..5fd2fa670 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleColor.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleColor.java index 4009ebbe4..c07f68860 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleColor.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleColor.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java index eefac58cf..d94a490f7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleHealthSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleHealthSampleProvider.java index 75fff5131..b394f1421 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleHealthSampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleHealthSampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleIconID.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleIconID.java index 50a6ea2c7..06317582f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleIconID.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleIconID.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleInstallable.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleInstallable.java index abe2daa76..627ada12b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleInstallable.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleInstallable.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMisfitSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMisfitSampleProvider.java index fe17e47b9..7dc106d30 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMisfitSampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMisfitSampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMorpheuzSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMorpheuzSampleProvider.java index b8dd72cb8..7e92971a0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMorpheuzSampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMorpheuzSampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java index 30d0b6d39..def98758e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/STM32CRC.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/STM32CRC.java index ba1fcea6d..b21bc20f9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/STM32CRC.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/STM32CRC.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vibratissimo/VibratissimoCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vibratissimo/VibratissimoCoordinator.java index b43c5fb37..55ca064bd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vibratissimo/VibratissimoCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vibratissimo/VibratissimoCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java new file mode 100644 index 000000000..1cfd7c2e3 --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java @@ -0,0 +1,133 @@ +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, ladbsoft + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ +package nodomain.freeyourgadget.gadgetbridge.devices.xwatch; + +import android.app.Activity; +import android.content.Context; +import android.net.Uri; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; + +import nodomain.freeyourgadget.gadgetbridge.GBException; +import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler; +import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider; +import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession; +import nodomain.freeyourgadget.gadgetbridge.entities.Device; +import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; +import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate; +import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample; +import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; + +public class XWatchCoordinator extends AbstractDeviceCoordinator { + @NonNull + @Override + public DeviceType getSupportedType(GBDeviceCandidate candidate) { + String name = candidate.getDevice().getName(); + if (name != null && name.startsWith("XWatch")) { + return DeviceType.XWATCH; + } + return DeviceType.UNKNOWN; + } + + @Override + protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException { + + } + + @Override + public DeviceType getDeviceType() { + return DeviceType.XWATCH; + } + + @Nullable + @Override + public Class getPairingActivity() { + return null; + } + + @Override + public boolean supportsActivityDataFetching() { + return true; + } + + @Override + public boolean supportsActivityTracking() { + return true; + } + + @Override + public SampleProvider getSampleProvider(GBDevice device, DaoSession session) { + return new XWatchSampleProvider(device, session); + } + + @Override + public InstallHandler findInstallHandler(Uri uri, Context context) { + return null; + } + + @Override + public boolean supportsScreenshots() { + return false; + } + + @Override + public boolean supportsAlarmConfiguration() { + return true; + } + + @Override + public boolean supportsSmartWakeup(GBDevice device) { + return false; + } + + @Override + public boolean supportsHeartRateMeasurement(GBDevice device) { + return false; + } + + @Override + public String getManufacturer() { + return "Generic"; + } + + @Override + public boolean supportsAppsManagement() { + return false; + } + + @Override + public Class getAppsManagementActivity() { + return null; + } + + @Override + public boolean supportsCalendarEvents() { + return false; + } + + @Override + public boolean supportsRealtimeData() { + return false; + } + + @Override + public boolean supportsWeather() { + return false; + } +} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchSampleProvider.java new file mode 100644 index 000000000..2d37920b2 --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchSampleProvider.java @@ -0,0 +1,81 @@ +/* Copyright (C) 2017-2018 ladbsoft, protomors + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ +package nodomain.freeyourgadget.gadgetbridge.devices.xwatch; + +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; + +import de.greenrobot.dao.AbstractDao; +import de.greenrobot.dao.Property; +import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleProvider; +import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession; +import nodomain.freeyourgadget.gadgetbridge.entities.XWatchActivitySample; +import nodomain.freeyourgadget.gadgetbridge.entities.XWatchActivitySampleDao; +import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; +import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind; + +//TODO: extend own class +public class XWatchSampleProvider extends AbstractSampleProvider { + public static final int TYPE_ACTIVITY = -1; + + public XWatchSampleProvider(GBDevice device, DaoSession session) { + super(device, session); + } + + @Override + public int normalizeType(int rawType) { + return ActivityKind.TYPE_ACTIVITY; + } + + @Override + public int toRawActivityKind(int activityKind) { + return TYPE_ACTIVITY; + } + + @Override + public float normalizeIntensity(int rawIntensity) { + return rawIntensity / 180.0f; + } + + @Override + public XWatchActivitySample createActivitySample() { + return new XWatchActivitySample(); + } + + @Override + public AbstractDao getSampleDao() { + return getSession().getXWatchActivitySampleDao(); + } + + @Nullable + @Override + protected Property getRawKindSampleProperty() { + return XWatchActivitySampleDao.Properties.RawKind; + } + + @NonNull + @Override + protected Property getTimestampSampleProperty() { + return XWatchActivitySampleDao.Properties.Timestamp; + } + + @NonNull + @Override + protected Property getDeviceIdentifierSampleProperty() { + return XWatchActivitySampleDao.Properties.DeviceId; + } +} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchService.java new file mode 100644 index 000000000..aafcde504 --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchService.java @@ -0,0 +1,50 @@ +/* Copyright (C) 2018 ladbsoft + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ +package nodomain.freeyourgadget.gadgetbridge.devices.xwatch; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +public class XWatchService { + public static final UUID UUID_NOTIFY = UUID.fromString("0000fff7-0000-1000-8000-00805f9b34fb"); + public static final UUID UUID_SERVICE = UUID.fromString("0000fff0-0000-1000-8000-00805f9b34fb"); + public static final UUID UUID_WRITE = UUID.fromString("0000fff6-0000-1000-8000-00805f9b34fb"); + + public static final byte COMMAND_CONNECTED = 0x01; + public static final byte COMMAND_ACTION_BUTTON = 0x4c; + public static final byte COMMAND_ACTIVITY_DATA = 0x43; + public static final byte COMMAND_ACTIVITY_TOTALS = 0x46; + + private static final Map XWATCH_DEBUG; + + static { + XWATCH_DEBUG = new HashMap<>(); + + XWATCH_DEBUG.put(UUID_NOTIFY, "Read data"); + XWATCH_DEBUG.put(UUID_WRITE, "Write data"); + XWATCH_DEBUG.put(UUID_SERVICE, "Get service"); + } + + public static String lookup(UUID uuid, String fallback) { + String name = XWATCH_DEBUG.get(uuid); + if (name == null) { + name = fallback; + } + return name; + } +} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractActivitySample.java index 36acd5bb3..ff0492c6d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractActivitySample.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractActivitySample.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleHealthActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleHealthActivitySample.java index 4de5d39dd..b47a3eebb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleHealthActivitySample.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleHealthActivitySample.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMisfitActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMisfitActivitySample.java index 0b169e2c7..5f15d5a24 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMisfitActivitySample.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMisfitActivitySample.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMorpheuzActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMorpheuzActivitySample.java index 6b489264a..cba74f12b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMorpheuzActivitySample.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMorpheuzActivitySample.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmClockReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmClockReceiver.java index 12466500c..c9a3c6831 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmClockReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmClockReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmReceiver.java index b4e815822..02ff0b55d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2016-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java index 02ffcdbcf..58f1ad894 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2017 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2017-2018 Carsten Pfeiffer, Daniele Gobbetti, Felix + Konstantin Maurer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothConnectReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothConnectReceiver.java index 4d822973a..8bafd6176 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothConnectReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothConnectReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothPairingRequestReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothPairingRequestReceiver.java index 5291745ac..82fea4303 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothPairingRequestReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothPairingRequestReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, João Paulo Barraca +/* Copyright (C) 2016-2018 Andreas Shimokawa, João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothStateChangeReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothStateChangeReceiver.java index 53e6fd739..9a45d3fea 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothStateChangeReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothStateChangeReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java index d061372d0..6df259e9e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java @@ -1,3 +1,19 @@ +/* Copyright (C) 2017-2018 Andreas Shimokawa + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.externalevents; import android.app.AlarmManager; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java index 9506e9b90..86f2413e4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, - Daniel Hauck +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Daniel Hauck This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java index 99d4bd6db..88193d7ef 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 andre, Andreas Shimokawa, Avamander, Carsten +/* Copyright (C) 2015-2018 andre, Andreas Shimokawa, Avamander, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java index dc737b7de..4112c9151 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java @@ -1,6 +1,6 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Frank Slezak, Hasan Ammar, Julien Pivotto, Kevin Richter, Normano64, - Steffen Liebergeld + Steffen Liebergeld, TaaviE, Zhong Jianxin This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OmniJawsObserver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OmniJawsObserver.java index 567cf24d8..35bedcc20 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OmniJawsObserver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OmniJawsObserver.java @@ -1,3 +1,19 @@ +/* Copyright (C) 2017-2018 Daniele Gobbetti + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.externalevents; import android.content.Context; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PebbleReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PebbleReceiver.java index 54741de2a..5dad1565b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PebbleReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PebbleReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java index 3082ca219..0cbb0a399 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Normano64 +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Normano64 This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java index 7056b20b9..be96e4381 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2017 0nse, Andreas Shimokawa, Carsten Pfeiffer, - Normano64 +/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, + Normano64, Zhong Jianxin This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java index 9486cc0a2..b202cbd2b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationConfig.java index 93e4dcb2c..5757a3515 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationConfig.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationConfig.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationReceiver.java index f016b61e5..437907681 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2015-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBAlarm.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBAlarm.java index 3810613c6..cdbee5377 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBAlarm.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBAlarm.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java index 2444aabcc..ad57f0ca2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Uwe Hermann This file is part of Gadgetbridge. @@ -252,6 +252,10 @@ public class GBDevice implements Parcelable { return mState; } + public int getStateOrdinal() { + return mState.ordinal(); + } + public void setState(State state) { mState = state; if (state.ordinal() <= State.CONNECTED.ordinal()) { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java index fbb9a5c38..3c9fec7a5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceCandidate.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceCandidate.java index d25449129..9ee97935b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceCandidate.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceCandidate.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java index 1df97bb7a..0c032be96 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2017 Alberto, Andreas Shimokawa, Carsten Pfeiffer, - Frank Slezak, ivanovlev, Julien Pivotto, Kasha, Steffen Liebergeld +/* Copyright (C) 2015-2018 Alberto, Andreas Shimokawa, Carsten Pfeiffer, + criogenic, Frank Slezak, ivanovlev, Julien Pivotto, Kasha, Steffen Liebergeld This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBSummaryOfDay.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBSummaryOfDay.java index 7ccdb387c..9896848ce 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBSummaryOfDay.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBSummaryOfDay.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer +/* Copyright (C) 2015-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmount.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmount.java index 650fb793e..4c60a316f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmount.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmount.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmounts.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmounts.java index 672a01af3..1e047daab 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmounts.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmounts.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer +/* Copyright (C) 2015-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java index 2a42f93f9..774bde62d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java index 35ae57872..d862aa442 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java index 3a886d371..9f94f5ea4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2016-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java index 260cde810..f977ca14a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer +/* Copyright (C) 2015-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java index 3b2f41044..b71fd4265 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java @@ -1,5 +1,6 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, AnthonyDiGirolamo, Daniele - Gobbetti, Frank Slezak, Kaz Wolfe, Kevin Richter +/* Copyright (C) 2016-2018 Andreas Shimokawa, AnthonyDiGirolamo, Daniele + Gobbetti, Frank Slezak, Kaz Wolfe, Kevin Richter, Lukas Veneziano, michaelneu, + NotAFIle, Tomas Radej This file is part of Gadgetbridge. @@ -76,6 +77,12 @@ public class AppNotificationType extends HashMap { // Threema put("ch.threema.app", NotificationType.THREEMA); + // Kontalk + put("org.kontalk", NotificationType.KONTALK); + + // Antox + put("chat.tox.antox", NotificationType.ANTOX); + // Twitter put("org.mariotaku.twidere", NotificationType.TWITTER); put("com.twitter.android", NotificationType.TWITTER); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryState.java index 922dfb2f2..346612a43 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryState.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryState.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Daniele Gobbetti +/* Copyright (C) 2015-2018 Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEventSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEventSpec.java index b67af12f3..d03859acb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEventSpec.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEventSpec.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2016-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEvents.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEvents.java index a3b3e2ea9..e882af658 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEvents.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEvents.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Daniel Hauck This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CallSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CallSpec.java index df916457b..69f569d11 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CallSpec.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CallSpec.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CannedMessagesSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CannedMessagesSpec.java index 30d3da65c..173d46101 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CannedMessagesSpec.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CannedMessagesSpec.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java index 1e68558c5..5f6617287 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Frank Slezak, +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Frank Slezak, ivanovlev, JohnnySun, Julien Pivotto, Kasha, Steffen Liebergeld This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java index b56551193..95943bf2e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, João Paulo Barraca, protomors, Quallenauge, Sami Alaoui +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, João Paulo Barraca, ladbsoft, protomors, Quallenauge, Sami Alaoui This file is part of Gadgetbridge. @@ -42,6 +42,7 @@ public enum DeviceType { EXRIZUK8(42, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_exrizu_k8), NO1F1(50, R.drawable.ic_device_hplus, R.drawable.ic_device_hplus_disabled, R.string.devicetype_no1_f1), TECLASTH30(60, R.drawable.ic_device_h30_h10, R.drawable.ic_device_h30_h10_disabled, R.string.devicetype_teclast_h30), + XWATCH(70, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_xwatch), TEST(1000, R.drawable.ic_device_default, R.drawable.ic_device_default_disabled, R.string.devicetype_test); private final int key; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GenericItem.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GenericItem.java index 375bc51c3..bc050b5b6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GenericItem.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GenericItem.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer +/* Copyright (C) 2015-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ItemWithDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ItemWithDetails.java index 34b743adb..aeb08786b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ItemWithDetails.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ItemWithDetails.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Measurement.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Measurement.java index e90d02b34..aeca5a0c5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Measurement.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Measurement.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicSpec.java index 0e97db841..c0a7d3285 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicSpec.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicSpec.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicStateSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicStateSpec.java index 466e61986..286fdf4cb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicStateSpec.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicStateSpec.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Avamander, Carsten Pfeiffer, +/* Copyright (C) 2016-2018 Andreas Shimokawa, Avamander, Carsten Pfeiffer, Daniele Gobbetti, Steffen Liebergeld This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationSpec.java index b2d624774..7d0ff891f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationSpec.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationSpec.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Frank Slezak +/* Copyright (C) 2015-2018 Andreas Shimokawa, Frank Slezak This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java index 64fcd3e16..c35f1bb93 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java @@ -1,5 +1,6 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, AnthonyDiGirolamo, Carsten - Pfeiffer, Frank Slezak, Julien Pivotto, Kaz Wolfe, Kevin Richter +/* Copyright (C) 2015-2018 Andreas Shimokawa, AnthonyDiGirolamo, Carsten + Pfeiffer, Daniele Gobbetti, Frank Slezak, Julien Pivotto, Kaz Wolfe, Kevin + Richter, Lukas Veneziano This file is part of Gadgetbridge. @@ -59,6 +60,8 @@ public enum NotificationType { SNAPCHAT(PebbleIconID.NOTIFICATION_SNAPCHAT, PebbleColor.Icterine), TELEGRAM(PebbleIconID.NOTIFICATION_TELEGRAM, PebbleColor.VividCerulean), THREEMA(PebbleIconID.NOTIFICATION_HIPCHAT, PebbleColor.JaegerGreen), + KONTALK(PebbleIconID.NOTIFICATION_HIPCHAT, PebbleColor.JaegerGreen), + ANTOX(PebbleIconID.NOTIFICATION_HIPCHAT, PebbleColor.JaegerGreen), TRANSIT(PebbleIconID.LOCATION, PebbleColor.JaegerGreen), TWITTER(PebbleIconID.NOTIFICATION_TWITTER, PebbleColor.BlueMoon), VIBER(PebbleIconID.NOTIFICATION_VIBER, PebbleColor.VividViolet), @@ -104,6 +107,8 @@ public enum NotificationType { case SIGNAL: case TELEGRAM: case THREEMA: + case KONTALK: + case ANTOX: case WHATSAPP: case GOOGLE_MESSENGER: case GOOGLE_HANGOUTS: diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SummaryOfDay.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SummaryOfDay.java index 9e7be7db3..39ad55478 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SummaryOfDay.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SummaryOfDay.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer +/* Copyright (C) 2015-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TimeStamped.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TimeStamped.java index 0fe0002c5..6ffeb865b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TimeStamped.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TimeStamped.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ValidByDate.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ValidByDate.java index bb800c343..482974914 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ValidByDate.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ValidByDate.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Weather.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Weather.java index a029c53ed..6159be3a6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Weather.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Weather.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2016-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeatherSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeatherSpec.java index 5f84eb423..385cb6a2b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeatherSpec.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeatherSpec.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java index 33667b29d..615154d03 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java index 0215568d0..5547e291f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Avamander, Carsten Pfeiffer, +/* Copyright (C) 2015-2018 Andreas Shimokawa, Avamander, Carsten Pfeiffer, Daniele Gobbetti, Daniel Hauck, Frank Slezak, ivanovlev, João Paulo Barraca, Julien Pivotto, Kasha, Sergey Trofimov, Steffen Liebergeld, Uwe Hermann diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupport.java index 087019ccc..9f23f9093 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java index 8c5a1acc9..d7e0dedb2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java @@ -1,6 +1,6 @@ -/* Copyright (C) 2015-2017 0nse, Andreas Shimokawa, Carsten Pfeiffer, - Daniele Gobbetti, João Paulo Barraca, protomors, Quallenauge, Sami Alaoui, - Sergey Trofimov +/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, + Daniele Gobbetti, João Paulo Barraca, ladbsoft, protomors, Quallenauge, + Sami Alaoui, Sergey Trofimov This file is part of Gadgetbridge. @@ -39,6 +39,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.PebbleSupport import nodomain.freeyourgadget.gadgetbridge.service.devices.vibratissimo.VibratissimoSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.hplus.HPlusSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.jyou.TeclastH30Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.xwatch.XWatchSupport; import nodomain.freeyourgadget.gadgetbridge.util.GB; public class DeviceSupportFactory { @@ -141,6 +142,8 @@ public class DeviceSupportFactory { case TECLASTH30: deviceSupport = new ServiceDeviceSupport(new TeclastH30Support(), EnumSet.of(ServiceDeviceSupport.Flags.BUSY_CHECKING)); break; + case XWATCH: + deviceSupport = new ServiceDeviceSupport(new XWatchSupport(), EnumSet.of(ServiceDeviceSupport.Flags.BUSY_CHECKING)); } if (deviceSupport != null) { deviceSupport.setContext(gbDevice, mBtAdapter, mContext); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/NotificationCollectorMonitorService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/NotificationCollectorMonitorService.java index a88e340f6..f0fd333f0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/NotificationCollectorMonitorService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/NotificationCollectorMonitorService.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Daniele Gobbetti +/* Copyright (C) 2017-2018 Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java index de27c6037..8a8fd2934 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Julien Pivotto, Kasha, Steffen Liebergeld This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btclassic/BtClassicIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btclassic/BtClassicIoThread.java index 08bf2fe7e..5724bdfba 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btclassic/BtClassicIoThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btclassic/BtClassicIoThread.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2016-2018 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java index 7b1707b10..e7f157dfe 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, JohnnySun This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEOperation.java index 7d9761961..5dc29645f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractGattCallback.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractGattCallback.java index ec76decb1..f09314a88 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractGattCallback.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractGattCallback.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer +/* Copyright (C) 2015-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BLETypeConversions.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BLETypeConversions.java index c5a41aad1..55ecb9dcc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BLETypeConversions.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BLETypeConversions.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Lukas Veneziano This file is part of Gadgetbridge. @@ -328,6 +329,8 @@ public class BLETypeConversions { case SNAPCHAT: case TELEGRAM: case THREEMA: + case KONTALK: + case ANTOX: case TWITTER: case WHATSAPP: case VIBER: diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BTLEOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BTLEOperation.java index 867e9c516..779e9f5a4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BTLEOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BTLEOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java index c27fb3e73..7a1728e13 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, João +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, João Paulo Barraca, JohnnySun This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEAction.java index 1c502e61f..6ca33af52 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java index 6d864c504..1f2cb4d34 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Sergey Trofimov, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCharacteristic.java index 07d05e3cf..6e882ff77 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCharacteristic.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCharacteristic.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2015-2018 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattDescriptor.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattDescriptor.java index 0306d5b55..4f17540c4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattDescriptor.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Daniele Gobbetti +/* Copyright (C) 2015-2018 Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattService.java index ba2d456bb..60d468e22 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattService.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2015-2018 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/Transaction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/Transaction.java index edd747cb4..b1c22dc0d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/Transaction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/Transaction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java index 2d8715930..cef217495 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbortTransactionAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbortTransactionAction.java index 7d8469299..f83daabaf 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbortTransactionAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbortTransactionAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/CheckInitializedAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/CheckInitializedAction.java index 71b914000..319cfb1ac 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/CheckInitializedAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/CheckInitializedAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ConditionalWriteAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ConditionalWriteAction.java index 2efa240c4..71c3c3c9a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ConditionalWriteAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ConditionalWriteAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/NotifyAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/NotifyAction.java index e31cdb3ed..4ddc45468 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/NotifyAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/NotifyAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/PlainAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/PlainAction.java index ba7943d33..ab09bf9bd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/PlainAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/PlainAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ReadAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ReadAction.java index f562bfb0c..c0984d1f5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ReadAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ReadAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceBusyAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceBusyAction.java index 220ad1d5c..733e97009 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceBusyAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceBusyAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceStateAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceStateAction.java index 70e667839..f6d1937ed 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceStateAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceStateAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetProgressAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetProgressAction.java index 8812ade67..cbb476c76 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetProgressAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetProgressAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WaitAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WaitAction.java index 891bf2394..edfe25158 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WaitAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WaitAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WriteAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WriteAction.java index c152a3d9d..1d21315d8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WriteAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WriteAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/AbstractBleProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/AbstractBleProfile.java index 8a88b4647..4f2aa823d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/AbstractBleProfile.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/AbstractBleProfile.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/ValueDecoder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/ValueDecoder.java index f5fd359c0..c5bb0531d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/ValueDecoder.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/ValueDecoder.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertCategory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertCategory.java index 4556e4b3a..53ac4f095 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertCategory.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertCategory.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertLevel.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertLevel.java index f2658fe63..f59885afd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertLevel.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertLevel.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationControl.java index ebb111ae1..051901717 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationControl.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationControl.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationProfile.java index 1032fb242..104f18c2b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationProfile.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationProfile.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertStatus.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertStatus.java index 218cc7c4c..84c04efac 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertStatus.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertStatus.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/Command.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/Command.java index e7d4021db..1fdb01779 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/Command.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/Command.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Carsten Pfeiffer +/* Copyright (C) 2017-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/NewAlert.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/NewAlert.java index f61ebc063..003dc2285 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/NewAlert.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/NewAlert.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/OverflowStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/OverflowStrategy.java index b3b6100ac..f15ba4cb1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/OverflowStrategy.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/OverflowStrategy.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Carsten Pfeiffer +/* Copyright (C) 2017-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/SupportedNewAlertCategory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/SupportedNewAlertCategory.java index d8449298e..ccecc68b3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/SupportedNewAlertCategory.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/SupportedNewAlertCategory.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer, Uwe Hermann +/* Copyright (C) 2016-2018 Carsten Pfeiffer, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfo.java index 67a1305d9..8f17dbc28 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfoProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfoProfile.java index 09b5cb884..2649e2acb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfoProfile.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfoProfile.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfo.java index 0f996c717..c3712c3f0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfoProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfoProfile.java index 92514d71a..1ff7a4fc7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfoProfile.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfoProfile.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/BodySensorLocation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/BodySensorLocation.java index a779c8fa8..5963667f6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/BodySensorLocation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/BodySensorLocation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer, Uwe Hermann +/* Copyright (C) 2016-2018 Carsten Pfeiffer, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/HeartRateProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/HeartRateProfile.java index 43b437759..841c09603 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/HeartRateProfile.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/HeartRateProfile.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipFirmwareInfo.java index 34d3c9dde..1045522b7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipFirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. @@ -93,6 +93,7 @@ public class AmazfitBipFirmwareInfo extends HuamiFirmwareInfo { crcToVersion.put(30229, "0.1.0.45"); crcToVersion.put(24302, "0.1.0.70"); crcToVersion.put(1333, "0.1.0.80"); + crcToVersion.put(12017, "0.1.0.86"); // resources crcToVersion.put(12586, "0.0.8.74"); @@ -106,8 +107,8 @@ public class AmazfitBipFirmwareInfo extends HuamiFirmwareInfo { crcToVersion.put(5650, "0.1.0.33"); crcToVersion.put(16117, "0.1.0.39-0.1.0.45"); crcToVersion.put(22506, "0.1.0.66-0.1.0.70"); - crcToVersion.put(22506, "0.1.0.66-0.1.0.70"); crcToVersion.put(42264, "0.1.0.77-0.1.0.80"); + crcToVersion.put(55934, "0.1.0.86-0.1.0.89"); // gps crcToVersion.put(61520, "9367,8f79a91,0,0,"); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipSupport.java index ca069ea5f..ea8a1a2ff 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipTextNotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipTextNotificationStrategy.java index 866f2f30b..95c310a12 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipTextNotificationStrategy.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipTextNotificationStrategy.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa +/* Copyright (C) 2017-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/operations/AmazfitBipFetchLogsOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/operations/AmazfitBipFetchLogsOperation.java index 2c7e3fed2..61fcd0eca 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/operations/AmazfitBipFetchLogsOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/operations/AmazfitBipFetchLogsOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa +/* Copyright (C) 2017-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/common/SimpleNotification.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/common/SimpleNotification.java index 0d01c1aba..2ac36e5b8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/common/SimpleNotification.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/common/SimpleNotification.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecord.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecord.java index 4d9b80f04..afa36e7a1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecord.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecord.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 João Paulo Barraca +/* Copyright (C) 2017-2018 João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySlot.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySlot.java index 28d034d5d..d5122d1e2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySlot.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySlot.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, João Paulo Barraca +/* Copyright (C) 2017-2018 Andreas Shimokawa, João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySummary.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySummary.java index dfc0cc971..d4c2ae374 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySummary.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySummary.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 João Paulo Barraca +/* Copyright (C) 2017-2018 João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordRealtime.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordRealtime.java index 4f8e4f9b1..44d675ef5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordRealtime.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordRealtime.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 João Paulo Barraca +/* Copyright (C) 2017-2018 João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordSleep.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordSleep.java index c453a2cea..238e4e50a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordSleep.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordSleep.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 João Paulo Barraca +/* Copyright (C) 2017-2018 João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java index 14a0e388c..24dc952bc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 João Paulo Barraca +/* Copyright (C) 2017-2018 João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java index ebbc481cd..7dacb2104 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Alberto, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2016-2018 Alberto, Andreas Shimokawa, Carsten Pfeiffer, ivanovlev, João Paulo Barraca, Pavel Motyrev, Quallenauge This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiDeviceEvent.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiDeviceEvent.java index 7a643eacf..9f76582a9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiDeviceEvent.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiDeviceEvent.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareInfo.java index 605da25f5..b1ddc33ab 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa +/* Copyright (C) 2017-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareType.java index fddb3b477..c6253d535 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareType.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiIcon.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiIcon.java index de6ddfe6b..9803e7791 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiIcon.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiIcon.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2017 Andreas Shimokawa +/* Copyright (C) 2017-2018 Andreas Shimokawa, Daniele Gobbetti, Lukas + Veneziano This file is part of Gadgetbridge. @@ -67,6 +68,8 @@ public class HuamiIcon { case CONVERSATIONS: case RIOT: case HIPCHAT: + case KONTALK: + case ANTOX: return WECHAT; case GENERIC_EMAIL: case GMAIL: diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorFirmwareInfo.java index 9995ef059..70c0e80bb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorFirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa +/* Copyright (C) 2017-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorSupport.java index 8481ff835..c6868a9e2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/TeclastH30Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/TeclastH30Support.java index dd523f9f3..59d356a96 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/TeclastH30Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/TeclastH30Support.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Sami Alaoui +/* Copyright (C) 2017-2018 Andreas Shimokawa, Sami Alaoui This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewIoThread.java index a823c5d6e..fc86275c7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewIoThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewIoThread.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2016-2018 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewProtocol.java index 3537efc64..8c29a7917 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewProtocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewProtocol.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Daniele Gobbetti +/* Copyright (C) 2016-2018 Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewSupport.java index 898a0b811..b63cdd629 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2016-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractInfo.java index c4fed4314..0c53d3b4a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer +/* Copyright (C) 2015-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1FirmwareInfo.java index 5a4028372..63579850b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1FirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1SFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1SFirmwareInfo.java index 16d63fe6e..88a67cb46 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1SFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1SFirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMiFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMiFirmwareInfo.java index cca5c9140..79a49e340 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMiFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMiFirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java index dc25f9838..bd9e83062 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CheckAuthenticationNeededAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CheckAuthenticationNeededAction.java index 82fe63f60..76afe6a67 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CheckAuthenticationNeededAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CheckAuthenticationNeededAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CompositeMiFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CompositeMiFirmwareInfo.java index 297b64eea..e57f678af 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CompositeMiFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CompositeMiFirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java index 090c97b5d..27dfed54f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Sergey Trofimov This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1AFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1AFirmwareInfo.java index e92eaa99a..bbd5f829a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1AFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1AFirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1FirmwareInfo.java index 236f55406..0e98b7a7d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1FirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfo.java index dd27d0016..b07006542 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW1.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW1.java index c3018b4ec..0e8dca05a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW1.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW1.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW2.java index 2fb9b348c..7869b29b8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW2.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW2.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java index 94839f37a..6ed15eed6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, atkyritsis, Carsten Pfeiffer, +/* Copyright (C) 2015-2018 Andreas Shimokawa, atkyritsis, Carsten Pfeiffer, Christian Fischer, Daniele Gobbetti, freezed-or-frozen, JohnnySun, Julien Pivotto, Kasha, Sergey Trofimov, Steffen Liebergeld diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NoNotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NoNotificationStrategy.java index 32054d357..1e4e0cd04 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NoNotificationStrategy.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NoNotificationStrategy.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2015-2018 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NotificationStrategy.java index 896b349cd..40b2cbcff 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NotificationStrategy.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NotificationStrategy.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer +/* Copyright (C) 2015-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/RealtimeSamplesSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/RealtimeSamplesSupport.java index 36c42a956..dd88b69de 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/RealtimeSamplesSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/RealtimeSamplesSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/TestMi1AFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/TestMi1AFirmwareInfo.java index 9c5a791f8..559fcbdab 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/TestMi1AFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/TestMi1AFirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V1NotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V1NotificationStrategy.java index 30a4e1866..de27197d6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V1NotificationStrategy.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V1NotificationStrategy.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer +/* Copyright (C) 2015-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V2NotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V2NotificationStrategy.java index 865b30d2e..e9dc0a49d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V2NotificationStrategy.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V2NotificationStrategy.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer +/* Copyright (C) 2015-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBand1Operation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBand1Operation.java index cec4e9a41..1ad53e1ff 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBand1Operation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBand1Operation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBandOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBandOperation.java index 4dacf9fb0..72ec8e8a2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBandOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBandOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java index 6aaded69c..a09601cdb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/OperationStatus.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/OperationStatus.java index ad0f9f36e..4681d31bd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/OperationStatus.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/OperationStatus.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/UpdateFirmwareOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/UpdateFirmwareOperation.java index d00e1e005..3fb097633 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/UpdateFirmwareOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/UpdateFirmwareOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/AbstractMiBand2Operation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/AbstractMiBand2Operation.java index 67e8ec0a0..d2f7724b9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/AbstractMiBand2Operation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/AbstractMiBand2Operation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/BatteryInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/BatteryInfo.java index a33988bb0..0b184eff1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/BatteryInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/BatteryInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/Mi2FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/Mi2FirmwareInfo.java index 0c1670eb3..fc318547d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/Mi2FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/Mi2FirmwareInfo.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Davis + Mosenkovs This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/Mi2NotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/Mi2NotificationStrategy.java index 4ec7471f1..08288ba37 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/Mi2NotificationStrategy.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/Mi2NotificationStrategy.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. @@ -37,24 +37,19 @@ public class Mi2NotificationStrategy extends V2NotificationStrategy 0) { + short vibration = (short) vibrationProfile.getOnOffSequence()[0]; + short pause = (short) vibrationProfile.getOnOffSequence()[1]; + int duration = (vibration + pause) * repeat; + builder.write(alert, new byte[]{-1, (byte) (vibration & 255), (byte) (vibration >> 8 & 255), (byte) (pause & 255), (byte) (pause >> 8 & 255), repeat}); + builder.wait(duration); + } - if (++j < onOffSequence.length) { - int off = Math.max(onOffSequence[j], 25); // wait at least 25ms - builder.wait(off); - } - - if (extraAction != null) { - builder.add(extraAction); - } - } + if (extraAction != null) { + builder.add(extraAction); } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/Mi2TextNotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/Mi2TextNotificationStrategy.java index 17e774776..8f4f6f201 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/Mi2TextNotificationStrategy.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/Mi2TextNotificationStrategy.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java index 4c8b5df0e..324b8631e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/MiBand2Support.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Christian +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Christian Fischer, Daniele Gobbetti, JohnnySun, José Rebelo, Julien Pivotto, Kasha, Michal Novotny, Sergey Trofimov, Steffen Liebergeld diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/actions/StopNotificationAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/actions/StopNotificationAction.java index 8b33a4186..9c0385275 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/actions/StopNotificationAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/actions/StopNotificationAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Carsten Pfeiffer +/* Copyright (C) 2017-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/AbstractFetchOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/AbstractFetchOperation.java index ca08c2429..dcad7583e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/AbstractFetchOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/AbstractFetchOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchActivityOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchActivityOperation.java index 91c008b51..2d11799e4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchActivityOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchActivityOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchSportsSummaryOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchSportsSummaryOperation.java index 60a9c5039..ffa69729d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchSportsSummaryOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/FetchSportsSummaryOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/InitOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/InitOperation.java index e1a5bd7ce..f5b95820a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/InitOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/InitOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/UpdateFirmwareOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/UpdateFirmwareOperation.java index 8647880e8..d8e9abf3e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/UpdateFirmwareOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband2/operations/UpdateFirmwareOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/no1f1/No1F1Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/no1f1/No1F1Support.java index 55b1a036c..1df30c4f9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/no1f1/No1F1Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/no1f1/No1F1Support.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Daniele Gobbetti, protomors +/* Copyright (C) 2017-2018 Andreas Shimokawa, Daniele Gobbetti, protomors This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java index f43407c35..f385908aa 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerGBPebble.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerGBPebble.java index 74d751158..033205900 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerGBPebble.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerGBPebble.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerHealthify.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerHealthify.java index c4d8b692d..14c3e8cf4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerHealthify.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerHealthify.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMarioTime.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMarioTime.java index aa776388f..4bf12143e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMarioTime.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMarioTime.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMisfit.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMisfit.java index 3b824a640..8cb570b40 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMisfit.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMisfit.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMorpheuz.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMorpheuz.java index b97ad3563..3934558c6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMorpheuz.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMorpheuz.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerObsidian.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerObsidian.java index adbf89a2f..0f81b14cf 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerObsidian.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerObsidian.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2015-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerPebStyle.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerPebStyle.java index cd60ccff1..799312144 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerPebStyle.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerPebStyle.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Daniele Gobbetti, Uwe Hermann +/* Copyright (C) 2015-2018 Andreas Shimokawa, Daniele Gobbetti, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSimplyLight.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSimplyLight.java new file mode 100644 index 000000000..0836ee5d5 --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSimplyLight.java @@ -0,0 +1,139 @@ +/* Copyright (C) 2016-2018 Andreas Shimokawa, Sergio Lopez + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ +package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble; + +import android.util.Pair; +import android.widget.Toast; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.UUID; + +import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent; +import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes; +import nodomain.freeyourgadget.gadgetbridge.model.Weather; +import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec; +import nodomain.freeyourgadget.gadgetbridge.util.GB; + +class AppMessageHandlerSimplyLight extends AppMessageHandler { + private static final int CLEAR = 0; + private static final int CLOUDY = 1; + private static final int FOG = 2; + private static final int LIGHT_RAIN = 3; + private static final int RAIN = 4; + private static final int THUNDERSTORM = 5; + private static final int SNOW = 6; + private static final int HAIL = 7; + private static final int WIND = 8; + private static final int EXTREME_WIND = 9; + private static final int TORNADO = 10; + private static final int HURRICANE = 11; + private static final int EXTREME_COLD = 12; + private static final int EXTREME_HEAT = 13; + private static final int SNOW_THUNDERSTORM = 14; + + private Integer KEY_TEMPERATURE; + private Integer KEY_CONDITION; + private Integer KEY_ERR; + + AppMessageHandlerSimplyLight(UUID uuid, PebbleProtocol pebbleProtocol) { + super(uuid, pebbleProtocol); + + try { + JSONObject appKeys = getAppKeys(); + KEY_TEMPERATURE = appKeys.getInt("temperature"); + KEY_CONDITION = appKeys.getInt("condition"); + KEY_ERR = appKeys.getInt("err"); + } catch (JSONException e) { + GB.toast("There was an error accessing the Simply Light watchface configuration.", Toast.LENGTH_LONG, GB.ERROR); + } catch (IOException ignore) { + } + } + + +private int getConditionForConditionCode(int conditionCode) { + if (conditionCode == 800 || conditionCode == 951) { + return CLEAR; + } else if (conditionCode > 800 && conditionCode < 900) { + return CLOUDY; + } else if (conditionCode >= 700 && conditionCode < 800) { + return FOG; + } else if (conditionCode >= 300 && conditionCode < 400) { + return LIGHT_RAIN; + } else if (conditionCode >= 500 && conditionCode < 600) { + return RAIN; + } else if (conditionCode >= 200 && conditionCode < 300) { + return THUNDERSTORM; + } else if (conditionCode >= 600 && conditionCode < 700) { + return SNOW; + } else if (conditionCode == 906) { + return HAIL; + } else if (conditionCode >= 907 && conditionCode < 957) { + return WIND; + } else if (conditionCode == 905 || (conditionCode >= 957 && conditionCode < 900)) { + return EXTREME_WIND; + } else if (conditionCode == 900) { + return TORNADO; + } else if (conditionCode == 901 || conditionCode == 902 || conditionCode == 962) { + return HURRICANE; + } else if (conditionCode == 903) { + return EXTREME_COLD; + } else if (conditionCode == 904) { + return EXTREME_HEAT; + } + + return 0; + } + + private byte[] encodeSimplyLightWeatherMessage(WeatherSpec weatherSpec) { + if (weatherSpec == null) { + return null; + } + + ArrayList> pairs = new ArrayList<>(2); + pairs.add(new Pair<>(KEY_TEMPERATURE, (Object) (weatherSpec.currentTemp - 273))); + pairs.add(new Pair<>(KEY_CONDITION, (Object) (getConditionForConditionCode(weatherSpec.currentConditionCode)))); + pairs.add(new Pair<>(KEY_ERR, (Object) 0)); + byte[] weatherMessage = mPebbleProtocol.encodeApplicationMessagePush(PebbleProtocol.ENDPOINT_APPLICATIONMESSAGE, mUUID, pairs, null); + + ByteBuffer buf = ByteBuffer.allocate(weatherMessage.length); + + buf.put(weatherMessage); + + return buf.array(); + } + + @Override + public GBDeviceEvent[] onAppStart() { + WeatherSpec weatherSpec = Weather.getInstance().getWeatherSpec(); + if (weatherSpec == null) { + return new GBDeviceEvent[]{null}; + } + GBDeviceEventSendBytes sendBytes = new GBDeviceEventSendBytes(); + sendBytes.encodedBytes = encodeSimplyLightWeatherMessage(weatherSpec); + return new GBDeviceEvent[]{sendBytes}; + } + + @Override + public byte[] encodeUpdateWeather(WeatherSpec weatherSpec) { + return encodeSimplyLightWeatherMessage(weatherSpec); + } +} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSquare.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSquare.java index 1c5fd489f..fb203c76b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSquare.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSquare.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2016-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTimeStylePebble.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTimeStylePebble.java index b31241ab4..6a8106baf 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTimeStylePebble.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTimeStylePebble.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2015-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTrekVolle.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTrekVolle.java index e00b2c5fd..873585b0d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTrekVolle.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTrekVolle.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa +/* Copyright (C) 2017-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerZalewszczak.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerZalewszczak.java index 2c48ce707..67fd562bd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerZalewszczak.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerZalewszczak.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSession.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSession.java index a5fdd1d44..d1a616ac2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSession.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSession.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionAnalytics.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionAnalytics.java index 35ece6461..b9c483f50 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionAnalytics.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionAnalytics.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthHR.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthHR.java index 82146827a..2ff8e58c5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthHR.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthHR.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthOverlayData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthOverlayData.java index ac1a1d811..60dcde346 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthOverlayData.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthOverlayData.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSleep.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSleep.java index 882302d0a..2c575b9b0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSleep.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSleep.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2016-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSteps.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSteps.java index 2c033eff4..f194201a4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSteps.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSteps.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2016-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionPebbleHealth.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionPebbleHealth.java index 89fbf288b..34e0ec902 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionPebbleHealth.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionPebbleHealth.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java index 453e09c51..d7afa5043 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Julien Pivotto, Uwe Hermann This file is part of Gadgetbridge. @@ -124,7 +124,7 @@ class PebbleIoThread extends GBDeviceIoThread { jsEvent = "appmessage"; } - final String appMessage = PebbleUtils.parseIncomingAppMessage(message.message, message.appUUID); + final String appMessage = PebbleUtils.parseIncomingAppMessage(message.message, message.appUUID, message.id); LOG.debug("to WEBVIEW: event: " + jsEvent + " message: " + appMessage); WebViewSingleton.invokeWebview(new WebViewSingleton.WebViewRunnable() { @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java index 3119a6a55..8b0d85fc1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa +/* Copyright (C) 2017-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java index f061a7b2e..e0bc369e0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Frank Slezak, Julien Pivotto, Kevin Richter, Steffen Liebergeld, Uwe Hermann @@ -394,6 +394,7 @@ public class PebbleProtocol extends GBDeviceProtocol { private static final UUID UUID_ZALEWSZCZAK_FANCY = UUID.fromString("014e17bf-5878-4781-8be1-8ef998cee1ba"); private static final UUID UUID_ZALEWSZCZAK_TALLY = UUID.fromString("abb51965-52e2-440a-b93c-843eeacb697d"); private static final UUID UUID_OBSIDIAN = UUID.fromString("ef42caba-0c65-4879-ab23-edd2bde68824"); + private static final UUID UUID_SIMPLY_LIGHT = UUID.fromString("04a6e68a-42d6-4738-87b2-1c80a994dee4"); private static final UUID UUID_ZERO = new UUID(0, 0); @@ -419,6 +420,7 @@ public class PebbleProtocol extends GBDeviceProtocol { mAppMessageHandlers.put(UUID_ZALEWSZCZAK_TALLY, new AppMessageHandlerZalewszczak(UUID_ZALEWSZCZAK_TALLY, PebbleProtocol.this)); mAppMessageHandlers.put(UUID_OBSIDIAN, new AppMessageHandlerObsidian(UUID_OBSIDIAN, PebbleProtocol.this)); mAppMessageHandlers.put(UUID_GBPEBBLE, new AppMessageHandlerGBPebble(UUID_GBPEBBLE, PebbleProtocol.this)); + mAppMessageHandlers.put(UUID_SIMPLY_LIGHT, new AppMessageHandlerSimplyLight(UUID_SIMPLY_LIGHT, PebbleProtocol.this)); } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java index 112231ce3..c3d4f30cc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Kasha, Steffen Liebergeld This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTClient.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTClient.java index cea21d198..5b1b76e91 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTClient.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTClient.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa +/* Copyright (C) 2016-2018 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTServer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTServer.java index 9787c4689..30b366b99 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTServer.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTServer.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Daniele Gobbetti, Uwe Hermann +/* Copyright (C) 2016-2018 Andreas Shimokawa, Daniele Gobbetti, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleLESupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleLESupport.java index 4e0b64ed0..098d139d7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleLESupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleLESupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2016-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/CurrentPosition.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/CurrentPosition.java index 89efb96d4..fc125b003 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/CurrentPosition.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/CurrentPosition.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Daniele Gobbetti +/* Copyright (C) 2017-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBChromeClient.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBChromeClient.java index 7981447a3..55294501b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBChromeClient.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBChromeClient.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Daniele Gobbetti +/* Copyright (C) 2017-2018 Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBWebClient.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBWebClient.java index fcfb020cd..a41dee6a7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBWebClient.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBWebClient.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Daniele Gobbetti +/* Copyright (C) 2017-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. @@ -85,7 +85,7 @@ public class GBWebClient extends WebViewClient { private WebResourceResponse mimicReply(Uri requestedUri) { if (requestedUri.getHost() != null && (StringUtils.indexOfAny(requestedUri.getHost(), AllowedDomains) != -1)) { - if (internetHelperBound) { + if (GBApplication.getGBPrefs().isBackgroundJsEnabled() && internetHelperBound) { LOG.debug("WEBVIEW forwarding request to the internet helper"); Bundle bundle = new Bundle(); bundle.putString("URL", requestedUri.toString()); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/JSInterface.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/JSInterface.java index e50606dbe..81eb49654 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/JSInterface.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/JSInterface.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2017 Daniele Gobbetti +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vibratissimo/VibratissimoSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vibratissimo/VibratissimoSupport.java index 17e02276a..70e1f8521 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vibratissimo/VibratissimoSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vibratissimo/VibratissimoSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xwatch/XWatchSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xwatch/XWatchSupport.java new file mode 100644 index 000000000..f7b351dd0 --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xwatch/XWatchSupport.java @@ -0,0 +1,572 @@ +/* Copyright (C) 2018 ladbsoft + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ +package nodomain.freeyourgadget.gadgetbridge.service.devices.xwatch; + +import android.bluetooth.BluetoothGatt; +import android.bluetooth.BluetoothGattCharacteristic; +import android.content.Context; +import android.media.AudioManager; +import android.net.Uri; +import android.view.KeyEvent; +import android.widget.Toast; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.UUID; + +import nodomain.freeyourgadget.gadgetbridge.GBApplication; +import nodomain.freeyourgadget.gadgetbridge.database.DBHandler; +import nodomain.freeyourgadget.gadgetbridge.database.DBHelper; +import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo; +import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider; +import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchSampleProvider; +import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchService; +import nodomain.freeyourgadget.gadgetbridge.entities.Device; +import nodomain.freeyourgadget.gadgetbridge.entities.User; +import nodomain.freeyourgadget.gadgetbridge.entities.XWatchActivitySample; +import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice.State; +import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind; +import nodomain.freeyourgadget.gadgetbridge.model.Alarm; +import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec; +import nodomain.freeyourgadget.gadgetbridge.model.CallSpec; +import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec; +import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec; +import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec; +import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec; +import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec; +import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport; +import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; +import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction; +import nodomain.freeyourgadget.gadgetbridge.service.devices.miband.DeviceInfo; +import nodomain.freeyourgadget.gadgetbridge.util.GB; + +public class XWatchSupport extends AbstractBTLEDeviceSupport { + private static final Logger LOG = LoggerFactory.getLogger(XWatchSupport.class); + private final GBDeviceEventVersionInfo versionCmd = new GBDeviceEventVersionInfo(); + TransactionBuilder builder = null; + private DeviceInfo mDeviceInfo; + private byte dayToFetch; //0 = Today; 1 = Yesterday ... + private byte maxDayToFetch; + long lastButtonTimestamp; + + public XWatchSupport() { + super(LOG); + + addSupportedService(XWatchService.UUID_SERVICE); + addSupportedService(XWatchService.UUID_WRITE); + addSupportedService(XWatchService.UUID_NOTIFY); + } + + public static byte[] crcChecksum(byte[] data) { + byte[] return_data = new byte[(data.length + 1)]; + byte checksum = 0; + + for (int i = 0; i < data.length; i++) { + return_data[i] = data[i]; + checksum += data[i]; + } + return_data[return_data.length - 1] = checksum; + + return return_data; + } + + @Override + protected TransactionBuilder initializeDevice(TransactionBuilder builder) { + builder.add(new SetDeviceStateAction(getDevice(), State.INITIALIZING, getContext())); + + enableNotifications(builder) + .setDateTime(builder) + .setInitialized(builder); + + return builder; + } + + /** + * Last action of initialization sequence. Sets the device to initialized. + * It is only invoked if all other actions were successfully run, so the device + * must be initialized, then. + * + * @param builder + */ + private void setInitialized(TransactionBuilder builder) { + builder.add(new SetDeviceStateAction(getDevice(), State.INITIALIZED, getContext())); + } + + @Override + public boolean useAutoConnect() { + return true; + } + + @Override + public boolean connectFirstTime() { + for (int i = 0; i < 5; i++) { + if (connect()) { + return true; + } + } + return false; + } + + private XWatchSupport setDateTime(TransactionBuilder builder) { + byte[] data; + + LOG.debug("Sending current date to the XWatch"); + BluetoothGattCharacteristic deviceData = getCharacteristic(XWatchService.UUID_WRITE); + + String time = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + String y = time.substring(2, 4); + String M = time.substring(4, 6); + String d = time.substring(6, 8); + String H = time.substring(8, 10); + String m = time.substring(10, 12); + String s = time.substring(12, 14); + System.out.println(y + ":" + M + ":" + d + ":" + H + ":" + m + ":" + time.substring(12, 14)); + + data = new byte[]{(byte) 1, + (byte) Integer.parseInt(y, 16), + (byte) Integer.parseInt(M, 16), + (byte) Integer.parseInt(d, 16), + (byte) Integer.parseInt(H, 16), + (byte) Integer.parseInt(m, 16), + (byte) Integer.parseInt(s, 16), + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0}; + + data = crcChecksum(data); + + builder.write(deviceData, data); + + return this; + } + + private XWatchSupport enableNotifications(TransactionBuilder builder) { + LOG.debug("Enabling action button"); + BluetoothGattCharacteristic deviceInfo = getCharacteristic(XWatchService.UUID_NOTIFY); + builder.notify(deviceInfo, true); + return this; + } + + @Override + public void onEnableHeartRateSleepSupport(boolean enable) { + //Not supported + } + + @Override + public void onAddCalendarEvent(CalendarEventSpec calendarEventSpec) { + // not supported + } + + @Override + public void onDeleteCalendarEvent(byte type, long id) { + // not supported + } + + @Override + public void onSetAlarms(ArrayList alarms) { + //TODO: Implement + } + + @Override + public void onNotification(NotificationSpec notificationSpec) { + //TODO: Implement + } + + @Override + public void onDeleteNotification(int id) { + //TODO: Implement + } + + @Override + public void onSetTime() { + try { + TransactionBuilder builder = performInitialized("Set date and time"); + setDateTime(builder); + builder.queue(getQueue()); + } catch (IOException ex) { + LOG.error("Unable to set time and date on XWatch device", ex); + } + } + + @Override + public void onSetCallState(CallSpec callSpec) { + //TODO: Implement (if necessary) + } + + @Override + public void onSetCannedMessages(CannedMessagesSpec cannedMessagesSpec) { + } + + @Override + public void onSetMusicState(MusicStateSpec stateSpec) { + // not supported + } + + @Override + public void onSetMusicInfo(MusicSpec musicSpec) { + // not supported + } + + @Override + public void onReboot() { + //Not supported + } + + @Override + public void onHeartRateTest() { + //Not supported + } + + @Override + public void onEnableRealtimeHeartRateMeasurement(boolean enable) { + //Not supported + } + + @Override + public void onFindDevice(boolean start) { + //TODO: Implement + } + + @Override + public void onSetConstantVibration(int intensity) { + //TODO: Implement + } + + @Override + public void onFetchActivityData() { + try { + if(builder == null) { + builder = performInitialized("fetchActivityData"); + } + requestSummarizedData(builder); + performConnected(builder.getTransaction()); + } catch (IOException e) { + GB.toast(getContext(), "Error fetching activity data: " + e.getLocalizedMessage(), Toast.LENGTH_LONG, GB.ERROR); + } + } + + @Override + public void onEnableRealtimeSteps(boolean enable) { + //Not supported + } + + @Override + public void onInstallApp(Uri uri) { + //Not supported + } + + @Override + public void onAppInfoReq() { + // not supported + } + + @Override + public void onAppStart(UUID uuid, boolean start) { + // not supported + } + + @Override + public void onAppDelete(UUID uuid) { + // not supported + } + + @Override + public void onAppReorder(UUID[] uuids) { + // not supported + } + + @Override + public void onScreenshotReq() { + // not supported + } + + @Override + public boolean onCharacteristicChanged(BluetoothGatt gatt, + BluetoothGattCharacteristic characteristic) { + super.onCharacteristicChanged(gatt, characteristic); + + UUID characteristicUUID = characteristic.getUuid(); + if (XWatchService.UUID_NOTIFY.equals(characteristicUUID)) { + byte[] data = characteristic.getValue(); + if (data[0] == XWatchService.COMMAND_ACTIVITY_TOTALS) { + handleSummarizedData(characteristic.getValue()); + } else if (data[0] == XWatchService.COMMAND_ACTIVITY_DATA) { + handleDetailedData(characteristic.getValue()); + } else if (data[0] == XWatchService.COMMAND_ACTION_BUTTON) { + handleButtonPressed(characteristic.getValue()); + } else if (data[0] == XWatchService.COMMAND_CONNECTED) { + handleDeviceInfo(data, BluetoothGatt.GATT_SUCCESS); + } else { + LOG.info("Handled characteristic with unknown data: " + characteristicUUID); + logMessageContent(characteristic.getValue()); + } + } else { + LOG.info("Unhandled characteristic changed: " + characteristicUUID); + logMessageContent(characteristic.getValue()); + } + return false; + } + + @Override + public boolean onCharacteristicRead(BluetoothGatt gatt, + BluetoothGattCharacteristic characteristic, int status) { + return super.onCharacteristicChanged(gatt, characteristic); + //TODO: Implement (if necessary) + } + + @Override + public boolean onCharacteristicWrite(BluetoothGatt gatt, + BluetoothGattCharacteristic characteristic, int status) { + return super.onCharacteristicWrite(gatt, characteristic, status); + //TODO: Implement (if necessary) + } + + public XWatchActivitySample createActivitySample(Device device, User user, int timestampInSeconds, SampleProvider provider) { + XWatchActivitySample sample = new XWatchActivitySample(); + sample.setDevice(device); + sample.setUser(user); + sample.setTimestamp(timestampInSeconds); + sample.setProvider(provider); + + return sample; + } + + private void handleDeviceInfo(byte[] value, int status) { + if (status == BluetoothGatt.GATT_SUCCESS) { + mDeviceInfo = new DeviceInfo(value); + LOG.warn("Device info: " + mDeviceInfo); + versionCmd.hwVersion = "1.0"; + versionCmd.fwVersion = "1.0"; + handleGBDeviceEvent(versionCmd); + } + } + + @Override + public void onSendConfiguration(String config) { + // nothing yet + } + + @Override + public void onTestNewFunction() { + //Not supported + } + + @Override + public void onSendWeather(WeatherSpec weatherSpec) { + //Not supported + } + + private void handleSummarizedData(byte[] value) { + int daysIntTotal; + int daysIntPart; + + if (value.length != 16) { + LOG.warn("GOT UNEXPECTED SENSOR DATA WITH LENGTH: " + value.length); + for (byte b : value) { + LOG.warn("DATA: " + String.format("0x%4x", b)); + } + } else { + daysIntPart = (value[1] & 255) << 24; + daysIntTotal = daysIntPart; + daysIntPart = (value[2] & 255) << 16; + daysIntTotal += daysIntPart; + daysIntPart = (value[3] & 255) << 8; + daysIntTotal += daysIntPart; + daysIntPart = (value[4] & 255); + daysIntTotal += daysIntPart; + + dayToFetch = 0; + maxDayToFetch = (byte) Integer.bitCount(daysIntTotal); + + try { + requestDetailedData(builder); + performConnected(builder.getTransaction()); + } catch (IOException e) { + GB.toast(getContext(), "Error fetching activity data: " + e.getLocalizedMessage(), Toast.LENGTH_LONG, GB.ERROR); + } + } + } + + private void handleDetailedData(byte[] value) { + int category, intensity, steps = 0; + + if (value.length != 16) { + LOG.warn("GOT UNEXPECTED SENSOR DATA WITH LENGTH: " + value.length); + for (byte b : value) { + LOG.warn("DATA: " + String.format("0x%4x", b)); + } + } else { + try (DBHandler dbHandler = GBApplication.acquireDB()) { + XWatchSampleProvider provider = new XWatchSampleProvider(getDevice(), dbHandler.getDaoSession()); + User user = DBHelper.getUser(dbHandler.getDaoSession()); + Device device = DBHelper.getDevice(getDevice(), dbHandler.getDaoSession()); + int timestampInSeconds = 0; + + timestampInSeconds = getTimestampFromData( + value[2], + value[3], + value[4], + value[5] + ); + + category = ActivityKind.TYPE_ACTIVITY; + intensity = (value[7] & 255) + ((value[8] & 255) << 8); + steps = (value[9] & 255) + ((value[10] & 255) << 8); + + XWatchActivitySample sample = createActivitySample(device, user, timestampInSeconds, provider); + sample.setRawIntensity(intensity); + sample.setSteps(steps); + sample.setRawKind(category); + + if (LOG.isDebugEnabled()) { + LOG.debug("sample: " + sample); + } + + provider.addGBActivitySample(sample); + + if (value[5] == 95) { + dayToFetch++; + if(dayToFetch <= maxDayToFetch) { + try { + builder = performInitialized("fetchActivityData"); + requestDetailedData(builder); + performConnected(builder.getTransaction()); + } catch (IOException e) { + GB.toast(getContext(), "Error fetching activity data: " + e.getLocalizedMessage(), Toast.LENGTH_LONG, GB.ERROR); + } + } + } + } catch (Exception ex) { + GB.toast(getContext(), ex.getMessage(), Toast.LENGTH_LONG, GB.ERROR, ex); + } + } + } + + private void handleButtonPressed(byte[] value) { + long currentTimestamp = System.currentTimeMillis(); + + AudioManager audioManager = (AudioManager)getContext().getSystemService(Context.AUDIO_SERVICE); + if(audioManager.isWiredHeadsetOn()) { + if (currentTimestamp - lastButtonTimestamp < 1000) { + if (audioManager.isMusicActive()) { + audioManager.dispatchMediaKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_NEXT)); + audioManager.dispatchMediaKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_NEXT)); + } else { + audioManager.dispatchMediaKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)); + audioManager.dispatchMediaKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)); + audioManager.dispatchMediaKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_NEXT)); + audioManager.dispatchMediaKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_NEXT)); + } + } else { + audioManager.dispatchMediaKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)); + audioManager.dispatchMediaKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)); + } + } + + lastButtonTimestamp = currentTimestamp; + } + + @Override + public void onAppConfiguration(UUID appUuid, String config, Integer id) { + //Not supported + } + + @Override + public void onSetHeartRateMeasurementInterval(int seconds) { + //Not supported + } + + private void requestSummarizedData(TransactionBuilder builder) { + byte[] fetch = new byte[]{(byte) XWatchService.COMMAND_ACTIVITY_TOTALS, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0}; + + fetch = XWatchSupport.crcChecksum(fetch); + builder.write(getCharacteristic(XWatchService.UUID_WRITE), fetch); + } + + private void requestDetailedData(TransactionBuilder builder) { + byte[] fetch = new byte[]{(byte) XWatchService.COMMAND_ACTIVITY_DATA, + (byte) dayToFetch, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0, + (byte) 0}; + + fetch = XWatchSupport.crcChecksum(fetch); + builder.write(getCharacteristic(XWatchService.UUID_WRITE), fetch); + } + + private int getTimestampFromData(byte year, byte month, byte day, byte hoursminutes) { + int timestamp = 0; + int yearInt, monthInt, dayInt, hoursMinutesInt = 0; + int hours, minutes = 0; + + yearInt = Integer.valueOf(String.format("%02x", year, 16)); + monthInt = Integer.valueOf(String.format("%02x", month, 16)); + dayInt = Integer.valueOf(String.format("%02x", day, 16)); + hoursMinutesInt = Integer.valueOf(String.format("%02x", hoursminutes), 16); + + minutes = hoursMinutesInt % 4; + hours = (hoursMinutesInt - minutes) / 4; + minutes = minutes * 15; + + GregorianCalendar cal = new GregorianCalendar( + 2000 + yearInt, + monthInt - 1, + dayInt, + hours, + minutes + ); + + timestamp = (int)(cal.getTimeInMillis() / 1000); + + return timestamp; + } +} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBCallControlReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBCallControlReceiver.java index 263ca85d8..bbee17b84 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBCallControlReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBCallControlReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java index 86fc8ac3a..a0f95ebe2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Gabe Schrecker This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java index 1adf9917a..35342a371 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Julien +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Julien Pivotto, Steffen Liebergeld This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceIoThread.java index 7276b280b..376509a83 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceIoThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceIoThread.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java index 8072b6827..5070ce8e6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Julien +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Julien Pivotto, Steffen Liebergeld This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java index 5a2afeb69..9c5afcb0d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Felix + Konstantin Maurer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ArrayUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ArrayUtils.java index e7350dae3..0bfbca0e5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ArrayUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ArrayUtils.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BitmapUtil.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BitmapUtil.java index 756ba8c4f..e83beaf10 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BitmapUtil.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BitmapUtil.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Frank Slezak +/* Copyright (C) 2017-2018 Frank Slezak This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CheckSums.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CheckSums.java index b3780bf2f..ba6a01b7f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CheckSums.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CheckSums.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Carsten Pfeiffer +/* Copyright (C) 2015-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java index b5c3f8ac7..7a43250d1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java index 8c600325f..01030d5e5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2017 0nse, Andreas Shimokawa, Carsten Pfeiffer, - Daniele Gobbetti, João Paulo Barraca, protomors, Quallenauge, Sami Alaoui +/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, João Paulo Barraca, ladbsoft, protomors, Quallenauge, Sami Alaoui This file is part of Gadgetbridge. @@ -53,6 +53,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.no1f1.No1F1Coordinator; import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PebbleCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.vibratissimo.VibratissimoCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator; import nodomain.freeyourgadget.gadgetbridge.entities.Device; import nodomain.freeyourgadget.gadgetbridge.entities.DeviceAttributes; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; @@ -203,6 +204,7 @@ public class DeviceHelper { result.add(new MakibesF68Coordinator()); result.add(new EXRIZUK8Coordinator()); result.add(new TeclastH30Coordinator()); + result.add(new XWatchCoordinator()); return result; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java index 090e191e1..5fb11e3c3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, JohnnySun +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Felix + Konstantin Maurer, JohnnySun This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java index e4305c53b..6a46277b4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, Uwe Hermann, Yar +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Felix Konstantin Maurer, TaaviE, Uwe Hermann, Yar This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java index 7561467bf..26ff7fea5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2016-2018 Carsten Pfeiffer, Daniele Gobbetti, Felix + Konstantin Maurer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ImportExportSharedPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ImportExportSharedPreferences.java index a4f75191b..029258459 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ImportExportSharedPreferences.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ImportExportSharedPreferences.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Alberto, Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2017-2018 Alberto, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/JavaExtensions.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/JavaExtensions.java index 2c0440eb6..9e192dcc3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/JavaExtensions.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/JavaExtensions.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 ivanovlev +/* Copyright (C) 2017-2018 ivanovlev This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LanguageUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LanguageUtils.java index 5e6522bfb..21246c436 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LanguageUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LanguageUtils.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2017 Andreas Shimokawa, ivanovlev, lazarosfs, McSym28, - Yaron Shahrabani +/* Copyright (C) 2017-2018 Andreas Shimokawa, Daniele Gobbetti, ivanovlev, + lazarosfs, McSym28, Ted Stein, Yaron Shahrabani This file is part of Gadgetbridge. @@ -68,7 +68,7 @@ public class LanguageUtils { put('د', "d"); put('ذ', "th"); put('ر', "r"); put('ز', "z"); put('س', "s"); put('ش', "sh"); put('ص', "9"); put('ض', "9'"); put('ط', "6"); put('ظ', "6'"); put('ع', "3"); put('غ', "3'"); put('ف', "f"); put('ق', "q"); put('ك', "k"); put('ل', "l"); put('م', "m"); put('ن', "n"); put('ه', "h"); - put('و', "w"); put('ي', "y"); put('ى', "a"); + put('و', "w"); put('ي', "y"); put('ى', "a"); put('ﺓ', ""); put('آ', "2"); put('ئ', "2"); put('إ', "2"); put('ؤ', "2"); put('أ', "2"); put('ء', "2"); // Farsi diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LimitedQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LimitedQueue.java index 3d9225540..5b22182c2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LimitedQueue.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LimitedQueue.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Daniele Gobbetti, Julien Pivotto +/* Copyright (C) 2015-2018 Andreas Shimokawa, Daniele Gobbetti, Julien Pivotto This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/NotificationUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/NotificationUtils.java index 140eed573..4076529df 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/NotificationUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/NotificationUtils.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Lukas Veneziano This file is part of Gadgetbridge. @@ -47,6 +48,8 @@ public class NotificationUtils { case SNAPCHAT: case TELEGRAM: case THREEMA: + case KONTALK: + case ANTOX: case TWITTER: case WHATSAPP: case VIBER: diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java index fcbee77c6..9e0c71a00 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Daniele Gobbetti, Frank Slezak +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Frank Slezak This file is part of Gadgetbridge. @@ -129,14 +130,14 @@ public class PebbleUtils { return null; } - public static String parseIncomingAppMessage(String msg, UUID uuid) { + public static String parseIncomingAppMessage(String msg, UUID uuid, int transactionId) { JSONObject jsAppMessage = new JSONObject(); JSONObject knownKeys = PebbleUtils.getAppConfigurationKeys(uuid); SparseArray appKeysMap = new SparseArray<>(); if (knownKeys == null || msg == null) { - return "{}"; + msg = "[]"; } String inKey, outKey; @@ -168,6 +169,9 @@ public class PebbleUtils { } } jsAppMessage.put("payload", outgoing); + JSONObject data = new JSONObject(); + data.put("transactionId", transactionId); + jsAppMessage.put("data", data); } catch (Exception e) { LOG.warn("Unable to parse incoming app message", e); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Prefs.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Prefs.java index 3a13319a7..a07e464b3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Prefs.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Prefs.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer, JohnnySun +/* Copyright (C) 2016-2018 Carsten Pfeiffer, JohnnySun This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java index d7b6757d9..641773a4c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Carsten Pfeiffer, João Paulo Barraca +/* Copyright (C) 2017-2018 Carsten Pfeiffer, João Paulo Barraca This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/TimePreference.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/TimePreference.java index 2342e7608..043cc4697 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/TimePreference.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/TimePreference.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 José Rebelo +/* Copyright (C) 2017-2018 José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/UriHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/UriHelper.java index d9387cf87..9aa07ad99 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/UriHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/UriHelper.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Carsten Pfeiffer +/* Copyright (C) 2016-2018 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Version.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Version.java index 855241cf2..5cbfd9ed0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Version.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Version.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 Andreas Shimokawa, Carsten Pfeiffer, Michal Novotny +/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Michal Novotny This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java index c306e0367..dbf32bc4c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2017 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Lem Dulfo, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/ru/gelin/android/weather/notification/ParcelableWeather2.java b/app/src/main/java/ru/gelin/android/weather/notification/ParcelableWeather2.java index e93d9f628..d79d4ccc8 100644 --- a/app/src/main/java/ru/gelin/android/weather/notification/ParcelableWeather2.java +++ b/app/src/main/java/ru/gelin/android/weather/notification/ParcelableWeather2.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2017 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2015-2018 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 000000000..34ddd53d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..7353dbd1f --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..7353dbd1f --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..7ece8ebb0 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..f04f9e3b9 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..58f879a3a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..e37a36143 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..9ff6018cf Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..16c438a9e Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..766f40701 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..15eddbacf Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..99fc1b46a Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..f19a5419d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 1fcb8f1fd..5ecc65e08 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -49,20 +49,20 @@ Instal·lador de FW/App Estàs a punt d\'instal·lar el firmware %s en lloc del que està a la teva MiBand. - Estàs a punt d\'instal·lar el firmware %s en el teu Amazfit Bip. + Esteu a punt d\'instal·lar el firmware %s en el vostre Amazfit Bip. +\n +\nSi us plau, assegure-vos d\'instal·lar el fitxer .fw, el fitxer .res i, finalment, el fitxer .gps. El vostre rellotge reiniciarà després d\'instal·lar l\'arxiu .fw. +\n +\nNota: no heu d\'instal·lar .res i .gps si aquests fitxers són els mateixos que els prèviament instal·lats. +\n +\nPROCEDIU SOTA LA VOSTRA PRÒPIA RESPONSABILITAT! + Esteu a punt d\'instal·lar el firmware %s en el vostre Amazfit Cor. \n -\nSi us plau, assegura\'t d\'instal·lar el firmware .gps, després l\'arxiu .res, i finalment el binari .fw. El teu rellotge reiniciarà després d\'instal·lar l\'arxiu .fw. +\nSi us plau, assegure-vos d\'instal·lar el fitxer .fw i el fitxer .res. El vostre rellotge reiniciarà després d\'instal·lar l\'arxiu .fw. \n -\nNota: no has d\'instal·lar .res i .gps si aquests arxius són els mateixos que els prèviament instal·lats. +\nNota: no heu d\'instal·lar .res si aquest fitxer és el mateix que el prèviament instal·lat. \n -\nPROCEDEIX SOTA LA TEVA PRÒPIA RESPONSABILITAT! - Estàs a punt d\'instal·lar el firmware %s en el teu Amazfit Cor. -\n -\nSi us plau, assegura\'t d\'instal·lar el firmware .gps, després l\'arxiu .res, i finalment el binari .fw. El teu rellotge reiniciarà després d\'instal·lar l\'arxiu .fw. -\n -\nNota: no has d\'instal·lar .res i .gps si aquests arxius són els mateixos que els prèviament instal·lats. -\n -\nNO PROBAT, PODEU TRENCAR EL VOSTRE DISPOSITIU. PROCEDEIX SOTA LA TEVA PRÒPIA RESPONSABILITAT! +\nNO TESTAT. POT ESTAVELLAR EL VOSTRE DISPOSITIU. PROCEDIU SOTA LA VOSTRA PRÒPIA RESPONSABILITAT! Estàs a punt d\'instal·lar els firmwares %1$s i %2$s en lloc dels de la vostra MiBand. Aquest firmware ha estat provat i se sap que és compatible amb Gadgetbridge. Aquest firmware no ha estat provat i pot ser que no sigui compatible amb Gadgetbridge. @@ -211,4 +211,228 @@ Instal·lat binari $1$d/%2$d La instal·lació ha fallat Instal·lació correcta + El temps + Ubicació del temps (CM/LOS) + + Exportació automàtica + Exportació automàtica activada + Ubicació de l\'exportació + Interval de l\'exportació + Exporta cada %d hores + + Esteu a punt d\'instal·lar la següent aplicació: +\n +\n +\n%1$s Versió %2$s per %3$s + NO DISPONIBLE + inicialitzat + %1$s per %2$s + Detecció de dispositius + + Atura l\'escaneig + Inicia la detecció + Connecteu un dispositiu nou + %1$s (%2$s) + Emparelleu el dispositiu + Utilitza el diàleg d\'emparellament Android Bluetooth per emparellar el dispositiu. + Emparelleu Mi Band + Emparellant amb %s… + Creant vincle amb %1$*s (%2$*s) + No s\'ha pogut emparellar amb %1$s (%2$s) + Emparellament en curs: %1$s (%2$s) + Ja emparellat amb %1$s (%2$s), connectant… + No s\'ha obtingut cap adreça MAC. No es pot emparellar. + Configuració específica del dispositiu + Configuració de Mi Band / Amazfit + Configuració d\'Amazfit Bip + Home + Dona + Altre + Esquerra + Dreta + Instal·la + Nota: + Imatge de dispositiu + Nom/Àlies + Recompte de vibracions + + Monitor de son + Escriu fitxers de registre + S\'està inicialitzant + S\'està obtenint les dades d\'activitat + Des de %1$s a %2$s + Rellotge a l\'esquerra o la dreta? + Perfil de vibració + + Molt curt + Curt + Mitjà + Llarg + Molt llarg + Timbre + Alarma + Vibració + + Proveu-ho + Notificació de SMS + Configuració de vibració + Notificació genèrica + Notificació de correu electrònic + Notificació de trucada entrant + Xat + Navegació + Xarxa social + + Mesura del ritme cardíac tot el dia + cada minut + Cada 5 minuts + Cada 10 minuts + Cada 30 minuts + Cada hora + + Zones de velocitat + Minuts totals + Passos per minut + + Troba el dispositiu perdut + Cancel·leu per aturar la vibració. + La vostra activitat + Configureu les alarmes + Configureu les alarmes + Detalls d\'alarma + Dg. + Dl. + Dt. + Dc. + Dj. + Dv. + Ds. + Alarma intel·ligent + Hi ha hagut un error en posar les alarmes. Si us plau, intenteu-ho de nou! + Les alarmes han sigut enviades al dispositiu! + No hi ha dades. Sincronitzo el dispositiu? + A punt de transferir %1$s de dades des de %2$s + Objectiu de passos diaris + Error en executar \'%1$s\' + La vostra activitat (ALPHA) + No es pot connectar: %1$s + No s\'ha trobar un controlador per instal·lar el fitxer. + No s\'ha pogut instal·lar el fitxer: %1$s + No s\'ha pogut instal·lar el microprogramari: no coincideix amb revisió del maquinari de Peeble. + Si us plau, espereu mentre que es determina l\'estat de la instal·lació… + Bateria del gadget baixa! + A %1$s li roman: %2$s%% de bateria + Darrera càrrega: %s + Nombre de càrregues: %s + L\'exportació de la base de dades ha fallat! Si us plau, comproveu la configuració. + El vostre son + Son per setmana + Son avui, objectiu: %1$s + Passos per setmana + La vostra activitat i son + El microprogramari s\'està actualitzant… + No es pot instal·lar el fitxer. El dispositiu no està preparat. + %1$s: %2$s %3$s + Versió compatible + Versió no provada! + Connexió a dispositiu: %1$s + Microprogramari Pebble %1$s + Revisió del maquinari correcta + La revisió del maquinari no coincideix! + %1$s (%2$s) + Hi ha hagut un problema amb la transferència del microprogramari. NO REINICIEU Mi Band! + Hi ha hagut un problema amb la transferència de metadades del microprogramari + S\'ha completat la instal·lació del microprogramari + S\'ha completat la instal·lació del microprogramari. Es va a reiniciar el dispositiu… + La instal·lació del microprogramari ha fallat + Passos + Calories + Distància + Rellotge + Freqüència cardíaca + Bateria + Activitat en directe + Passos avui, objectiu: %1$s + Utilitza el mode de baixa latència per actualitzar el microprogramari + Això podria ajudar en dispositius on l\'actualització del microprogramari falla + + Historial de passos + Passos actuals / min + Passos totals + Historial de passos per minut + Inicieu la vostra activitat + Activitat + Son lleuger + Son profund + No portat + No connectat. + Totes les alarmes són desactivades + Manté les dades d\'activitat al dispositiu + Microprogramari incompatible + Aquest microprogramari no és compatible amb el dispositiu + Alarmes de reserva per als propers esdeveniments + Utilitza el sensor de ritme cardíac per millorar la detecció del son + Temps de desplaçament en hores del dispositiu (per detectar el son de treballadors/es de torns) + Mi2: format de data + Temps + Hora i data + Accions dels botó + Especifiqueu les accions en prémer el botó del Mi Band 2 + Compte de pulsacions del botó + Nombre de pulsacions del botó per activar la difusió de missatge + Missatge de difusió a enviar + Activa el botó d\'acció + Activa l\'acció en fer el nombre de pulsacions especificades del botó + Activa la vibració de la pulsera + Activa la vibració de la pulsera en prémer el botó d\'acció + Retard màxim entre pulsacions + Retard màxim entre pulsacions del botó en mil·lisegons + Retard després de l\'acció de botó + Notificació d\'objectiu + La banda vibrarà quan l\'objectiu diari de passos siga assolit + Elements a mostrar + Escolliu els elements a mostrar en la pantalla del rellotge + Activa la pantalla en alçar-la + Gira el canell per canviar la informació + No molestis + La pulsera no rebrà notificacions mentre siga activa + Avisos d\'inactivitat + La banda vibrarà quan hàgiu estat inactius durant una estona + Llindar d\'inactivitat (en minuts) + Desactiva els avisos d\'inactivitat durant un interval de temps + Hora d\'inici + Hora de finalització + + Automàtic + Xinès simplificat + Xinès tradicional + Anglès + Espanyol + + A punt de transferir dades des de %1$s + + Esperant a reconectar + + Quant a tu + Any de naixement + Sexe + Alçada en cm + Pes en kg + + S\'està autenticant + Es requereix autenticació + + Zzz + Afegeix un giny + Duració preferida del son en hores + S\'ha creat una alarma a les %1$02d:%2$02d + Revisió del maquinari: %1$s + Versió del microprogramari: %1$s + S\'ha produït un error al crear un directori per als fitxers de registre: %1$s + Activitat cardiaca + S\'està actualitzant el programari + No s\'ha enviat el microprogramari + Freqüència cardíaca + Freqüència cardíaca + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 0c7368858..60bf40dba 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -557,4 +557,7 @@ Διαλέξτε διαδρομή εξαγωγής Ισπανικά + Ειδοποιήσεις Gadgetbridge +XWatch + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ade89fe25..96c89c3ae 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -46,7 +46,7 @@ Instalador de FW/App Estás a punto de instalar el firmware %s en lugar del que está en tu MiBand. - Estás a punto de instalar los firmware %1$s y %2$s en lugar de los que están en tu MiBand + Estás a punto de instalar los firmware %1$s y %2$s en lugar de los que están en tu MiBand. Este firmware ha sido probado y se sabe que es compatible con Gadgetbridge. Este firmware no ha sido probado y puede que no sea compatible con Gadgetbridge. \n @@ -395,7 +395,7 @@ Automático (detección de sueño) Programado (intervalo de tiempo) Intento de emparejamiento con %1$s - El enlace con %1$s ha fallado + El enlace con %1$s ha fallado. Intentando conectar con: %1$s Activa el Bluetooth para encontrar dispositivos. Enlazado con %1$s. @@ -403,13 +403,13 @@ Selecciona Emparejar para emparejar tus dispositivos. Si esto falla, prueba de nuevo sin emparejar. Emparejar No emparejar -Estás a punto de instalar el firmware %s en tu Amazfit Bip. -\n -\nPor favor, asegúrate de instalar el firmware .gps, luego el archivo .res, y finalmente el .fw. Tu reloj se reiniciará después de instalar el archivo .fw. -\n -\nNota: no tienes que instalar los .res y .gps si ya están instalados en su última versión. -\n -\n¡PROCEDE BAJO TU RESPONSABILIDAD! +Estás a punto de instalar el firmware %s en tu Amazfit Bip. +\n +\nPor favor, asegúrate de instalar el archivo .fw, entonces el archivo .res, y finalmente el archivo .gps. Tu reloj se reiniciará después de instalar el archivo .fw. +\n +\nNota: no tienes que instalar los .res y .gps si ya están instalados en su última versión. +\n +\n¡PROCEDE BAJO TU RESPONSABILIDAD! \n \nPor favor, asegúrate de instalar el firmware .gps, luego el archivo .res, y finalmente el binario .fw. Tu reloj reiniciará después de instalar el archivo .fw. \n @@ -443,7 +443,7 @@ Conectar Estás a punto de instalar el firmware %s en tu Amazfit Cor. \n -\nPor favor, asegúrate de instalar el firmware .gps, luego el archivo .res, y finalmente el binario .fw. Tu reloj reiniciará después de instalar el archivo .fw. +\nPor favor, asegúrate de instalar el archivo .fw, y finalmente el archivo .res. Tu reloj reiniciará después de instalar el archivo .fw. \n \nNota: no tienes que instalar .res si este archivo es el mismo que el previamente instalado. \n @@ -498,4 +498,9 @@ ¡La exportación de la base de datos ha fallado! Por favor, revisa los ajustes. Elije la ubicación para exportación - +Español + + Notificaciones de Gadgetbridge +XWatch + + diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index bc1ec3ed8..1120b9ff6 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -79,4 +79,38 @@ Sünkrooni aega Sünkrooni aeg seadmega ühendumise ajal ja kui aeg või ajatsoon muutub Androidis + Kui te siiski soovite jätkata ja seade jätkab tööd ka hiljem palun andke Gadgetbridge\'i arendajatele teada, et nad lisaksid %s versiooni toetatud püsivarade nimekirja + + Luba viiped vasakule/paremale graafikute vaates + + Teema + Hele + Tume + + Keel + + Peida Gadgetbridge\'i teavitus + Teavitused + Korduseid + Telefonikõned + SMS + Pebble\'i sõnumid + Üldine teavituste tugi + Ära sega + Transliteratsioon + Alati + Kui ekraan on väljalülitatud + Mitte kunagi + + Privaatsus + Kuva nimi ja number + Peida number kuid kuva nimi + Peida nimi ja number + + Ilm + Ilma asukohta (CM/LOS) + + Rakenduste must nimekiri + Kalendrite must nimekiri + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 8094638a5..36b1c291a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -409,7 +409,7 @@ NOTE : la base de données sera bien évidement plus grande ! Ne pas appairer Vous êtes sur le point d\'installer le micrologiciel %s sur votre Amazfit Bip. \n -\nVeuillez installer le micrologiciel .gps, ensuite le fichier .res, puis le fichier .fw. Votre montre redémarrera après installation du .fw. +\nVeuillez installer le fichier .fw, puis le fichier .res, puis le fichier.gps.. Votre montre redémarrera après installation du .fw. \n \nNote : vous ne devez pas installer .res et .gps si ceux-ci sont identiques à ceux installés précédemment. \n @@ -441,7 +441,7 @@ NOTE : la base de données sera bien évidement plus grande ! Connecter Vous êtes sur le point d\'installer le micrologiciel %s sur votre Amazfit Cor. \n -\nVeuillez installer le micrologiciel .gps, ensuite le fichier .res, puis le fichier .fw. Votre montre redémarrera après installation du .fw. +\nVeuillez installer le fichier .fw, puis le fichier .res. Votre montre redémarrera après installation du .fw. \n \nNote : vous ne devez pas installer .res si celui-ci est identique à celui installé précédemment. \n @@ -496,4 +496,9 @@ NOTE : la base de données sera bien évidement plus grande ! L\'exportation de la base de données a échoué ! Veuillez vérifier vos paramètres. Choisissez l\'emplacement d\'exportation - +Espagnol + + Notifications de Gadgetbridge +XWatch + + diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 858cc4878..fdc5af4c9 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -31,7 +31,7 @@ Borrar Borrar e retirar da caché Reinstalar - Buscar na Appstore de Pebble + Buscar na appstore de Pebble Activar Desactivar Activar Monitor de Ritmo Cardíaco @@ -48,12 +48,12 @@ Instalador de FW/App Está a piques de instalar o firmware %s no lugar do actual na súa Mi Band. - Está a piques de instalar os firmwares %1$s e %2$s no lugar dos que están actualmente na súa Mi Band. + Está a piques de instalar os firmwares %1$s e %2$s no canto dos que están actualmente na súa Mi Band. Este firmware foi probado e é compatíbel co Gadgetbridge. - Este firmware non foi probado e pode non ser compatíbel co Gadgetbridge. -\n -\nÉ preferíbel que NON o instale na súa Mi Band! - Se aínda así quere proceder e todo continúa a funcionar normalmente, por favor avise aos programadores do Gadgetbridge para permitir o firmware versión: %s + Este firmware non foi probado e pode non ser compatíbel co Gadgetbridge. +\n +\nRECOMENDASE QUE NON o instale na súa Mi Band! + Se aínda así quere proceder e todo continúa a funcionar normalmente, por favor avise aos programadores do Gadgetbridge para que permitan a versión %s do firmware Axustes @@ -66,7 +66,7 @@ Data e Hora Sincronizar hora - Sincronizar hora ao conectar ou ao cambiar o fuso horario no android + Sincronizar hora ao conectar e ao cambiar o fuso horario no android Tema Claro @@ -87,7 +87,7 @@ Soporte para notificacións xenéricas ... tamén coa pantalla acesa Non Molestar - Parar notificacións indesexadas baseándose no modo Non Molestar + Parar notificacións indesexadas no modo Non Molestar Transliteración Activar isto se o dispositivo non ten soporte para o seu idioma @@ -173,7 +173,7 @@ Gadgetbridge en execución Instalando binario %1$d/%2$d Fallou a instalación - Instalación correcta + Instalado inicializado %1$s de %2$s Descubrir dispositivos @@ -288,7 +288,7 @@ Imposíbel conectar: %1$s Non foi posíbel atopar un controlador para instalar o arquivo. Imposíbel instalar o arquivo fornecido: %1$s - Non é posíbel instalar o firmware fornecido: non corresponde coa versión do hardware do seu Pebble. + Non é posíbel instalar o firmware fornecido: Non corresponde coa versión do hardware do seu Pebble. Por favor, agarda mentres se determina o estado da instalación… Dispositivo con batería baixa! %1$s bateria restante: %2$s%% @@ -296,9 +296,9 @@ \n Número de cargas: %s O teu sono - Sono na semana + Sono por semana Sono hoxe, obxectivo: %1$s - Pasos na semana + Pasos por semana A túa actividade e sono Anovando Firmware… O arquivo non pode ser instalado, o dispositivo non está preparado. @@ -414,16 +414,16 @@ Erro exportando as preferencias: %1$s Importar datos? Quere sobreescribir a base de datos actual? Perderanse todos os datos actuais de actividade (de habelos). - Importado con éxito. + Importado. Erro ao importar a base de datos: %1$s Erro importando preferencia: %1$s Borrar datos de actividade? Realmente quere borrar toda a base de datos? Perderanse todos os seus datos de actividade e a información sobre os seus dispositivos. - Datos eliminados con éxito. + Datos eliminados. Fallou o borrado da base de datos. Borrar a antiga base de datos de actividade? Está seguro de querer borrar a antiga base de datos de actividade? Perderanse os datos de actividade que non foran importados. - Datos antigos de actividade borrados con éxito. + Datos antigos de actividade borrados. Fallou o borrado da base de datos de actividades antigas. Sobreescribir Cancelar @@ -455,7 +455,7 @@ O enlace con %1$s fallou de inmediato. Intentando conectar con: %1$s Active o Bluetooth para achar dispositivos. - Correctamente enlazado con %1$s. + Enlazado con %1$s. Emparellar con %1$s? Emparellar Non emparellar @@ -463,21 +463,21 @@ Abrir no teléfono Silenciar Responder -Estás a piques de instalar o firmware %s no teu Amazfit Bip. +Estás a piques de instalar firmware no teu Amazfit Bip. \n -\nPor favor, asegúrate de instalar o firmware .gps, despois o arquivo .res, e finalmente o binario .fw. O teu reloxo reiniciará despois de instalar o arquivo .fw. +\nPor favor, asegúrate de instalar o ficheiro .fw, despois o arquivo .res, e finalmente o ficheiro .gps . O teu reloxo reiniciará despois de instalar o arquivo .fw. \n \nNota: non tes que instalar .res e .gps se estes arquivos son os mesmos que os previamente instalados. \n \nPROCEDE BAIXO A TÚA PROPIA RESPONSABILIDADE! - Use soporte experimental do Pebble LE nas veces do Bluetooth clásico, require emparellar un \"Pebble LE\" despois de que nengún LE teña sido conectado + Use soporte experimental do Pebble LE para todos os Pebble nas veces do Bluetooth clásico. Isto require vincular primeiro con Pebble non LE, e despois Pebble LE Isto fará que as mensaxes enviadas para apps de terceiros sexan recoñecidas sempre e inmediatamente Compensación da hora do dispositivo en horas (para detectar o sono de traballadores a turnos) Enviar mensaxe despois dun número definido de pulsacións Retardo despois dunha acción do botón (o número está en button_id intent extra) ou ben 0 para efecto inmediato Se marcado, os datos son almacenados no seu formato orixinal ficando disponíbeis para posterior interpretación. Nota: A base de datos será máis grande! - É esperado que vexa unha notificación de emparellamento no seu dispositivo Android. Se iso non acontece, acceda ás notificacións e acepte a solicitude de emparellamento. Despois acepte igualmente a solicitude de emparellamento no seu Pebble + Verá unha notificación de emparellamento no seu dispositivo Android. Se non, acceda ás notificacións e acepte a solicitude de emparellamento. posteriormente a solicitude de emparellamento no seu Pebble Asegúrate de que este tema esté activado na aplicación de notificación do clima para obter a información no teu Pebble. \n @@ -488,9 +488,9 @@ \nAs \"watchfaces\" soportadas amosarán a información do clima automáticamente. Selecciona Emparellar para emparellar os teus dispositivos. Se isto falla, proba de novo sen emparellar. Conectar - Estás a piques de instalar o firmware %s no teu Amazfit Cor. + Estás a piques de instalar firmware no teu Amazfit Cor. \n -\nPor favor, asegúrate de instalar o ficheiro .res, e despois diso o binario .fw. O teu reloxo reiniciará despois de instalar o arquivo .fw. +\nPor favor, asegúrate de instalar o ficheiro .fw, e despois diso o ficheiro .res. O teu reloxo reiniciará despois de instalar o arquivo .fw. \n \nNota: non tes que instalar .res se este arquivo é exactamente o mesmo que o previamente instalado. \n @@ -509,7 +509,7 @@ Chinés tradicional Inglés - Localización para Méteo + Localización para Méteoroloxía (CM/LOS) Medición de pulso todo o día cada minuto @@ -550,4 +550,9 @@ Exrizu K8 No.1 F1 Escolle lugar para exportar +Castelán + + XWatch + + Notificacións do Gadgetbridge diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 6b501c918..624ad9ce0 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -497,4 +497,7 @@ נא לבחור את מיקום הייצוא ספרדית + הודעות של Gadgetbridge +XWatch + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7e65f01f1..4273cae57 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -9,7 +9,7 @@ Sincronizza Monitoraggio del sonno (ALPHA) Trova dispositivo smarrito - Salva uno screenshot + Cattura screenshot Disconnetti Rimuovi dispositivo Rimuovi %1$s @@ -29,7 +29,7 @@ Cancella Cancella e rimuovi dalla cache Re-installazione - Cerca nell\'appstore di Pebble + Cerca nell\'Appstore di Pebble Attiva Disattiva Attiva il monitor del battito cardiaco @@ -48,13 +48,13 @@ Il firmware %s verrà installato al posto di quello attualmente sulla Mi Band. Stai per installare i firmware %1$s e %2$s al posto di quelli al momento sulla tua Mi Band. Questo firmware è stato testato ed è compatibile con Gadgetbridge. - Questo firmware NON è stato testato e potrebbe non essere compatibile con Gadgetbridge. -\n -\nNON è raccomandato installarlo sulla Mi Band! - Se hai intenzione di procedere e tutto continua a funzionare ti invitiamo a contattare gli sviluppatori e dire loro di aggiungere il firmware: %s a quelli testati + Questo firmware non è stato testato e potrebbe non essere compatibile con Gadgetbridge. +\n +\nNON è consigliato installarlo sulla Mi Band! + Se si procede e tutto continua a funzionare ti invitiamo a contattare gli sviluppatori e dire loro di aggiungere il firmware %s all\'elenco di quelli testati Impostazioni - Impostazioni globali + Impostazioni Collegati al dispositivo quando il bluetooth viene acceso Avvio automatico Riconnessione automatica @@ -62,7 +62,7 @@ Default Data e ora Sincronizza l\'ora - Sincronizza l\'orario al collegamento oppure quando viene cambiata l\'ora / il fuso orario in android. + Sincronizza l\'orario al collegamento e quando viene cambiato il fuso orario da Android Tema Chiaro Scuro @@ -79,10 +79,10 @@ Notifiche generiche … anche se lo schermo è acceso Non disturbare - Non inviare notifiche nei periodi configurati come \"non disturbare\". + Non inviare notifiche nei periodi configurati come \"Non Disturbare\" Traslitterazione Abilita questa opzione se il tuo dispositivo non supporta tutti i caratteri della tua lingua - sempre + Sempre se lo schermo è spento Mai Privacy @@ -100,8 +100,8 @@ Opzioni di sviluppo Indirizzo Mi Band Impostazioni Pebble - Activity Trackers - Tracker delle attività preferito + Tracciatore di attività + Tracciatore delle attività preferito Sincronizza Pebble Health Sincronizza Misfit Sincronizza Morpheuz @@ -131,7 +131,7 @@ Abilita funzionalità non testate Abilita funzionalità non testate. ABILITARE SOLO SE SI SA QUELLO CHE SI STA FACENDO! Usa sempre BLE - Utilizza il supporto sperimentale Pebble BLE per tutti i Pebble. Si devei effettuare il \"pairing\" nuovamente se si dovesse utilizzare di nuovo il BT classico + Utilizza il supporto sperimentale Pebble LE per tutti i Pebble in alternativa al BT. Questo richiede un nuovo accoppiamento a LE prima e poi al Pebble LE Limita la MTU del Pebble 2/LE Se il tuo Pebble 2/LE non funziona come dovrebbe, prova a impostare un limite alla MTU (range valido 20-512) Abilita il log delle applicazioni che girano su Pebble @@ -163,7 +163,7 @@ Gadgetbridge in esecuzione Installazione del binario %1$d/%2$d Installazione fallita - installazione conclusa con successo + Installazione conclusa con successo STAI INSTALLANDO UN FIRMWARE, PROCEDI A TUO RISCHIO.\n\n Questo firmware è per la versione HW: %s Si sta per installare la app:\n\n\n%1$s Versione %2$s di %3$s\n N/A @@ -181,10 +181,10 @@ Creazione bonding con %1$s (%2$s) Impossibile completare il pairing con %1$s (%2$s) Bonding in corso: %1$s (%2$s) - Bonding già effettuato con %1$s (%2$s), connessione in corso... + Accoppiamento già effettuato con %1$s (%2$s), connessione in corso… Indirizzo MAC mancante, impossibile completare l\'accoppiamento. Impostazioni specifiche dispositivo - Impostazioni Mi Band / Bip + Impostazioni Mi Band / Amazfit Uomo Donna Altro @@ -226,7 +226,7 @@ Minuti totali Passi al minuto Trova dispositivo smarrito - Annulla per fermare la vibrazione + Annulla per fermare la vibrazione. Le tue attività Configurazione sveglia Configurazione sveglia @@ -239,9 +239,9 @@ Ven Sab Sveglia intelligente - C\'è stato un errore impostando le sveglie, prova di nuovo. + Errore nell\'impostazione delle sveglie, riprova di nuovo! Sveglie sincronizzate con il dispositivo! - Non ci sono dati. Effettua una sincronizzazione con il tuo device. + Non ci sono dati. Hai effettuato la sincronizzazione con il device? Vengono trasferiti %1$s a partire dal %2$s Traguardo giornaliero di passi Errore eseguendo \'%1$s\' @@ -250,17 +250,17 @@ Impossibile aprire questo file. Impossibile installare il file: %1$s Impossibile installare il firmware: non corrisponde alla versione hardware del tuo Pebble. - Lo stato dell\'installazione viene rilevato... + Lo stato dell\'installazione viene rilevato… Batteria del dispositivo bassa! %1$s batteria rimanente: %2$s%% Ultima ricarica: %s \n Numero di ricariche: %s Il tuo sonno - Sonno della settimana + Sonno settimanale Sonno di oggi, obiettivo: %1$s Passi della settimana Attività e sonno - Aggiornamento del Firmware... + Aggiornamento del Firmware… Il file non può essere installato, il dispositivo non è pronto. %1$s: %2$s %3$s Firmware Amazfit Bip %1$s @@ -274,8 +274,8 @@ Problema durante il caricamento del firmware. NON RIAVVIARE la Mi Band! Problema durante il caricamento dei metadati del firmware Installazione del firmware completata - Installazione del firmware completata, riavvio del dispositivo... - Scrittura del firmware non riuscita + Installazione del firmware completata, riavvio del dispositivo… + Aggiornamento del firmware non riuscita Passi Calorie Distanza @@ -339,13 +339,13 @@ Versione Hardware: %1$s Versione Firmware: %1$s Errore durante la creazione della directory per i file di log: %1$s - HR: + "HR: " Aggiornamento firmware in corso Firmware non inviato Battito cardiaco Battito cardiaco Memorizza i record grezzi nel database - Se selezionato, i dati vengono memorizzati come trasmessi dal Pebble, in modo da avere più dati in futuro. NB: Il database sarà più grande + Se selezionato, i dati vengono memorizzati come trasmessi dal Pebble, in modo da avere più dati in futuro. NB: Il database sarà più grande! Gestione del database Gestione del database Le operazioni sul database utilizzano il percorso qui sotto. \nQuesto percorso è accessibile ad altre applicazioni ed al tuo computer. \nDopo l\'esportazione il database si troverà qui (oppure copia qui il database che desideri importare): @@ -356,7 +356,7 @@ "Errore nell\'esportazione delle preferenze: %1$s" Importare i dati? Vuoi davvero sovrascrivere il database attuale? Tutte le tue attività saranno perse. - L\'importazione ha avuto successo. + Importazione avvenuta con successo. Errore importando il DB: %1$s "Errore nell\'importazione della preferenza: %1$s" Cancella i dati delle attività? @@ -365,7 +365,7 @@ Cancellazione del database fallita. Cancella i dati delle attività nel vecchio formato? Vuoi davvero cancellare il database nel vecchio formato? Tutte le informazioni che non hai importato nel nuovo database saranno perse. - Dati nel vecchio formato cancellati con successo. + Dati delle vechie attività eliminati con successo. Cancellazione del database nel vecchio formato fallita. Sovrascrivi Annulla @@ -374,7 +374,7 @@ Vibrazione Pairing del Pebble - Un avviso di pairing dovrebbe comparire sul tuo dispositivo Android. Se non succede verifica l\'area delle notifiche ed accetta questa richiesta di pairing. Dopo fai lo stesso sul tuo Pebble + Un avviso di accoppiamento dovrebbe comparire sul tuo dispositivo Android. Se non succedesse controlla l\'area delle notifiche ed accetta la richiesta. Dopo fai lo stesso sul tuo Pebble Assicurati che questa skin sia abilitata nell\'applicazione \"Notifiche Meteo\" per ricevere informazioni meteo sul tuo Pebble.\n\nNon è necessaria nessuna ulteriore configurazione.\n\nPuoi abilitare l\'applicazione Meteo di sistema sul tuo Pebble dalla gestione applicazioni.\n\nLe watchfaces che lo supportano mostreranno il meteo automaticamente. Abilita il pairing bluetooth Disattiva se hai problemi di connession @@ -396,4 +396,108 @@ Tentativo di connessione con: %1$s Abilitare Bluetooth per l\'individuazione dei dispositivi. Non connettersi - \ No newline at end of file +Connetti + Si sta per installare il firmware %s sul tuo Amazfit Bip. +\n +\nSi prega di installare prima il file .fw, poi il file .res e in fine il file .gps. Il tuo smartwatch si riavvierà appena dopo aver installato il file .fw. +\n +\nNota: Non è necessario installare i file .res e .gps se questi sono gli stessi della versione precedentemente installata. +\n +\nPROCEDI A TUO RISCHIO E PERICOLO! + Si sta per installare il firmware %s sul Amazfit Cor. +\n +\nSi prega di installare prima il file .fw e successivamente il file .res. Il tuo smartwatch si riavvierà dopo l\'installazione del file .fw. +\n +\nNOTA: Non è necessario installare il file .res se risulta essere uguale a quello precedentemente installato. +\n +\nNON TESTATO: PROCEDI A TUO RISCHIO E PERICOLO! + Abilit swipe Sinistra/Destra nel grafico delle attività + + Meteo + Posizione meteo (CM/LOS) + + Blacklist Calendari + + Timeline Pebble + Invia gli eventi del calendario alla timeline + + Abilita background JS + Quando abilitato permette a watchface di visualizzare meteo, batteria, etc. + + Auto esporta le preferenze + Auto esportazione abilitata + Esporta posizione + Intervallo di esportazione + Esporta ogni %d ora/e + + Stato sconosciuto + Impostazioni Amazfit Bip + Misurazione battito continua + ogni minuto + ogni 5 minuti + ogni 10 minuti + ogni 30 minuti + ogni ora + + Esportazione del database fallita! Si prega di controllare le impostazioni. + Azioni tasto + Specifica le azioni alla pressione del pulsante del Mi Band 2 + Conteggio pressione tasto + Numero di volte che il tasto deve essere premuto per inviare un messaggio in broadcast + Messaggio da inviare in broadcast + Numero di pressioni del tasto per il messaggio in broadcast raggiunto + Abilita azioni tasto + Abilita azioni selezionando un numero specifico di pressioni del tasto + Abilita vibrazione band + Abilita vibrazioni band con pressione del tasto + Massimo ritardo tra due pressioni + Massimo ritardo tra due pressioni del pulsante in millisecondi + Ritardo di azione del tasto + Ritardo di esecuzione dopo rilevamento di un\'azione (il numero indica l\'extra dell\'intent per button_id); 0 per eseguire immediatamente + Automatico + Cinese semplificato + Cinese tradizionale + Inglese + Spagnolo + + Web View Activity + + (%1$s) + Schedulato (intervallo di tempo) + Connesso a %1$s. + Accoppiare con %1$s? + Seleziona \'Accoppia\' per accoppiare i tuoi dispositivi. Se dovesse fallire riprova di nuova senza effettuare l\'accoppiamento. + Accoppia + Apri nel telefono + Muto + Rispondi + + Firmware + Data non valida + Carattere + Firmware GPS + Almanacco GPS + Errore Connessione GPS + Risorse + Watchface + + Device sconosciuto + Testa il Device + Pebble + Mi Band + Mi Band 2 + Amazfit Bip + Amazfit Cor + Vibratissimo + LiveView + HPlus + Makibes F68 + Exrizu K8 + No.1 F1 + Teclast H30 + + Seleziona percorso di esportazione + Notifiche Gadgetbridge +XWatch + + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 1b9bb8483..c20afcf97 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -29,7 +29,7 @@ 削除 キャッシュから削除 再インストール - Pebble Appstore で検索 + Pebble アプリストアで検索 アクティベート 非アクティベート HRM をアクティベート @@ -40,7 +40,7 @@ 設定 先頭に移動 - ステータス通知ブラックリスト + 通知ブラックリスト ブラックリストにしたカレンダー @@ -48,11 +48,13 @@ お使いのMi Bandに、現在のファームウェアの代わりに%sをインストールしようとしています。 お使いのMi Bandに、現在のファームウェアの代わりに %1$s および %2$s をインストールしようとしています。 このファームウェアはテスト済で、ガジェットブリッジと互換性があることがわかっています。 - このファームウェアは未テストで、ガジェットブリッジと互換性がない可能性があります。\n\nお使いのMi Bandにフラッシュすることは奨励されていません! - それでも続行して、その後正しく作業を続ける場合は、ガジェットブリッジ開発者にホワイトリスト ファームウェア バージョンを教えてください: %s + このファームウェアは未テストで、Gadgetbridge と互換性がない可能性があります。 +\n +\nお使いのMi Bandにフラッシュすることは推奨されません! + それでも続行して、正しく動作した場合は、Gadgetbridge開発者にホワイトリストの %s ファームウェア バージョンを教えてください 設定 - 一般設定 + 全般設定 Bluetoothがオンになったときにデバイスに接続 自動的に開始 自動的に再接続 @@ -60,7 +62,7 @@ デフォルト 日付と時刻 時間を合わせる - 接続したとき、Androidで時間またはタイムゾーンを変更したときに、デバイスに時間を同期 + デバイスを接続したとき、Androidで時間またはタイムゾーンを変更したときに、デバイスに時間を同期します テーマ ライト ダーク @@ -75,9 +77,9 @@ Pebbleメッセージ PebbleKit経由でPebbleに通知を送信するアプリケーションをサポートします。 一般ステータス通知対応 - … スクリーンがオンのときにも + …スクリーンがオンのときにも サイレント - サイレントモードに基づいて、送信される不要な通知を停止します。 + サイレントモードで、送信される不要な通知を停止します 音訳 お使いのデバイスがあなたの言語のフォントをサポートしていない場合、これを有効にしてください いつも @@ -98,7 +100,7 @@ Pebble で更新 開発者用設定 Mi Bandのアドレス - Pebbleの設定 + Pebble設定 アクティビティ トラッカー お好みのアクティビティ トラッカー Pebble Health 同期 @@ -106,7 +108,7 @@ Morpheuz 同期 発信のサポート これを無効にすると、Pebble 2/LE は発信時に振動しなくなります - 第三者のアンドロイドアップにアクセス権利を与える + サードパーティ製 Android アプリのアクセスを許可 PebbleKitを使用してAndroidアプリ用の実験的なサポートを有効にします Pebbleタイムライン 日の出と日の入り @@ -401,13 +403,13 @@ お使いのデバイスとペアにする相手を選択します。 これに失敗した場合は、ペア設定をせずに再試行してください。 ペア ペアにしない -Amazfit Bip の現在の代わりに %s のファームウェアをインストールしようとしています。 -\n -\n.gps ファームウェア、その後 .res ファイル、そして最終的に .fw ファイルをインストールすることを確認してください。お使いのウォッチは、.fw ファイルをインストールした後に再起動します。 -\n -\n注: これらのファイルが以前インストールされているのものと完全に同じ場合、.res と .gps をインストールする必要はありません。 -\n -\n実験的です。あなた自身の責任で行ってください +Amazfit Bip に %s のファームウェアをインストールしようとしています。 +\n +\n.fw ファイル、その後 .res ファイル、最後に .gps ファイルをインストールしてください。お使いのウォッチは、.fw ファイルをインストールした後に再起動します。 +\n +\n注: これらのファイルが以前インストールされているのものと完全に同じ場合、.res と .gps をインストールする必要はありません。 +\n +\nご自身の責任で行ってください! Amazfit Bip ファームウェア%1$s ボタンの動作 Mi Band 2 ボタンを押した動作を指定します @@ -428,12 +430,12 @@ ミュート 返信 接続 - Amazfit Cor にファームウェア %s をインストールしようとしています。 -\n -\n.res ファイルをインストールし、、その後 .fw ファイルをインストールしてください。お使いのウォッチは、.fw ファイルをインストールした後に再起動します。 -\n -\n注: 以前にインストールされたものと同じ場合は、.res をインストールする必要はありません。 -\n + Amazfit Cor に %s のファームウェアをインストールしようとしています。 +\n +\n.fw ファイルをインストールし、その後 .res ファイルをインストールしください。お使いのウォッチは、.fw ファイルをインストールした後に再起動します。 +\n +\n注: 以前にインストールされたものと同じ場合は、.res をインストールする必要はありません。 +\n \nテストされていません。デバイスが文鎮化する可能性があります。ご自身の責任で行って下さい! バックグラウンド JS を有効にします 有効にすると、ウォッチフェースに天気、バッテリー情報等を表示することができます。 @@ -490,4 +492,9 @@ データベースのエクスポートが失敗しました! 設定を確認してください。 エクスポート先を選択 +スペイン語 + + XWatch + + Gadgetbridge 通知 diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 28916874a..2b450bce2 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -551,4 +551,7 @@ Velg eksportplassering Spansk + Gadgetbridge-merknader +XWatch + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2f1a1a5c9..ca86f7390 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -29,7 +29,7 @@ Verwijder Verwijder en verwijder uit cache Installeer - Zoek in Pebble Appstore + Zoek in Pebble appstore Activeren deactiveren Activeer HRM @@ -42,19 +42,19 @@ Notificatie zwarte lijst U staat op het punt om firmware% s te installeren in plaats van die nu op uw Mi Band staat. - U staat op het punt om firmware %s te installeren op uw Amazfit Bip. + U staat op het punt om de firmware %s te installeren op uw Amazfit Bip. \n -\nZorg ervoor dat u de .gps firmware installeert, dan het .res-bestand en tenslotte het .fw-bestand. Uw horloge wordt opnieuw gestart na het installeren van het .fw-bestand. +\nZorg ervoor dat u het .fw-bestand installeert, daarna het .res-bestand en als laatste het .gps-bestand. Uw horloge wordt opnieuw gestart na het installeren van het .fw-bestand. \n -\nOpmerking: u hoeft geen .res en .gps te installeren als deze bestanden exact hetzelfde zijn als die welke eerder zijn geïnstalleerd. +\nOpmerking: U hoeft de .res niet te installeren als deze exact dezelfde is als degene die ervoor al was geïnstalleerd. \n \nGA VERDER OP EIGEN RISICO! - U staat op het punt om firmwares %1$s en %2$s te installeren in plaats van die momenteel op uw Mi Band staat. + U staat op het punt om de %1$s en %2$s firmware, te installeren in plaats van die momenteel op uw Mi Band staat. Deze firmware is getest en is compatibel met Gadgetbridge. - Deze firmware is niet getest en is mogelijk niet compatibel met Gadgetbridge. -\n -\nU wordt NIET aangemoedigd om het op uw Mi Band te installeren! - Als u nog steeds wilt doorgaan en uw apparaat blijft goed functioneren, vertelt u de ontwikkelaars van Gadgetbridge om de firmware-versie op de goedgekeurde lijst te zetten: %s + Deze firmware is niet getest en is mogelijk niet compatibel met Gadgetbridge. +\n +\nU wordt AFGERADEN om het op uw Mi Band te installeren! + Als u nog steeds wilt doorgaan en uw apparaat blijft goed functioneren, vertel dan alstublieft de ontwikkelaars van Gadgetbridge om de %s firmware-versie op de goedgekeurde lijst te zetten Instellingen @@ -88,7 +88,7 @@ Algemene melding ondersteuning ... ook als het scherm is ingeschakeld Niet Storen - Stop ongewenste meldingen te verzenden op basis van de Niet storen modus + Voorkom dat ongewenste meldingen worden verzonden in Niet Storen modus Transliteratie Schakel dit in als uw apparaat geen ondersteuning heeft voor het lettertype van uw taal @@ -149,7 +149,7 @@ Activeer de netwerk locatie locatie gevonden - Succesvol gekoppeld met %1$s. + Gekoppeld met %1$s. Koppel met %1$s? Selecteer koppelen om uw apparaten te koppelen. Als dit mislukt, probeer het opnieuw zonder koppelen. Koppel @@ -166,12 +166,12 @@ Kalenders op de zwarte lijst Firmware/Apps installeren - U staat op het punt om firmware %s te installeren op uw Amazfit Cor. -\n -\nZorg ervoor dat u het .res-bestand installeert en daarna het .fw-bestand. Uw horloge zal herstarten na de installatie van het .fw-bestand. -\n -\nOpmerking: U hoeft de .res niet te installeren als deze exact dezelfde is als degene die ervoor al was geïnstalleerd. -\n + U staat op het punt om de firmware %s te installeren op uw Amazfit Cor. +\n +\nZorg ervoor dat u het .fw-bestand installeert en daarna het .res-bestand. Uw horloge wordt opnieuw gestart na het installeren van het .fw-bestand. +\n +\nOpmerking: U hoeft de .res niet te installeren als deze exact dezelfde is als degene die ervoor al was geïnstalleerd. +\n \nNOG NIET GETEST, KAN UW TOESTEL ONBRUIKBAAR MAKEN, GA VERDER OP EIGEN RISICO! Activeer links/rechts vegen in grafiek schermen @@ -188,7 +188,7 @@ Schakel niet geteste features in Schakel features in die nog niet getest zijn. SCHAKEL DIT ALLEEN IN ALS JE WEET WAAR JE MEE BEZIG BENT! Geef altijd de voorkeur aan BLE - Gebruik experimentele Pebble LE-ondersteuning voor alle Pebbels in plaats van BT classic, dit vereist het paren met een Pebble LE nadat een niet LE-versie eenmalig geconnecteerd is geweest. + Gebruik experimentele Pebble LE-ondersteuning voor alle Pebbels in plaats van BT classic. Dit vereist het eerst paren met een niet LE-versie en daarna met een Pebble LE Pebble 2/LE GATT MTU limiet Als uw Pebble 2/Pebble LE niet werkt zoals verwacht, probeer deze instelling om de MTU te limiteren (geldig bereik: 20-512) logging van horlogeapp inschakelen @@ -196,7 +196,7 @@ Vroegtijdige ACK PebbleKit Zorgt ervoor dat berichten die door apps van derden worden verzonden, altijd en onmiddellijk herkend zullen worden Schakel achtergrond JS in - Wanneer ingeschakeld, kunnen horloges het weer, batterijinformatie enz weergeven + Wanneer ingeschakeld, kunnen horloges het weer, batterijinformatie enz. weergeven Pogingen tot opnieuw verbinden @@ -224,7 +224,7 @@ Gadgetbridge loopt Binary installeren %1$d/%2$d Installatie gefaald - Installatie succesvol + Geïnstalleerd U PROBEERT EEN NIEUWE FIRMWARE TE INSTALLEREN, GA VERDER OP EIGEN RISICO. \n \n @@ -325,13 +325,13 @@ Alarmen verzonden naar het apparaat! Geen data. Toestel synchroniseren? Klaar om %1$s data over te dragen van %2$s - Doel aantal stappen per dag + Dagelijkse stappen doel Fout bij het uitvoeren van \'%1$s\' Uw activiteit (ALPHA) Kan niet verbinden: %1$s Kan geen handler vinden om dit bestand te installeren. Kan het gegeven bestand niet installeren: %1$s - Kan de gegeven firmware niet installeren: het komt niet overeen met jouw Pebble\'s hardware revisie. + Kan de gegeven firmware niet installeren: Het komt niet overeen met uw Pebble\'s hardware revisie. Gelieve te wachten tijdens het bepalen van de installatie status… Gadget batterij laag! %1$s batterij resterend: %2$s%% @@ -343,7 +343,7 @@ Slaap vandaag, doel: %1$s Stappen per week Uw activiteit en slaap - Firmware updaten… + Firmware flashen… Bestand kan niet geïnstalleerd worden, toestel is niet gereed. Compatibele versie Niet geteste versie! @@ -356,7 +356,7 @@ Probleem met de firmware metadata-overdracht Firmware installatie voltooid Firmware installatie voltooid, opnieuw opstarten… - Firmware schrijven mislukt + Firmware flashen mislukt Stappen Calorieën Afstand @@ -368,8 +368,8 @@ Bevestig de activiteitsdata transfer niet Als de activiteitsdata niet geacked wordt naar de armband, zal deze niet gewist worden. Dit is nuttig als GB gebruikt wordt samen met andere apps. Wij zullen activiteitsdata op de Mi Band houden zelfs na synchronisatie. Dit is nuttig als GB gebruikt wordt samen met andere apps. - Gebruik lage vertragingstijd modus voor Firmware updates - Dit kan helpen op toestellen waar firmware updates falen + Gebruik lage vertragingstijd modus voor Firmware flashen + Dit kan helpen op toestellen waar firmware flashen faalt Stappen geschiedenis Huidige stappen/min @@ -446,7 +446,7 @@ Firmware versie: %1$s Fout tijdens het aanmaken van map voor logbestanden: %1$s "HR: " - Firmware-update wordt uitgevoerd + Flashen firmware Firmware niet verzonden Hartslag Hartslag @@ -465,16 +465,16 @@ Fout bij het exporteren voorkeur: %1$s Data importeren? Weet u zeker dat u de huidige database wil overschrijven? Al uw huidige activiteitsgegevens (indien aanwezig) zullen verloren gaan. - Importeren succesvol. + Geïmporteerd. Fout bij het importeren DB: %1$s Fout bij het importeren voorkeur: %1$s Verwijder activeitsgegevens? Weet u zeker dat u de volledige database wil verwijderen? Al uw activiteitsgegevens en informatie over uw toestellen zullen verloren gaan. - Gegevens succesvol verwijderd. + Gegevens verwijderd. Verwijderen database mislukt. Oude activiteitsdatabase verwijderen? Weet u zeker dat u de oude activiteitsdatabase wil verwijderen? Activiteitsgegevens die niet geïmporteerd zijn zullen verloren gaan. - Oude activiteitsgegevens succesvol verwijderd. + Oude activiteitsgegevens verwijderd. Oude activiteitsdatabase verwijderen mislukt. Overschrijven Annuleren @@ -483,7 +483,7 @@ Vibratie Pebble koppelen - Waarschijnlijk verschijnt er een koppelingsdialoogvenster op uw Android-apparaat. Als dat niet gebeurt, kijk dan tussen uw notificaties en accepteer het koppelingsverzoek. Accepteer daarna het koppelingsverzoek op uw Pebble + Er zal een koppelingsdialoogvenster verschijnen op uw Android-apparaat. Als dat niet gebeurt, kijk dan tussen uw notificaties en accepteer het koppelingsverzoek. Accepteer het daarna ook op uw Pebble Zorg ervoor dat deze skin is ingeschakeld in de Weermeldingen app om informatie over het weer op uw Pebble te krijgen. \n @@ -542,4 +542,15 @@ Exrizu K8 No.1 F1 Teclast H30 +Automatisch exporteren + Automatisch exporteren ingeschakeld + Locatie exporteren + Interval voor exporteren + Exporteer iedere %d uur + + Database exporteren mislukt! Controleer uw instellingen. + Spaans + + Kies export locatie + Gadgetbridge meldingen diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 168328ead..6f6cfc3d8 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -7,7 +7,7 @@ Sair Sincronizar Monitor de sono (ALPHA) - Buscando dispositivo perdido... + Buscando dispositivo desconectado Print da tela Desconectar Apagar dispositivo @@ -142,8 +142,8 @@ Teste Teste de notificação Esta é uma Notificação de Teste de Gadgetbridge - Bluetooth não suportado - Bluetooth desabilitado + Bluetooth não suportado. + Bluetooth desabilitado. Toque no dispositivo conectado Toque no dispositivo conectado Toque no dispositivo conectado para Vibração @@ -166,11 +166,11 @@ Parear dispositivo Use a caixa de diálogo Android Bluetooth para emparelhar o dispositivo. Parear sua Mi Band - Pareando com %s... + Pareando com %s… Criar vínculo com %1$s (%2$s) Não é possível emparelhar com %1$s (%2$s) Vinculação em andamento: %1$s (%2$s) - Já ligado com %1$s (%2$s), conectando ... + Já ligado com %1$s (%2$s), conectando… Nenhum endereço do mac passou, não pode emparelhar. Configurações Específicas do Dispositivo Configurações da Mi Band @@ -211,7 +211,7 @@ Navegação Rede social Busca Dispositivo Perdido - Cancele para parar a vibração + Cancele para parar a vibração. Sua atividade Configurar Alarmes Configurar alarmes @@ -235,7 +235,7 @@ Não foi possível encontrar um manipulador para instalar o arquivo. Impossível instalar o arquivo fornecido: %1$s Não é possível instalar o firmware fornecido: ele não corresponde à revisão do hardware do seu Pebble. - Aguarde enquanto é determinado o status da instalação ... + Aguarde enquanto é determinado o status da instalação… Gadget com bateria baixa! %1$s bateria a: %2$s%% Última carga: %s \n @@ -256,7 +256,7 @@ Problema com a transferência do firmware. NÃO REBOTAR sua Mi Band! Problemas ao transferir os metadados do firmware Instalação do Firmware completa - Instalação do Firmware completa, reiniciando o dispositivo... + Instalação do Firmware completa, reiniciando o dispositivo… Falha ao instalar o Firmware Passos Atividade ao vivo @@ -303,7 +303,7 @@ HW: %1$s FW: %1$s Erro ao criar o diretório para arquivos de log: %1$s - FC: + "FC: " Atualização de Firmware em progresso Firmware não enviado Frequência cardíaca @@ -356,12 +356,12 @@ Blacklist do Calendário - Você está prestes a instalar o firmware% s no Amazip Bip. -\n -\nCertifique-se de instalar o firmware .gps, depois o arquivo .res e, finalmente, o arquivo .fw. Seu relógio será reiniciado após a instalação do arquivo .fw. -\n -\nNota: você não precisa instalar .res e .gps se esses arquivos forem exatamente os mesmos que os instalados anteriormente. -\n + Você está prestes a instalar o firmware %s no Amazip Bip. +\n +\nCertifique-se de instalar o firmware .gps, depois o arquivo .res e, finalmente, o arquivo .fw. Seu relógio será reiniciado após a instalação do arquivo .fw. +\n +\nNota: você não precisa instalar .res e .gps se esses arquivos forem exatamente os mesmos que os instalados anteriormente. +\n \nPROSSIGA POR SUA CONTA E RISCO! Você está prestes a instalar o firmware %s no seu Amazfit Cor. \n @@ -415,4 +415,9 @@ Número de toques no botão para enviar a mensagem Mensagem para enviar Enviar mensagem após um número definido de toques no botão - + Enviar eventos do calendário para linha do tempo + + Ativar botão + Ativar vibração + Notificações - Gadgetbridge + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 59be902a1..fb500d5bd 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -50,7 +50,7 @@ 您即将安装固件 %s ，代替当前在Mi Band上的固件。 即将在您的米动手表青春版(Amazfit Bip)上安装固件 %s 。 \n -\n请确保安装.gps固件，然后安装.res文件，最后安装.fw文件。 安装.fw文件后，手表将重新启动。 +\n请确保安装.fw文件，然后安装.res文件，最后安装.gps文件。 安装.fw文件后，手表将重新启动。 \n \n注意：如果这些文件与之前安装的完全一样，则不必安装.res和.gps文件。 \n @@ -523,7 +523,7 @@ 使用实验性Pebble LE以支持所有Pebble，代替BT经典连接。 这首先需要以非LE配对，然后以Pebble LE连接 如果您的Pebble 2 / Pebble LE无法正常工作，请尝试使用此设置来限制MTU（有效范围20-512） 自动导出 - 自动导出已启用 + 启用自动导出 导出位置 导出间隔 每%d小时导出一次 @@ -538,4 +538,5 @@ Vibratissimo HPlus 选择导出位置 +Gadgetbridge 通知 diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 000000000..bc4c1e708 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #0091EA + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1d72bee37..ffb30680a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -544,6 +544,7 @@ Exrizu K8 No.1 F1 Teclast H30 + XWatch Choose export location Gadgetbridge notifications diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index 4b385c038..c74d8d1b3 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -1,5 +1,18 @@ + + Inital suport for Xwatch + Move the connected device to top in control center + Add adaptive launcher icon for Android 8.x + No longer plot heart rate graph when device was detected as not worn + Pebble: Small fixes for background js (e.g. Pebble-Casio-WV58DE) + Pebble: native (non bg js) support for weather in Simply Light watchface + + + Display the chat icon for notifications coming from Kontalk and Antox + Pebble: Fix for background js which try to send floats (e.g. TrekVolle) + Mi Band 2: Change the way vibration patterns work, also fixes problems with missing text on newer firmwares + Fix crash in settings activity with export location Fix notification deletion regression diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/LanguageUtilsTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/LanguageUtilsTest.java index ccfd1ba38..5b09c026a 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/LanguageUtilsTest.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/LanguageUtilsTest.java @@ -39,7 +39,12 @@ public class LanguageUtilsTest extends TestBase { String pangram = "نص حكيم له سر قاطع وذو شأن عظيم مكتوب على ثوب أخضر ومغلف بجلد أزرق"; String pangramExpected = "n9 7kym lh sr qa63 wthw sh2n 36'ym mktwb 3la thwb 259'r wm3'lf bjld 2zrq"; String pangramActual = LanguageUtils.transliterate(pangram); - assertEquals("Arabic pangram transliteration failed", pangramExpected, pangramActual); + assertEquals("pangram transliteration failed", pangramExpected, pangramActual); + + String taMarbutah = "ﺓ"; + String taMarbutahExpected = ""; + String taMarbutahActual = LanguageUtils.transliterate(taMarbutah); + assertEquals("ta marbutah transliteration failed", taMarbutahExpected, taMarbutahActual); String hamza = "ءأؤإئآ"; String hamzaExpected = "222222"; diff --git a/fastlane/metadata/android/en-US/changelogs/123.txt b/fastlane/metadata/android/en-US/changelogs/123.txt new file mode 100644 index 000000000..def374d9b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/123.txt @@ -0,0 +1,3 @@ +* Display the chat icon for notifications coming from Kontalk and Antox +* Pebble: Fix for background js which try to send floats (e.g. TrekVolle) +* Mi Band 2: Change the way vibration patterns work, also fixes problems with missing text on newer firmwares diff --git a/fastlane/metadata/android/en-US/changelogs/124.txt b/fastlane/metadata/android/en-US/changelogs/124.txt new file mode 100644 index 000000000..11cf00646 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/124.txt @@ -0,0 +1,6 @@ +* Inital suport for Xwatch +* Move the connected device to top in control center +* Add adaptive launcher icon for Android 8.x +* No longer plot heart rate graph when device was detected as not worn +* Pebble: Small fixes for background js (e.g. Pebble-Casio-WV58DE) +* Pebble: native (non bg js) support for weather in Simply Light watchface