diff --git a/CHANGELOG.md b/CHANGELOG.md index 35baab24e..66ced7d35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ ### Changelog +#### Version 0.32.3 +* Fix a crash in charts due to a broken German translation +* Fix a crash when transliterating emoji +* Amazfit Bip/Cor: Support disconnect notification (must be configured in Bip settings for Cor also for now) + +#### Version 0.32.2 +* Fix setting alarms under some circumstances +* Support calls notifications for some VoIP apps +* Mi Band 3: Enable fetching sports activities (currently only useful for flushing activities) +* Casio: Improve stability +* Casio: Add explicit support for GB-6900B, GB-X6900B and GB-5600B + #### Version 0.32.1 * Fix db deadlock on alarm migration diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index afe301ebc..5d318047d 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -27,68 +27,90 @@ * Daniele Gobbetti * João Paulo Barraca * Yaron Shahrabani -* Jonas +* Allan Nordhøy * postsorino +* Jonas +* Roi Greenberg * Sebastian Kranz * Vadim Kaushan -* Allan Nordhøy * protomors * José Rebelo +* mesnevi +* naofum +* youzhiran <2668760098@qq.com> * TaaviE * mueller-ma * ivanovlev -* naofum -* youzhiran <2668760098@qq.com> * Tijl Schepens -* mesnevi +* Hadrián Candela * Julien Pivotto +* Andreas Böhler +* 陈少举 * Taavi Eomäe * Steffen Liebergeld -* Lem Dulfo -* Hadrián Candela -* Felix Konstantin Maurer -* Sergey Trofimov -* Robert Barat * Pavel Elagin +* Lem Dulfo +* Matthieu Baerts +* Felix Konstantin Maurer +* Utsob Roy +* Sergey Trofimov +* Full Name +* Robert Barat * JohnnySun * Uwe Hermann * Kranz +* Gilles Émilien MOREL * Edoardo Rosa +* Bożydar * Alberto * Vladislav Serkov * Vebryn -* Gilles Émilien MOREL +* M. Hadi +* Giuseppe Caliendo * Gergely Peidl * Emre -* Bożydar +* Elwood +* AndrewBedscastle <1462953+AndrewBedscastle@users.noreply.github.com> +* abettenburg * 0nse <0nse@users.noreply.github.com> * Максим Якимчук * Rimas Raguliūnas * nautilusx +* Minori Hiraoka (미노리) * masakoodaa * Marius Cornescu * Lukas Veneziano +* LL * Kompact * K0L0B0G +* Johann C. Rode * Jasper +* Dikay900 * Christian Fischer -* c4ndel4 * 6arms1leg * Zhong Jianxin * walkjivefly +* WaldiS * Thomas * Ted Stein +* ssantos +* Sebastian Obrusiewicz +* Ranved Sticon * petronovak +* Petr Kadlec * Pascal * NotAFIle * Normano64 * NicoBuntu -* Minori Hiraoka (미노리) +* Moarc * Michal Novotny * Martin -* LL +* Louis-Marie Croisez * Jesús +* Irul +* HenRy * exit-failure +* Dreamwalker * Denis * Avamander * AnthonyDiGirolamo @@ -98,26 +120,32 @@ * Yar * xzovy * xphnx +* Xavier RENE-CORAIL * Vitaliy Shuruta * Vincèn PUJOL +* veecue * Tomer Rosenfeld * Tomas Radej * tiparega <11555126+tiparega@users.noreply.github.com> * Tarik Sekmen * Szymon Tomasz Stefanek * szilardx <15869670+szilardx@users.noreply.github.com> +* Stan Gomin +* SinMan * Sergio Lopez +* S Dantas * Sami Alaoui <4ndroidgeek@gmail.com> * Roman Plevka * rober * redking * Quallenauge * Pavel Motyrev +* Pavel * Olexandr Nesterenko * Nicolò Balzarotti * Natanael Arndt +* Nabil BENDAFI * Molnár Barnabás -* Moarc * Mike van Rossum * Michal Novak * michaelneu @@ -142,9 +170,14 @@ * kalaee * Joseph Kim * jonnsoft <> +* Johannes Tysiak +* jcrode <46062294+jcrode@users.noreply.github.com> * Jan Lolek * Jakub Jelínek * Ivan +* Hüseyin Aslan +* hr-sales +* Hirnchirurg * Hasan Ammar * Grzegorz Dznsk * Gilles MOREL @@ -152,7 +185,8 @@ * Gabe Schrecker * freezed-or-frozen * Frank Slezak -* Dreamwalker +* Francesco Franchina +* Edoardo Tronconi * Dougal19 <4662351+Dougal19@users.noreply.github.com> * Davis Mosenkovs * Daniel Hauck @@ -164,14 +198,18 @@ * Carlos Ferreira * bucala * boun +* Benjamin Kahlau * batataspt@gmail.com * atkyritsis +* apre * Aniruddha Adhikary * andrewlytvyn * AndrewH <36428679+andrewheadricke@users.noreply.github.com> * andre * Allen B <28495335+Allen-B1@users.noreply.github.com> +* Alfeu Lucas Guedes dos Santos * Alexey Afanasev +* Alexandra Sevostyanova And all the Transifex translators, which I cannot automatically list, at the moment. diff --git a/GBDaoGenerator/build.gradle b/GBDaoGenerator/build.gradle index 756314f81..e3b2b063c 100644 --- a/GBDaoGenerator/build.gradle +++ b/GBDaoGenerator/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'java' -//apply plugin: 'maven' +apply plugin: 'maven' apply plugin:'application' archivesBaseName = 'gadgetbridge-daogenerator' @@ -8,7 +8,7 @@ archivesBaseName = 'gadgetbridge-daogenerator' dependencies { // compile 'org.greenrobot:greendao-generator:2.2.0' // compile project(":DaoGenerator") - compile 'com.github.freeyourgadget:greendao:1998d7cd2d21f662c6044f6ccf3b3a251bbad341' + compile 'com.github.Freeyourgadget:greendao:1998d7cd2d21f662c6044f6ccf3b3a251bbad341' } sourceSets { diff --git a/app/build.gradle b/app/build.gradle index 3e38a1c82..6c2fe1240 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,8 +25,8 @@ android { targetSdkVersion 27 // Note: always bump BOTH versionCode and versionName! - versionName "0.32.1" - versionCode 144 + versionName "0.32.3" + versionCode 146 vectorDrawables.useSupportLibrary = true } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 05fa9114f..172c46320 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,6 +20,7 @@ + diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java index ce0b06234..9a62b31e8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, Martin, Normano64, Pavel Elagin, Taavi Eomäe +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Martin, Matthieu Baerts, Normano64, Pavel Elagin, Taavi Eomäe This file is part of Gadgetbridge. @@ -399,7 +399,7 @@ public class GBApplication extends Application { private static void loadAppsNotifBlackList() { GB.log("Loading apps_notification_blacklist", GB.INFO, null); - apps_notification_blacklist = (HashSet) sharedPrefs.getStringSet(GBPrefs.PACKAGE_BLACKLIST, null); + apps_notification_blacklist = (HashSet) sharedPrefs.getStringSet(GBPrefs.PACKAGE_BLACKLIST, null); // lgtm [java/abstract-to-concrete-cast] if (apps_notification_blacklist == null) { apps_notification_blacklist = new HashSet<>(); } @@ -451,7 +451,7 @@ public class GBApplication extends Application { private static void loadAppsPebbleBlackList() { GB.log("Loading apps_pebblemsg_blacklist", GB.INFO, null); - apps_pebblemsg_blacklist = (HashSet) sharedPrefs.getStringSet(GBPrefs.PACKAGE_PEBBLEMSG_BLACKLIST, null); + apps_pebblemsg_blacklist = (HashSet) sharedPrefs.getStringSet(GBPrefs.PACKAGE_PEBBLEMSG_BLACKLIST, null); // lgtm [java/abstract-to-concrete-cast] if (apps_pebblemsg_blacklist == null) { apps_pebblemsg_blacklist = new HashSet<>(); } @@ -523,7 +523,7 @@ public static String packageNameToPebbleMsgSender(String packageName) { private static void loadCalendarsBlackList() { GB.log("Loading calendars_blacklist", GB.INFO, null); - calendars_blacklist = (HashSet) sharedPrefs.getStringSet(GBPrefs.CALENDAR_BLACKLIST, null); + calendars_blacklist = (HashSet) sharedPrefs.getStringSet(GBPrefs.CALENDAR_BLACKLIST, null); // lgtm [java/abstract-to-concrete-cast] if (calendars_blacklist == null) { calendars_blacklist = new HashSet<>(); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBEnvironment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBEnvironment.java index 01638a87f..a8e5971f3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBEnvironment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBEnvironment.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBException.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBException.java index e415940e2..904d7bda6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBException.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBException.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LockHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LockHandler.java index abf1934bf..597ec30a0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LockHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LockHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Taavi Eomäe +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Taavi Eomäe This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Logging.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Logging.java index 2726abac4..32dc97081 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Logging.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Logging.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Carsten Pfeiffer, Daniele Gobbetti, Pavel Elagin +/* Copyright (C) 2016-2019 Carsten Pfeiffer, Daniele Gobbetti, Pavel Elagin This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LoggingExceptionHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LoggingExceptionHandler.java index ffc8fbc5b..13febdd74 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LoggingExceptionHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LoggingExceptionHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SleepAlarmWidget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SleepAlarmWidget.java index 146eb5c47..69575c63d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SleepAlarmWidget.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SleepAlarmWidget.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 0nse, Carsten Pfeiffer +/* Copyright (C) 2016-2019 0nse, Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractFragmentPagerAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractFragmentPagerAdapter.java index a97938006..ab28aeaa5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractFragmentPagerAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractFragmentPagerAdapter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java index b4adc3281..c22073d43 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Lem Dulfo +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Lem Dulfo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragment.java index dfb2d3794..8ceed6f57 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragment.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, walkjivefly This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragmentActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragmentActivity.java index 5e87fe531..6b2183d2c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragmentActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragmentActivity.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractListActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractListActivity.java index b4c1b6199..a5d26eb5e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractListActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractListActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java index 798971a63..15714be22 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Christian +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Christian Fischer, Daniele Gobbetti, Lem Dulfo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java index 2fdacb2c6..56b97a9c0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java index f1be80574..a5e651808 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Lem Dulfo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AndroidPairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AndroidPairingActivity.java index cf7aa1ed5..b8bc01f4d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AndroidPairingActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AndroidPairingActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Lem Dulfo +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Lem Dulfo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java index 2b8fcc60d..2d5db9c00 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, Lem Dulfo +/* Copyright (C) 2015-2019 abettenburg, Andreas Shimokawa, Carsten Pfeiffer, + Daniele Gobbetti, Lem Dulfo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/CalBlacklistActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/CalBlacklistActivity.java index 8f454369d..f770937b3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/CalBlacklistActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/CalBlacklistActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2017-2019 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java index 6388c2fc5..1183a67ce 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Lem Dulfo This file is part of Gadgetbridge. @@ -115,8 +115,18 @@ public class ConfigureAlarms extends AbstractGBActivity { DaoSession daoSession = db.getDaoSession(); Device device = DBHelper.getDevice(getGbDevice(), daoSession); User user = DBHelper.getUser(daoSession); - while (supportedNumAlarms > alarms.size()) { - alarms.add(createDefaultAlarm(device, user, alarms.size())); + for (int position = 0; position < supportedNumAlarms; position++) { + boolean found = false; + for (Alarm alarm : alarms) { + if (alarm.getPosition() == position) { + found = true; + break; + } + } + if (!found) { + LOG.info("adding missing alarm at position " + position); + alarms.add(position, createDefaultAlarm(device, user, position)); + } } } catch (Exception e) { LOG.error("Error accessing database", e); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java index 8dbf8005b..e9934b214 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, Taavi Eomäe +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Johannes Tysiak, Taavi Eomäe This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DbManagementActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DbManagementActivity.java index cd9ee9772..136c8e427 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DbManagementActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DbManagementActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Alberto, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2016-2019 Alberto, Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java index b0385fa79..cd07ad547 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Frank Slezak, ivanovlev, Kasha, Lem Dulfo, Pavel Elagin, Steffen Liebergeld @@ -321,10 +321,16 @@ public class DebugActivity extends AbstractGBActivity { private void shareLog() { String fileName = GBApplication.getLogPath(); if(fileName != null && fileName.length() > 0) { + File logFile = new File(fileName); + if (!logFile.exists()) { + GB.toast("File does not exist", Toast.LENGTH_LONG, GB.INFO); + return; + } + Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND); emailIntent.setType("*/*"); emailIntent.putExtra(EXTRA_SUBJECT, "Gadgetbridge log file"); - emailIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(new File(fileName))); + emailIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(logFile)); startActivity(Intent.createChooser(emailIntent, "Share File")); } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java index 7c2e6e057..6fe43a40d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, boun, Carsten Pfeiffer, +/* Copyright (C) 2015-2019 Andreas Shimokawa, boun, Carsten Pfeiffer, Daniele Gobbetti, JohnnySun, jonnsoft, Lem Dulfo, Taavi Eomäe, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java index ff1ae38d8..8e586543a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Lem Dulfo, Uwe Hermann This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java index a71123a5f..dc47d2c2c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2018 Andreas Shimokawa +/* Copyright (C) 2018-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java index 4d8ebbd59..c7ea1842b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Lem Dulfo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/GBActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/GBActivity.java index 7be507add..4bad14daf 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/GBActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/GBActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Lem Dulfo +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Lem Dulfo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java index b4aaf949f..26340a4d8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 Carsten Pfeiffer, Dikay900 This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InstallActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InstallActivity.java index c95946538..ab57fd066 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InstallActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InstallActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/NotificationFilterActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/NotificationFilterActivity.java index 684cfa375..8df741f62 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/NotificationFilterActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/NotificationFilterActivity.java @@ -1,3 +1,19 @@ +/* Copyright (C) 2018-2019 abettenburg, AndrewBedscastle, 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.activities; import android.os.Bundle; @@ -169,7 +185,7 @@ public class NotificationFilterActivity extends AbstractGBActivity { notificationFilterEntryDao.deleteByKeyInTx(mFilterEntryIds); - Long filterId = notificationFilterDao.insertOrReplace(mNotificationFilter); + long filterId = notificationFilterDao.insertOrReplace(mNotificationFilter); // only save words if filter mode != none if (mNotificationFilter.getNotificationFilterMode() != NOTIFICATION_FILTER_MODE_NONE) { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java index d80e0d5d1..b71a63542 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2015-2019 0nse, Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Felix Konstantin Maurer, José Rebelo, Martin, Normano64, Pavel Elagin @@ -62,8 +62,16 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB; import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; +import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_ACTIVATE_DISPLAY_ON_LIFT; +import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISCONNECT_NOTIFICATION; +import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISCONNECT_NOTIFICATION_END; +import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISCONNECT_NOTIFICATION_START; +import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISPLAY_ON_LIFT_END; +import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISPLAY_ON_LIFT_START; import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DATEFORMAT; import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DISPLAY_ITEMS; +import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DO_NOT_DISTURB_OFF; +import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DO_NOT_DISTURB_SCHEDULED; import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_ENABLE_TEXT_NOTIFICATIONS; import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI3_BAND_SCREEN_UNLOCK; import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI3_NIGHT_MODE; @@ -496,6 +504,59 @@ public class SettingsActivity extends AbstractSettingsActivity { } }); + String disconnectNotificationState = prefs.getString(PREF_DISCONNECT_NOTIFICATION, PREF_MI2_DO_NOT_DISTURB_OFF); + boolean disconnectNotificationScheduled = disconnectNotificationState.equals(PREF_MI2_DO_NOT_DISTURB_SCHEDULED); + + final Preference disconnectNotificationStart = findPreference(PREF_DISCONNECT_NOTIFICATION_START); + disconnectNotificationStart.setEnabled(disconnectNotificationScheduled); + disconnectNotificationStart.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newVal) { + invokeLater(new Runnable() { + @Override + public void run() { + GBApplication.deviceService().onSendConfiguration(PREF_DISCONNECT_NOTIFICATION_START); + } + }); + return true; + } + }); + + + final Preference disconnectNotificationEnd = findPreference(PREF_DISCONNECT_NOTIFICATION_END); + disconnectNotificationStart.setEnabled(disconnectNotificationScheduled); + disconnectNotificationStart.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newVal) { + invokeLater(new Runnable() { + @Override + public void run() { + GBApplication.deviceService().onSendConfiguration(PREF_DISCONNECT_NOTIFICATION_END); + } + }); + return true; + } + }); + + + final Preference disconnectNotification = findPreference(PREF_DISCONNECT_NOTIFICATION); + disconnectNotification.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newVal) { + final boolean scheduled = PREF_MI2_DO_NOT_DISTURB_SCHEDULED.equals(newVal.toString()); + + disconnectNotificationStart.setEnabled(scheduled); + disconnectNotificationEnd.setEnabled(scheduled); + invokeLater(new Runnable() { + @Override + public void run() { + GBApplication.deviceService().onSendConfiguration(PREF_DISCONNECT_NOTIFICATION); + } + }); + return true; + } + }); + // Get all receivers of Media Buttons Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/VibrationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/VibrationActivity.java index 1901747b1..a0180adc3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/VibrationActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/VibrationActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java index 518939d36..fa6d97da4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Konrad Iturbe, Lem Dulfo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerActivity.java index eaf4c236f..44dc09f0c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentCache.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentCache.java index e77a5647c..128b08e45 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentCache.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentCache.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledApps.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledApps.java index f1d05af8a..6bfaa46ae 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledApps.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledApps.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2016-2019 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledWatchfaces.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledWatchfaces.java index 4bee64475..76fda3dc6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledWatchfaces.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledWatchfaces.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java index 6c1f3a67e..b0722bd7d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, - Daniele Gobbetti, walkjivefly +/* Copyright (C) 2015-2019 0nse, Andreas Shimokawa, Carsten Pfeiffer, + Daniele Gobbetti, Dikay900, Pavel Elagin, walkjivefly This file is part of Gadgetbridge. 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 5a5ab43f6..34bebe755 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,5 +1,5 @@ -/* Copyright (C) 2015-2018 0nse, Alberto, Andreas Shimokawa, Carsten Pfeiffer, - Daniele Gobbetti +/* Copyright (C) 2015-2019 0nse, Alberto, Andreas Shimokawa, Carsten Pfeiffer, + Daniele Gobbetti, Pavel Elagin 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 a81738e27..155dcf7b2 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Pavel Elagin, 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 c1579891d..4c4e1000f 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,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, Pavel Elagin +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Dikay900, Pavel Elagin 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 c5a021fc1..a85bced23 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 ff53f4ae1..6a4c20888 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 a61b0262f..43ee7ae82 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 2942da446..9a80db314 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 59bd67fc3..c2ab8b94a 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,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Dikay900, Pavel, Pavel Elagin 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 4ca0f0dfc..80122156e 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-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 8e6865e5e..05b090368 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,5 +1,5 @@ -/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, - Daniele Gobbetti, Pavel Elagin +/* Copyright (C) 2015-2019 0nse, Andreas Shimokawa, Carsten Pfeiffer, + Daniele Gobbetti, Dikay900, Pavel Elagin 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 33ecef693..5423cd1a9 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 c255f3707..d7bcbe939 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-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2015-2019 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 10631b031..e6bfdd55c 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 36e1f7a46..06d28e45b 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 b22f8b740..936bcc27a 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Pavel Elagin +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Pavel Elagin 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 3968d1145..35ef4ee40 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,5 +1,5 @@ -/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, - Daniele Gobbetti +/* Copyright (C) 2015-2019 0nse, Andreas Shimokawa, Carsten Pfeiffer, + Daniele Gobbetti, Pavel Elagin This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AbstractItemAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AbstractItemAdapter.java index ceb257706..229f259e0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AbstractItemAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AbstractItemAdapter.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ActivitySummariesAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ActivitySummariesAdapter.java index 544ff5f58..2f29b3b39 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ActivitySummariesAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ActivitySummariesAdapter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2017-2019 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 79ad76629..46284b2c9 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,5 @@ -/* Copyright (C) 2017-2018 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2017-2019 abettenburg, AndrewBedscastle, 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 25f796869..2948d0940 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 211f8fe35..07500a8b4 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 a5c71b986..e3b041fa3 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, José Rebelo, Lem Dulfo, maxirnilian 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 4b0a6903b..0dbb1a995 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 f038655d2..cc1a4cfc5 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 d13391896..f8cb6b034 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti 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 79bc38313..84739d336 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 80d99c507..6029bdfaa 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 7f46604d2..bb9284d56 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 7c4eb6c79..85e876d0d 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 5449d15b6..685032a3b 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 5c5fccb36..ed9ec8cd5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/PeriodicExporter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/PeriodicExporter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Carsten Pfeiffer, Felix Konstantin Maurer +/* Copyright (C) 2018-2019 Carsten Pfeiffer, Felix Konstantin Maurer This file is part of Gadgetbridge. 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 e0191ed2c..a88f4b4f0 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 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 b2ff50ca5..5d12ec1bf 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 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 707386b52..96108d67c 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-2018 protomors +/* Copyright (C) 2017-2019 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 8e2f6340d..4c60c52c8 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 fd2200d8a..bf971d553 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, 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 fc3c17d00..3a50d34fa 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 1000861aa..8af161f63 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-2018 Andreas Shimokawa +/* Copyright (C) 2015-2019 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 d835ea1c0..2eaf8eca7 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 08c8da1fc..6b682791d 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-2018 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2015-2019 Andreas Shimokawa, Daniele Gobbetti, José Rebelo 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 a2240865a..97e4f9d3d 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-2018 Andreas Shimokawa +/* Copyright (C) 2015-2019 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 7b45fb427..c857fbba4 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 318a73340..a75d30858 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-2018 Andreas Shimokawa +/* Copyright (C) 2015-2019 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFmFrequency.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFmFrequency.java index 3e1848208..180179011 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFmFrequency.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFmFrequency.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 José Rebelo +/* Copyright (C) 2015-2019 Andreas Shimokawa, José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventLEDColor.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventLEDColor.java index a3c7ca807..9ada44418 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventLEDColor.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventLEDColor.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 José Rebelo +/* Copyright (C) 2015-2019 Andreas Shimokawa, José Rebelo 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 9dd88bc15..9d9547a0e 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-2018 Andreas Shimokawa +/* Copyright (C) 2015-2019 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 e5b745a83..3d602adc1 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-2018 Andreas Shimokawa +/* Copyright (C) 2015-2019 Andreas Shimokawa, Daniele Gobbetti 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 1d11e9323..489f43e8e 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-2018 Andreas Shimokawa +/* Copyright (C) 2015-2019 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 4f4c4003f..d8ab677c4 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-2018 Andreas Shimokawa +/* Copyright (C) 2015-2019 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 c6b24c5f5..5721c39a1 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-2018 Andreas Shimokawa +/* Copyright (C) 2015-2019 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 53d940b77..dc1244713 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 6ad638c69..5eb570c6d 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-2018 Andreas Shimokawa +/* Copyright (C) 2017-2019 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 7953ba3d7..0bc617b84 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, José Rebelo, Matthieu Baerts 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 98d515d58..2739c3de6 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti 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 244ccb18d..127056222 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, JohnnySun, José Rebelo, Uwe Hermann +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, JohnnySun, José Rebelo, Matthieu Baerts, 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 85bbd970c..c1a6c943d 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,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. 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 787f5356b..71963a2d7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, Julien Pivotto, Kasha, Steffen Liebergeld, Uwe Hermann +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, José Rebelo, 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 2bbfa22b0..682a32243 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 2c85e908c..546f99140 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 05405b86d..df6fc0596 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/amazfitbip/BipActivitySummary.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/amazfitbip/BipActivitySummary.java index 88f9283f8..e3c8e7cba 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/amazfitbip/BipActivitySummary.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/amazfitbip/BipActivitySummary.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Carsten Pfeiffer +/* Copyright (C) 2017-2019 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casiogb6900/CasioGB6900Constants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casiogb6900/CasioGB6900Constants.java index b701a6f0b..afeaa08c0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casiogb6900/CasioGB6900Constants.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casiogb6900/CasioGB6900Constants.java @@ -1,20 +1,20 @@ -/* Copyright (C) 2018 Andreas Böhler +/* Copyright (C) 2018-2019 Andreas Böhler based on code from BlueWatcher, https://github.com/masterjc/bluewatcher - This file is part of Gadgetbridge. + 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 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. + 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 . */ + 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.casiogb6900; import java.util.UUID; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casiogb6900/CasioGB6900DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casiogb6900/CasioGB6900DeviceCoordinator.java index 296ca4505..14328fcc3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casiogb6900/CasioGB6900DeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casiogb6900/CasioGB6900DeviceCoordinator.java @@ -1,20 +1,21 @@ -/* Copyright (C) 2018 Andreas Böhler +/* Copyright (C) 2018-2019 Andreas Böhler, Andreas Shimokawa, Carsten + Pfeiffer, Daniele Gobbetti, José Rebelo based on code from BlueWatcher, https://github.com/masterjc/bluewatcher - This file is part of Gadgetbridge. + 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 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. + 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 . */ + 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.casiogb6900; import android.app.Activity; 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 b600ea309..21beab3d6 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-2018 João Paulo Barraca, Quallenauge +/* Copyright (C) 2017-2019 Daniele Gobbetti, 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 7989398dc..06c478672 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-2018 Andreas Shimokawa, Carsten Pfeiffer, João +/* Copyright (C) 2016-2019 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 2d876e73e..7c6ca3303 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, João Paulo Barraca, José Rebelo 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 16ef9d3ed..bef2e2e87 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,5 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, João Paulo Barraca +/* Copyright (C) 2017-2019 Andreas Shimokawa, Daniele Gobbetti, 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 021afda7a..ee5eb5b1f 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-2018 João Paulo Barraca +/* Copyright (C) 2017-2019 Daniele Gobbetti, João Paulo Barraca, Stan Gomin This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/Q8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/Q8Coordinator.java index c3c8ce724..a0fa2240e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/Q8Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/Q8Coordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 João Paulo Barraca, tiparega +/* Copyright (C) 2017-2019 Daniele Gobbetti, João Paulo Barraca, tiparega This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLift.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLift.java index eb4e4c1d2..af72d00e5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLift.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLift.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, José Rebelo +/* Copyright (C) 2017-2019 Andreas Shimokawa, José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/DisconnectNotificationSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/DisconnectNotificationSetting.java new file mode 100644 index 000000000..3fe72861e --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/DisconnectNotificationSetting.java @@ -0,0 +1,23 @@ +/* Copyright (C) 2017-2019 Andreas Shimokawa, José Rebelo + + 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.huami; + +public enum DisconnectNotificationSetting { + ON, + OFF, + SCHEDULED +} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java index a4bc82811..7702ead05 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. @@ -48,6 +48,14 @@ public class HuamiConst { public static final String MI_BAND2_NAME_HRX = "Mi Band HRX"; public static final String MI_BAND3_NAME = "Mi Band 3"; + public static final String PREF_ACTIVATE_DISPLAY_ON_LIFT = "activate_display_on_lift_wrist"; + public static final String PREF_DISPLAY_ON_LIFT_START = "display_on_lift_start"; + public static final String PREF_DISPLAY_ON_LIFT_END = "display_on_lift_end"; + + public static final String PREF_DISCONNECT_NOTIFICATION = "disconnect_notification"; + public static final String PREF_DISCONNECT_NOTIFICATION_START = "disconnect_notification_start"; + public static final String PREF_DISCONNECT_NOTIFICATION_END = "disconnect_notification_end"; + public static int toActivityKind(int rawType) { switch (rawType) { case TYPE_DEEP_SLEEP: 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 d10ecd8cc..6e674ca70 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, José Rebelo This file is part of Gadgetbridge. @@ -139,7 +140,7 @@ public abstract class HuamiCoordinator extends AbstractDeviceCoordinator { String liftOn = context.getString(R.string.p_on); String liftScheduled = context.getString(R.string.p_scheduled); - String pref = prefs.getString(MiBandConst.PREF_ACTIVATE_DISPLAY_ON_LIFT, liftOff); + String pref = prefs.getString(HuamiConst.PREF_ACTIVATE_DISPLAY_ON_LIFT, liftOff); if (liftOn.equals(pref)) { return ActivateDisplayOnLift.ON; @@ -151,11 +152,37 @@ public abstract class HuamiCoordinator extends AbstractDeviceCoordinator { } public static Date getDisplayOnLiftStart() { - return getTimePreference( MiBandConst.PREF_DISPLAY_ON_LIFT_START, "00:00"); + return getTimePreference(HuamiConst.PREF_DISPLAY_ON_LIFT_START, "00:00"); } public static Date getDisplayOnLiftEnd() { - return getTimePreference( MiBandConst.PREF_DISPLAY_ON_LIFT_END, "00:00"); + return getTimePreference(HuamiConst.PREF_DISPLAY_ON_LIFT_END, "00:00"); + } + + public static DisconnectNotificationSetting getDisconnectNotificationSetting(Context context) { + Prefs prefs = GBApplication.getPrefs(); + + String liftOff = context.getString(R.string.p_off); + String liftOn = context.getString(R.string.p_on); + String liftScheduled = context.getString(R.string.p_scheduled); + + String pref = prefs.getString(HuamiConst.PREF_DISCONNECT_NOTIFICATION, liftOff); + + if (liftOn.equals(pref)) { + return DisconnectNotificationSetting.ON; + } else if (liftScheduled.equals(pref)) { + return DisconnectNotificationSetting.SCHEDULED; + } + + return DisconnectNotificationSetting.OFF; + } + + public static Date getDisconnectNotificationStart() { + return getTimePreference(HuamiConst.PREF_DISCONNECT_NOTIFICATION_START, "00:00"); + } + + public static Date getDisconnectNotificationEnd() { + return getTimePreference(HuamiConst.PREF_DISCONNECT_NOTIFICATION_END, "00:00"); } public static Set getDisplayItems() { 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 af3d7f467..c29fc6011 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java index 8463ebd59..2a5c6d7cc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, JohnnySun, +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, JohnnySun, José Rebelo, Uwe Hermann This file is part of Gadgetbridge. @@ -150,6 +150,8 @@ public class HuamiService { public static final byte[] COMMAND_DISTANCE_UNIT_IMPERIAL = new byte[] { ENDPOINT_DISPLAY, 0x03, 0x00, 0x01 }; public static final byte[] COMMAND_SET_LANGUAGE_NEW_TEMPLATE = new byte[]{ENDPOINT_DISPLAY, 0x17, 0x00, 0, 0, 0, 0, 0}; public static final byte[] COMMAND_FACTORY_RESET = new byte[]{ENDPOINT_DISPLAY, 0x0b, 0x00, 0x01}; + public static final byte[] COMMAND_ENABLE_DISCONNECT_NOTIFCATION = new byte[]{ENDPOINT_DISPLAY, 0x0c, 0x00, 0x01, 0, 0, 0, 0}; + public static final byte[] COMMAND_DISABLE_DISCONNECT_NOTIFCATION = new byte[]{ENDPOINT_DISPLAY, 0x0c, 0x00, 0x00, 0, 0, 0, 0}; // The third byte controls the threshold, in minutes // The last 8 bytes represent 2 separate time intervals for the inactivity warnings 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 f772f8adb..56c557586 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-2018 Andreas Shimokawa +/* Copyright (C) 2017-2019 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 25de26d09..527f658c6 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,5 +1,5 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, João - Paulo Barraca +/* Copyright (C) 2017-2019 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/huami/amazfitbip/AmazfitBipFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWHelper.java index 886fe7ffc..fa3dbcae3 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti 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 605491ff6..66c9fe11b 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 bf1406415..f6e4b1e82 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer 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 aa270850a..3163fdaa7 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,5 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, João Paulo Barraca +/* Copyright (C) 2017-2019 Andreas Shimokawa, Daniele Gobbetti, João + Paulo Barraca, Matthieu Baerts 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 8b21fd2af..38730a8e9 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 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 452886c1e..610d6f013 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorService.java index 0f63c0b08..e248a6f98 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorService.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 6942b477d..42cb30f00 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, 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 d71ea1605..80a5385e9 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti 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 a6027ebb6..6fb08085c 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 e61bd2c44..994aadfa7 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2017-2019 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/huami/miband3/MiBand3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java index b2f7bbc74..6e49bdce5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWHelper.java index c0ecf9db4..640cc3a37 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWHelper.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWInstallHandler.java index c957b1606..b5270549c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWInstallHandler.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Service.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Service.java index 31f1988e5..61a841c1d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Service.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Service.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Constants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Constants.java index 67b7c2047..86d70bcca 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Constants.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Constants.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Vadim Kaushan +/* Copyright (C) 2018-2019 Vadim Kaushan This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java index 10f2919bc..d431978e3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Vadim Kaushan This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115SampleProvider.java index 278b0fba5..64ffc3f8c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115SampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115SampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Vadim Kaushan +/* Copyright (C) 2018-2019 Daniele Gobbetti, Vadim Kaushan 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 e84d60fb6..b18c65d85 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-2018 Sami Alaoui +/* Copyright (C) 2017-2019 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 8494c9283..4c994bf1f 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Dougal19, José Rebelo, 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 731f95008..a817bab31 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-2018 Daniele Gobbetti +/* Copyright (C) 2016-2019 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 c2a54b96d..d078f9eab 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, José Rebelo 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 5616a2f40..6f215bfeb 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti 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 b6e6d4651..339031881 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 eccadd269..1d5622ccb 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti 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 bf26cc9c4..bf653cc92 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 04c689061..448f37f99 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-2018 José Rebelo +/* Copyright (C) 2017-2019 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 dd42380d8..0c62e3b2f 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti 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 66cb6aa8f..29608fc45 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Christian +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Christian Fischer, Daniele Gobbetti, José Rebelo, Michal Novotny, Szymon Tomasz Stefanek This file is part of Gadgetbridge. @@ -49,9 +49,6 @@ public final class MiBandConst { public static final String PREF_MI2_DISPLAY_ITEM_CALORIES = "calories"; public static final String PREF_MI2_DISPLAY_ITEM_HEART_RATE = "heart_rate"; public static final String PREF_MI2_DISPLAY_ITEM_BATTERY = "battery"; - public static final String PREF_ACTIVATE_DISPLAY_ON_LIFT = "activate_display_on_lift_wrist"; - public static final String PREF_DISPLAY_ON_LIFT_START = "display_on_lift_start"; - public static final String PREF_DISPLAY_ON_LIFT_END = "display_on_lift_end"; public static final String PREF_MI2_ROTATE_WRIST_TO_SWITCH_INFO = "mi2_rotate_wrist_to_switch_info"; public static final String PREF_MI2_ENABLE_TEXT_NOTIFICATIONS = "mi2_enable_text_notifications"; public static final String PREF_MI2_DO_NOT_DISTURB = "mi2_do_not_disturb"; 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 b638afa57..68806ea59 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Christian +/* Copyright (C) 2015-2019 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/MiBandDateConverter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandDateConverter.java index d73daf6fa..9b9802ccc 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 1a21528a8..b81ce9c21 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 766cfbd42..635fbb0cf 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 4b10130b7..7d99e1c02 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 aafd33518..e75ff4d44 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Christian +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Christian Fischer, Daniele Gobbetti, José Rebelo, Szymon Tomasz Stefanek This file is part of Gadgetbridge. @@ -36,11 +36,11 @@ import nodomain.freeyourgadget.gadgetbridge.model.NotificationType; import nodomain.freeyourgadget.gadgetbridge.util.GB; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; +import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_ACTIVATE_DISPLAY_ON_LIFT; +import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISPLAY_ON_LIFT_END; +import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISPLAY_ON_LIFT_START; import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_ALARM_CLOCK; import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_INCOMING_CALL; -import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_ACTIVATE_DISPLAY_ON_LIFT; -import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_DISPLAY_ON_LIFT_END; -import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_DISPLAY_ON_LIFT_START; import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DO_NOT_DISTURB; import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DO_NOT_DISTURB_END; import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_DO_NOT_DISTURB_OFF; @@ -120,7 +120,7 @@ public class MiBandPreferencesActivity extends AbstractSettingsActivity { } }); - String displayOnLiftState = prefs.getString(MiBandConst.PREF_ACTIVATE_DISPLAY_ON_LIFT, PREF_MI2_DO_NOT_DISTURB_OFF); + String displayOnLiftState = prefs.getString(PREF_ACTIVATE_DISPLAY_ON_LIFT, PREF_MI2_DO_NOT_DISTURB_OFF); boolean displayOnLiftScheduled = displayOnLiftState.equals(PREF_MI2_DO_NOT_DISTURB_SCHEDULED); final Preference rotateWristCycleInfo = findPreference(PREF_MI2_ROTATE_WRIST_TO_SWITCH_INFO); 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 3a135a5c2..f3732feae 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 4b9ad349d..b24d8005c 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 38dbdcd90..d61c1b589 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-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2015-2019 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 f7a1804e2..26114d00e 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann +/* Copyright (C) 2015-2019 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 11058b144..e69a0fffc 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-2018 protomors +/* Copyright (C) 2017-2019 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 2f1fcef5d..4affefa09 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,5 +1,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, José Rebelo, protomors +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, José Rebelo, Petr Kadlec, 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 3f98c99c8..3e42dd1e9 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-2018 protomors +/* Copyright (C) 2017-2019 Daniele Gobbetti, 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 a5bd601c4..9f21e5cfb 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 5fd2fa670..35cac4dd1 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 c07f68860..78b72a706 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-2018 Andreas Shimokawa +/* Copyright (C) 2015-2019 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 9329b424c..a5380d1c0 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,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, José Rebelo +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, José Rebelo, Matthieu Baerts 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 b394f1421..465987ce3 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 06317582f..ce885da84 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-2018 Andreas Shimokawa +/* Copyright (C) 2015-2019 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 627ada12b..d868e08e0 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 7dc106d30..c9e565fcf 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 7e92971a0..1492a1a51 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 023b40c7c..703b98e04 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 b21bc20f9..54249569a 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi1Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi1Coordinator.java index dcca49639..36c1b2289 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi1Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi1Coordinator.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2018 José Rebelo +/* Copyright (C) 2017-2019 Daniele Gobbetti, João Paulo Barraca, José + Rebelo, Quallenauge This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi3Coordinator.java index 8676a9a3b..1f5b60934 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi3Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi3Coordinator.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2018 José Rebelo +/* Copyright (C) 2017-2019 Daniele Gobbetti, João Paulo Barraca, José + Rebelo, tiparega This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiConst.java index f7992aa76..e8fd99c58 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiConst.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiConst.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 José Rebelo +/* Copyright (C) 2018-2019 José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiCoordinator.java index f131f5e13..1aa75024d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiCoordinator.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2018 José Rebelo +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, José Rebelo 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 83d206366..c19833900 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9CalibrationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9CalibrationActivity.java index 3352c0871..9b4118e93 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9CalibrationActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9CalibrationActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 maxirnilian +/* Copyright (C) 2018-2019 Daniele Gobbetti, maxirnilian This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9Constants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9Constants.java index dea5867ae..90eeccb82 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9Constants.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9Constants.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 maxirnilian +/* Copyright (C) 2018-2019 maxirnilian This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java index 23d8feaad..878076f94 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, maxirnilian, Vadim Kaushan This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java index 1708ef088..a0dacdf87 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 maxirnilian +/* Copyright (C) 2018-2019 Daniele Gobbetti, maxirnilian 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 index 3ec80569d..3eb136d89 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, José Rebelo, ladbsoft This file is part of Gadgetbridge. 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 index 391fca10c..978dc4ae4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchSampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchSampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 ladbsoft, protomors +/* Copyright (C) 2017-2019 Daniele Gobbetti, ladbsoft, protomors This file is part of Gadgetbridge. 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 index 63deb4b46..57e18bc62 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchService.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 ladbsoft +/* Copyright (C) 2018-2019 ladbsoft This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeConstants.java index bfba33c43..f532344ef 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeConstants.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeConstants.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Kranz, Sebastian Kranz +/* Copyright (C) 2018-2019 Kranz, Sebastian Kranz This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java index 68402f3f5..171af81f6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, José Rebelo, Kranz, Sebastian Kranz This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeSampleProvider.java index d76b45982..446723b3e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeSampleProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeSampleProvider.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Sebastian Kranz +/* Copyright (C) 2018-2019 Daniele Gobbetti, Sebastian Kranz This file is part of Gadgetbridge. 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 ff0492c6d..8caf49060 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 b47a3eebb..06325049e 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 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 5f15d5a24..1df22e76c 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 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 cba74f12b..3caf5c2a3 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java index 7ec7b38b8..e9eab610c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2017-2019 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java index 0308eb2de..31159a022 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2017-2018 AndrewH, Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2017-2019 AndrewH, Carsten Pfeiffer, Daniele Gobbetti, + Dikay900 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 9d22d3b66..bba06f855 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti 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 23e048977..82668b3c7 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-2018 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2016-2019 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 5fdb1ce6f..02e6cb2b8 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,4 @@ -/* Copyright (C) 2017-2018 Carsten Pfeiffer, Daniele Gobbetti, Felix +/* Copyright (C) 2017-2019 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 8bafd6176..45957bc22 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 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 e7a5ea13f..c262b00fe 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, João Paulo Barraca +/* Copyright (C) 2016-2019 Andreas Shimokawa, Daniele Gobbetti, 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 5ee5e9773..3a450e965 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,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti 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 87610fea9..1eb6fed89 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa +/* Copyright (C) 2017-2019 Andreas Shimokawa This file is part of Gadgetbridge. 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 86f2413e4..c91aa523f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2017-2019 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 7224232d7..86a3b65e0 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-2018 andre, Andreas Shimokawa, Avamander, Carsten +/* Copyright (C) 2015-2019 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 460a3874e..da6c2329f 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,7 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, Frank Slezak, Hasan Ammar, José Rebelo, Julien Pivotto, Kevin - Richter, Normano64, Steffen Liebergeld, Taavi Eomäe, Zhong Jianxin +/* Copyright (C) 2015-2019 abettenburg, Andreas Shimokawa, AndrewBedscastle, + Carsten Pfeiffer, Daniele Gobbetti, Frank Slezak, Hasan Ammar, José Rebelo, + Julien Pivotto, Kevin Richter, Matthieu Baerts, Normano64, Steffen Liebergeld, + Taavi Eomäe, veecue, 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 a526725de..d43b4bfbb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OmniJawsObserver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OmniJawsObserver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2017-2019 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. 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 e8e889e64..ee271da58 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti 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 e5ae08672..dfedbbf16 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, Normano64 +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Johannes Tysiak, 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 ada2796f7..3185d00ce 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-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, - Normano64, Zhong Jianxin +/* Copyright (C) 2015-2019 0nse, Andreas Shimokawa, Carsten Pfeiffer, + Daniele Gobbetti, 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 b202cbd2b..06dc6ff61 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 5757a3515..c391f48c6 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,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2017-2019 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 437907681..6ae23406c 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-2018 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2015-2019 Andreas Shimokawa, 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 d5068ca18..459cb19af 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, Taavi Eomäe, Uwe Hermann +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, José Rebelo, Taavi Eomäe, Uwe Hermann This file is part of Gadgetbridge. 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 3c9fec7a5..bf1856a94 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 88e0d8703..a3331ecdb 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,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Taavi Eomäe +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Taavi Eomäe 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 d68889fd7..b740c3234 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java @@ -1,6 +1,6 @@ -/* Copyright (C) 2015-2018 Alberto, Andreas Shimokawa, Carsten Pfeiffer, - criogenic, dakhnod, Frank Slezak, ivanovlev, Julien Pivotto, Kasha, Steffen - Liebergeld +/* Copyright (C) 2015-2019 Alberto, Andreas Shimokawa, Carsten Pfeiffer, + criogenic, dakhnod, Daniele Gobbetti, Frank Slezak, ivanovlev, José Rebelo, + Julien Pivotto, Kasha, Roi Greenberg, 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 9896848ce..680891958 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-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 3b5aa1548..ea9ae8f81 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Pavel Elagin +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Pavel Elagin 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 1e047daab..3f337cca2 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-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 36d7cfa8a..a3319aefa 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityPoint.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityPoint.java index 3ee474735..163407e27 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityPoint.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityPoint.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Carsten Pfeiffer +/* Copyright (C) 2017-2019 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 d862aa442..1816d9f54 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummary.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummary.java index 1df0f5249..3041acd92 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummary.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummary.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Carsten Pfeiffer +/* Copyright (C) 2017-2019 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityTrack.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityTrack.java index 5326306be..ea9abb097 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityTrack.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityTrack.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Carsten Pfeiffer +/* Copyright (C) 2017-2019 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 9f94f5ea4..1487d6722 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-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2016-2019 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 57aded93d..5a4c22d3d 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-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 ca169bb27..b6fe8db04 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java @@ -1,6 +1,6 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, AnthonyDiGirolamo, Daniele - Gobbetti, Frank Slezak, Kaz Wolfe, Kevin Richter, Lukas Veneziano, michaelneu, - NotAFIle, Tomas Radej +/* Copyright (C) 2016-2019 Andreas Shimokawa, AnthonyDiGirolamo, Daniele + Gobbetti, Frank Slezak, Kaz Wolfe, Kevin Richter, Lukas Veneziano, Matthieu + Baerts, michaelneu, NotAFIle, Tomas Radej This file is part of Gadgetbridge. 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 25538d675..691d4c3aa 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-2018 Daniele Gobbetti +/* Copyright (C) 2015-2019 Daniele Gobbetti, José Rebelo 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 d03859acb..8bd3af714 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-2018 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2016-2019 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 8a1fbe071..a5be446e0 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 69f569d11..c3685e590 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 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 173d46101..afe2fda92 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 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 887dee80d..da151ab1c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java @@ -1,5 +1,6 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, dakhnod, - Frank Slezak, ivanovlev, JohnnySun, Julien Pivotto, Kasha, Steffen Liebergeld +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, dakhnod, + Daniele Gobbetti, Frank Slezak, ivanovlev, JohnnySun, José Rebelo, 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 8d781e937..25815f358 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java @@ -1,6 +1,7 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, João Paulo Barraca, José Rebelo, Kranz, ladbsoft, maxirnilian, - protomors, Quallenauge, Sami Alaoui, tiparega, Vadim Kaushan +/* Copyright (C) 2015-2019 Andreas Böhler, Andreas Shimokawa, Carsten + Pfeiffer, Daniele Gobbetti, João Paulo Barraca, José Rebelo, Kranz, + ladbsoft, maxirnilian, protomors, Quallenauge, Sami Alaoui, tiparega, + Vadim Kaushan This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GPSCoordinate.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GPSCoordinate.java index 3a867a75a..a88496136 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GPSCoordinate.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GPSCoordinate.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Carsten Pfeiffer +/* Copyright (C) 2017-2019 Carsten Pfeiffer This file is part of Gadgetbridge. 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 bc050b5b6..c00ae2ffe 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-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 aeb08786b..f592c4160 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 aeca5a0c5..57aa5d141 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 305aae64f..74aaedf57 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 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 b7f4da047..fd180e293 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-2018 Andreas Shimokawa, Avamander, Carsten Pfeiffer, +/* Copyright (C) 2016-2019 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 8ace1c759..0a2a32539 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-2018 Andreas Shimokawa, Frank Slezak +/* Copyright (C) 2015-2019 Andreas Shimokawa, Daniele Gobbetti, 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 c35f1bb93..19035556c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, AnthonyDiGirolamo, Carsten +/* Copyright (C) 2015-2019 Andreas Shimokawa, AnthonyDiGirolamo, Carsten Pfeiffer, Daniele Gobbetti, Frank Slezak, Julien Pivotto, Kaz Wolfe, Kevin Richter, Lukas Veneziano diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/RecordedDataTypes.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/RecordedDataTypes.java index 4c6cf4ebe..2a987cae4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/RecordedDataTypes.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/RecordedDataTypes.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. 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 39ad55478..f66c2dae6 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-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 6ffeb865b..4a433b2c7 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 482974914..051579cda 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 6234dc860..284ee7656 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-2018 Andreas Shimokawa, Daniele Gobbetti, Sebastian +/* Copyright (C) 2016-2019 Andreas Shimokawa, Daniele Gobbetti, Sebastian Kranz 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 d7603d086..3c23d9925 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti 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 4a1b96f4e..69d6ed0f7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, Sebastian Kranz, Taavi Eomäe +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, José Rebelo, Sebastian Kranz, Taavi Eomäe 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 6a2dd1798..b63cb85cf 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java @@ -1,7 +1,7 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Avamander, Carsten Pfeiffer, - dakhnod, Daniele Gobbetti, Daniel Hauck, Frank Slezak, ivanovlev, João Paulo - Barraca, Julien Pivotto, Kasha, Martin, Sergey Trofimov, Steffen Liebergeld, - Taavi Eomäe, Uwe Hermann +/* Copyright (C) 2015-2019 Andreas Shimokawa, Avamander, Carsten Pfeiffer, + dakhnod, Daniele Gobbetti, Daniel Hauck, Dikay900, Frank Slezak, ivanovlev, + João Paulo Barraca, José Rebelo, Julien Pivotto, Kasha, Martin, Matthieu + Baerts, Sergey Trofimov, Steffen Liebergeld, Taavi Eomäe, Uwe Hermann This file is part of Gadgetbridge. @@ -356,7 +356,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere } /** - * @param text: original text + * @param text original text * @return 'text' or a new String without non supported chars like emoticons, etc. */ private String sanitizeNotifText(String text) { 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 9f23f9093..ff6569dce 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 a7259d1d4..7c478e21f 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,7 @@ -/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, João Paulo Barraca, José Rebelo, Kranz, ladbsoft, maxirnilian, - protomors, Quallenauge, Sami Alaoui, Sergey Trofimov, tiparega, Vadim Kaushan +/* Copyright (C) 2015-2019 0nse, Andreas Böhler, Andreas Shimokawa, + Carsten Pfeiffer, Daniele Gobbetti, João Paulo Barraca, José Rebelo, Kranz, + ladbsoft, maxirnilian, protomors, Quallenauge, Sami Alaoui, Sergey Trofimov, + tiparega, Vadim Kaushan This file is part of Gadgetbridge. 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 f0fd333f0..1dc2b09f4 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-2018 Daniele Gobbetti +/* Copyright (C) 2017-2019 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 95048f65b..9fc7787b0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, Julien Pivotto, Kasha, Steffen Liebergeld +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, José Rebelo, 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 9155b49e8..b45e3ad4a 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-2018 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2016-2019 Carsten Pfeiffer, Daniele Gobbetti, José Rebelo 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 df3d9edac..bdad45b77 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,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, JohnnySun +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, JohnnySun, José Rebelo This file is part of Gadgetbridge. @@ -17,6 +17,7 @@ along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.service.btle; +import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGattCharacteristic; import android.bluetooth.BluetoothGattDescriptor; @@ -44,16 +45,17 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.AbstractBlePro * Bluetooth Smart. *

* The connection to the device and all communication is made with a generic {@link BtLEQueue}. - * Messages to the device are encoded as {@link BtLEAction actions} that are grouped with a - * {@link Transaction} and sent via {@link BtLEQueue}. + * Messages to the device are encoded as {@link BtLEAction actions} or {@link BtLEServerAction actions} + * that are grouped with a {@link Transaction} or {@link ServerTransaction} and sent via {@link BtLEQueue}. * * @see TransactionBuilder * @see BtLEQueue */ -public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport implements GattCallback { +public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport implements GattCallback, GattServerCallback { private BtLEQueue mQueue; private Map mAvailableCharacteristics; private final Set mSupportedServices = new HashSet<>(4); + private final Set mSupportedServerServices = new HashSet<>(4); private Logger logger; private final List> mSupportedProfiles = new ArrayList<>(); @@ -70,7 +72,7 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im @Override public boolean connect() { if (mQueue == null) { - mQueue = new BtLEQueue(getBluetoothAdapter(), getDevice(), this, getContext()); + mQueue = new BtLEQueue(getBluetoothAdapter(), getDevice(), this, this, getContext(), mSupportedServerServices); mQueue.setAutoReconnect(getAutoReconnect()); } return mQueue.connect(); @@ -136,6 +138,19 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im return createTransactionBuilder(taskName); } + public ServerTransactionBuilder createServerTransactionBuilder(String taskName) { + return new ServerTransactionBuilder(taskName); + } + + public ServerTransactionBuilder performServer(String taskName) throws IOException { + if (!isConnected()) { + if(!connect()) { + throw new IOException("1: Unable to connect to device: " + getDevice()); + } + } + return createServerTransactionBuilder(taskName); + } + /** * Ensures that the device is connected and (only then) performs the actions of the given * transaction builder. @@ -187,6 +202,14 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im mSupportedProfiles.add(profile); } + /** + * Subclasses should call this method to add server services they support. + * @param service + */ + protected void addSupportedServerService(BluetoothGattService service) { + mSupportedServerServices.add(service); + } + /** * Returns the characteristic matching the given UUID. Only characteristics * are returned whose service is marked as supported. @@ -337,4 +360,29 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im public void onSetLedColor(int color) { } + + @Override + public void onConnectionStateChange(BluetoothDevice device, int status, int newState) { + + } + + @Override + public boolean onCharacteristicReadRequest(BluetoothDevice device, int requestId, int offset, BluetoothGattCharacteristic characteristic) { + return false; + } + + @Override + public boolean onCharacteristicWriteRequest(BluetoothDevice device, int requestId, BluetoothGattCharacteristic characteristic, boolean preparedWrite, boolean responseNeeded, int offset, byte[] value) { + return false; + } + + @Override + public boolean onDescriptorReadRequest(BluetoothDevice device, int requestId, int offset, BluetoothGattDescriptor descriptor) { + return false; + } + + @Override + public boolean onDescriptorWriteRequest(BluetoothDevice device, int requestId, BluetoothGattDescriptor descriptor, boolean preparedWrite, boolean responseNeeded, int offset, byte[] value) { + return false; + } } 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 c0c61756a..2ef43fda7 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann +/* Copyright (C) 2015-2019 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 f09314a88..4e7a07dd1 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-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractTransaction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractTransaction.java new file mode 100644 index 000000000..0ab0d611c --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractTransaction.java @@ -0,0 +1,46 @@ +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Andreas Boehler + + 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.btle; + +import java.text.DateFormat; +import java.util.Date; +import java.util.Locale; + +public abstract class AbstractTransaction { + private final String mName; + private final long creationTimestamp = System.currentTimeMillis(); + + public AbstractTransaction(String taskName) { + this.mName = taskName; + } + + public String getTaskName() { + return mName; + } + + protected String getCreationTime() { + return DateFormat.getTimeInstance(DateFormat.MEDIUM).format(new Date(creationTimestamp)); + } + + public abstract int getActionCount(); + + @Override + public String toString() { + return String.format(Locale.US, "%s: Transaction task: %s with %d actions", getCreationTime(), getTaskName(), getActionCount()); + } + +} 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 55ecb9dcc..fdc77d61f 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,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Lukas Veneziano This file is part of Gadgetbridge. 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 779e9f5a4..1f6faf9af 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 7a1728e13..f8451a330 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-2018 Andreas Shimokawa, Carsten Pfeiffer, João +/* Copyright (C) 2016-2019 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 6ca33af52..3e1ea2604 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann +/* Copyright (C) 2015-2019 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 c7c991e09..e0d6941f4 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Sergey Trofimov, Uwe Hermann This file is part of Gadgetbridge. @@ -23,7 +23,10 @@ import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGattCallback; import android.bluetooth.BluetoothGattCharacteristic; import android.bluetooth.BluetoothGattDescriptor; +import android.bluetooth.BluetoothGattServer; +import android.bluetooth.BluetoothGattServerCallback; import android.bluetooth.BluetoothGattService; +import android.bluetooth.BluetoothManager; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.os.Handler; @@ -35,6 +38,7 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Set; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; @@ -56,17 +60,22 @@ public final class BtLEQueue { private final GBDevice mGbDevice; private final BluetoothAdapter mBluetoothAdapter; private BluetoothGatt mBluetoothGatt; + private BluetoothGattServer mBluetoothGattServer; + private final Set mSupportedServerServices; - private final BlockingQueue mTransactions = new LinkedBlockingQueue<>(); + private final BlockingQueue mTransactions = new LinkedBlockingQueue<>(); private volatile boolean mDisposed; private volatile boolean mCrashed; private volatile boolean mAbortTransaction; + private volatile boolean mAbortServerTransaction; private final Context mContext; private CountDownLatch mWaitForActionResultLatch; + private CountDownLatch mWaitForServerActionResultLatch; private CountDownLatch mConnectionLatch; private BluetoothGattCharacteristic mWaitCharacteristic; private final InternalGattCallback internalGattCallback; + private final InternalGattServerCallback internalGattServerCallback; private boolean mAutoReconnect; private Thread dispatchThread = new Thread("Gadgetbridge GATT Dispatcher") { @@ -77,7 +86,7 @@ public final class BtLEQueue { while (!mDisposed && !mCrashed) { try { - Transaction transaction = mTransactions.take(); + AbstractTransaction qTransaction = mTransactions.take(); if (!isConnected()) { LOG.debug("not connected, waiting for connection..."); @@ -94,37 +103,70 @@ public final class BtLEQueue { mConnectionLatch = null; } - internalGattCallback.setTransactionGattCallback(transaction.getGattCallback()); - mAbortTransaction = false; - // Run all actions of the transaction until one doesn't succeed - for (BtLEAction action : transaction.getActions()) { - if (mAbortTransaction) { // got disconnected - LOG.info("Aborting running transaction"); - break; - } - mWaitCharacteristic = action.getCharacteristic(); - mWaitForActionResultLatch = new CountDownLatch(1); - if (LOG.isDebugEnabled()) { - LOG.debug("About to run action: " + action); - } - if (action instanceof GattListenerAction) { - // this special action overwrites the transaction gatt listener (if any), it must - // always be the last action in the transaction - internalGattCallback.setTransactionGattCallback(((GattListenerAction)action).getGattCallback()); - } - if (action.run(mBluetoothGatt)) { - // check again, maybe due to some condition, action did not need to write, so we can't wait - boolean waitForResult = action.expectsResult(); - if (waitForResult) { - mWaitForActionResultLatch.await(); - mWaitForActionResultLatch = null; - if (mAbortTransaction) { - break; - } + if(qTransaction instanceof ServerTransaction) { + ServerTransaction serverTransaction = (ServerTransaction)qTransaction; + internalGattServerCallback.setTransactionGattCallback(serverTransaction.getGattCallback()); + mAbortServerTransaction = false; + + for (BtLEServerAction action : serverTransaction.getActions()) { + if (mAbortServerTransaction) { // got disconnected + LOG.info("Aborting running transaction"); + break; + } + if (LOG.isDebugEnabled()) { + LOG.debug("About to run action: " + action); + } + if (action.run(mBluetoothGattServer)) { + // check again, maybe due to some condition, action did not need to write, so we can't wait + boolean waitForResult = action.expectsResult(); + if (waitForResult) { + mWaitForServerActionResultLatch.await(); + mWaitForServerActionResultLatch = null; + if (mAbortServerTransaction) { + break; + } + } + } else { + LOG.error("Action returned false: " + action); + break; // abort the transaction + } + } + } + + if(qTransaction instanceof Transaction) { + Transaction transaction = (Transaction)qTransaction; + internalGattCallback.setTransactionGattCallback(transaction.getGattCallback()); + mAbortTransaction = false; + // Run all actions of the transaction until one doesn't succeed + for (BtLEAction action : transaction.getActions()) { + if (mAbortTransaction) { // got disconnected + LOG.info("Aborting running transaction"); + break; + } + mWaitCharacteristic = action.getCharacteristic(); + mWaitForActionResultLatch = new CountDownLatch(1); + if (LOG.isDebugEnabled()) { + LOG.debug("About to run action: " + action); + } + if (action instanceof GattListenerAction) { + // this special action overwrites the transaction gatt listener (if any), it must + // always be the last action in the transaction + internalGattCallback.setTransactionGattCallback(((GattListenerAction) action).getGattCallback()); + } + if (action.run(mBluetoothGatt)) { + // check again, maybe due to some condition, action did not need to write, so we can't wait + boolean waitForResult = action.expectsResult(); + if (waitForResult) { + mWaitForActionResultLatch.await(); + mWaitForActionResultLatch = null; + if (mAbortTransaction) { + break; + } + } + } else { + LOG.error("Action returned false: " + action); + break; // abort the transaction } - } else { - LOG.error("Action returned false: " + action); - break; // abort the transaction } } } catch (InterruptedException ignored) { @@ -143,11 +185,13 @@ public final class BtLEQueue { } }; - public BtLEQueue(BluetoothAdapter bluetoothAdapter, GBDevice gbDevice, GattCallback externalGattCallback, Context context) { + public BtLEQueue(BluetoothAdapter bluetoothAdapter, GBDevice gbDevice, GattCallback externalGattCallback, GattServerCallback externalGattServerCallback, Context context, Set supportedServerServices) { mBluetoothAdapter = bluetoothAdapter; mGbDevice = gbDevice; internalGattCallback = new InternalGattCallback(externalGattCallback); + internalGattServerCallback = new InternalGattServerCallback(externalGattServerCallback); mContext = context; + mSupportedServerServices = supportedServerServices; dispatchThread.start(); } @@ -183,6 +227,21 @@ public final class BtLEQueue { LOG.info("Attempting to connect to " + mGbDevice.getName()); mBluetoothAdapter.cancelDiscovery(); BluetoothDevice remoteDevice = mBluetoothAdapter.getRemoteDevice(mGbDevice.getAddress()); + if(!mSupportedServerServices.isEmpty()) { + BluetoothManager bluetoothManager = (BluetoothManager) mContext.getSystemService(Context.BLUETOOTH_SERVICE); + if (bluetoothManager == null) { + LOG.error("Error getting bluetoothManager"); + return false; + } + mBluetoothGattServer = bluetoothManager.openGattServer(mContext, internalGattServerCallback); + if (mBluetoothGattServer == null) { + LOG.error("Error opening Gatt Server"); + return false; + } + for(BluetoothGattService service : mSupportedServerServices) { + mBluetoothGattServer.addService(service); + } + } synchronized (mGattMonitor) { // connectGatt with true doesn't really work ;( too often connection problems if (GBApplication.isRunningMarshmallowOrLater()) { @@ -218,6 +277,12 @@ public final class BtLEQueue { gatt.close(); setDeviceConnectionState(State.NOT_CONNECTED); } + BluetoothGattServer gattServer = mBluetoothGattServer; + if (gattServer != null) { + mBluetoothGattServer = null; + gattServer.clearServices(); + gattServer.close(); + } } } @@ -226,10 +291,16 @@ public final class BtLEQueue { internalGattCallback.reset(); mTransactions.clear(); mAbortTransaction = true; + mAbortServerTransaction = true; if (mWaitForActionResultLatch != null) { mWaitForActionResultLatch.countDown(); } + if (mWaitForServerActionResultLatch != null) { + mWaitForServerActionResultLatch.countDown(); + } + boolean wasInitialized = mGbDevice.isInitialized(); + setDeviceConnectionState(State.NOT_CONNECTED); // either we've been disconnected because the device is out of range @@ -289,6 +360,18 @@ public final class BtLEQueue { } } + /** + * Adds a serverTransaction to the end of the queue + * + * @param transaction + */ + public void add(ServerTransaction transaction) { + LOG.debug("about to add: " + transaction); + if(!transaction.isEmpty()) { + mTransactions.add(transaction); + } + } + /** * Adds a transaction to the beginning of the queue. * Note that actions of the *currently executing* transaction @@ -299,8 +382,12 @@ public final class BtLEQueue { public void insert(Transaction transaction) { LOG.debug("about to insert: " + transaction); if (!transaction.isEmpty()) { - List tail = new ArrayList<>(mTransactions.size() + 2); - mTransactions.drainTo(tail); + List tail = new ArrayList<>(mTransactions.size() + 2); + //mTransactions.drainTo(tail); + for( AbstractTransaction t : mTransactions) { + tail.add(t); + } + mTransactions.clear(); mTransactions.add(transaction); mTransactions.addAll(tail); } @@ -332,6 +419,16 @@ public final class BtLEQueue { return true; } + private boolean checkCorrectBluetoothDevice(BluetoothDevice device) { + //BluetoothDevice clientDevice = mBluetoothAdapter.getRemoteDevice(mGbDevice.getAddress()); + + if(!device.getAddress().equals(mGbDevice.getAddress())) { // != clientDevice && clientDevice != null) { + LOG.info("Ignoring request from wrong Bluetooth device: " + device.getAddress()); + return false; + } + return true; + } + // Implements callback methods for GATT events that the app cares about. For example, // connection change and services discovered. private final class InternalGattCallback extends BluetoothGattCallback { @@ -549,4 +646,90 @@ public final class BtLEQueue { mTransactionGattCallback = null; } } + + // Implements callback methods for GATT server events that the app cares about. For example, + // connection change and read/write requests. + private final class InternalGattServerCallback extends BluetoothGattServerCallback { + private + @Nullable + GattServerCallback mTransactionGattCallback; + private final GattServerCallback mExternalGattServerCallback; + + public InternalGattServerCallback(GattServerCallback externalGattServerCallback) { + mExternalGattServerCallback = externalGattServerCallback; + } + + public void setTransactionGattCallback(@Nullable GattServerCallback callback) { + mTransactionGattCallback = callback; + } + + private GattServerCallback getCallbackToUse() { + if (mTransactionGattCallback != null) { + return mTransactionGattCallback; + } + return mExternalGattServerCallback; + } + + @Override + public void onConnectionStateChange(BluetoothDevice device, int status, int newState) { + LOG.debug("gatt server connection state change, newState: " + newState + getStatusString(status)); + + if(!checkCorrectBluetoothDevice(device)) { + return; + } + + if (status != BluetoothGatt.GATT_SUCCESS) { + LOG.warn("connection state event with error status " + status); + } + } + + private String getStatusString(int status) { + return status == BluetoothGatt.GATT_SUCCESS ? " (success)" : " (failed: " + status + ")"; + } + + @Override + public void onCharacteristicReadRequest(BluetoothDevice device, int requestId, int offset, BluetoothGattCharacteristic characteristic) { + if(!checkCorrectBluetoothDevice(device)) { + return; + } + LOG.debug("characterstic read request: " + device.getAddress() + " characteristic: " + characteristic.getUuid()); + if (getCallbackToUse() != null) { + getCallbackToUse().onCharacteristicReadRequest(device, requestId, offset, characteristic); + } + } + + @Override + public void onCharacteristicWriteRequest(BluetoothDevice device, int requestId, BluetoothGattCharacteristic characteristic, boolean preparedWrite, boolean responseNeeded, int offset, byte[] value) { + if(!checkCorrectBluetoothDevice(device)) { + return; + } + LOG.debug("characteristic write request: " + device.getAddress() + " characteristic: " + characteristic.getUuid()); + if (getCallbackToUse() != null) { + getCallbackToUse().onCharacteristicWriteRequest(device, requestId, characteristic, preparedWrite, responseNeeded, offset, value); + } + } + + @Override + public void onDescriptorReadRequest(BluetoothDevice device, int requestId, int offset, BluetoothGattDescriptor descriptor) { + if(!checkCorrectBluetoothDevice(device)) { + return; + } + LOG.debug("onDescriptorReadRequest: " + device.getAddress()); + if(getCallbackToUse() != null) { + getCallbackToUse().onDescriptorReadRequest(device, requestId, offset, descriptor); + } + } + + @Override + public void onDescriptorWriteRequest(BluetoothDevice device, int requestId, BluetoothGattDescriptor descriptor, boolean preparedWrite, boolean responseNeeded, int offset, byte[] value) { + if(!checkCorrectBluetoothDevice(device)) { + return; + } + LOG.debug("onDescriptorWriteRequest: " + device.getAddress()); + if(getCallbackToUse() != null) { + getCallbackToUse().onDescriptorWriteRequest(device, requestId, descriptor, preparedWrite, responseNeeded, offset, value); + } + } + } + } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEServerAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEServerAction.java new file mode 100644 index 000000000..f5aab7286 --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEServerAction.java @@ -0,0 +1,75 @@ +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann + + 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.btle; + +import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothGatt; +import android.bluetooth.BluetoothGattCharacteristic; +import android.bluetooth.BluetoothGattServer; +import android.bluetooth.BluetoothGattService; + +import java.util.Date; + +import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils; + +/** + * The Bluedroid implementation only allows performing one GATT request at a time. + * As they are asynchronous anyway, we encapsulate every GATT request (read and write) + * inside a runnable action. + *

+ * These actions are then executed one after another, ensuring that every action's result + * has been posted before invoking the next action. + */ +public abstract class BtLEServerAction { + private final BluetoothDevice device; + private final long creationTimestamp; + + public BtLEServerAction(BluetoothDevice device) { + this.device = device; + creationTimestamp = System.currentTimeMillis(); + } + + + public BluetoothDevice getDevice() { + return this.device; + } + + /** + * Returns true if this action expects an (async) result which must + * be waited for, before continuing with other actions. + *

+ * This is needed because the current Bluedroid stack can only deal + * with one single bluetooth operation at a time. + */ + public abstract boolean expectsResult(); + + /** + * Executes this action, e.g. reads or write a GATT characteristic. + * + * @return true if the action was successful, false otherwise + */ + public abstract boolean run(BluetoothGattServer server); + + + protected String getCreationTime() { + return DateTimeUtils.formatDateTime(new Date(creationTimestamp)); + } + + public String toString() { + return getCreationTime() + ":" + getClass().getSimpleName() + " on device: " + getDevice().getAddress(); + } +} 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 6e882ff77..a9669a642 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-2018 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2015-2019 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 4f17540c4..8a92860ff 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-2018 Daniele Gobbetti +/* Copyright (C) 2015-2019 Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattListenerAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattListenerAction.java index 733ca2795..d00165778 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattListenerAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattListenerAction.java @@ -1,3 +1,19 @@ +/* Copyright (C) 2018-2019 Carsten Pfeiffer + + 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.btle; public interface GattListenerAction { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattServerCallback.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattServerCallback.java new file mode 100644 index 000000000..03db77b44 --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattServerCallback.java @@ -0,0 +1,60 @@ +package nodomain.freeyourgadget.gadgetbridge.service.btle; + +import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothGattCharacteristic; +import android.bluetooth.BluetoothGattDescriptor; +import android.bluetooth.BluetoothGattServerCallback; + +public interface GattServerCallback { + + /** + * @param device + * @param status + * @param newState + * @see BluetoothGattServerCallback#onConnectionStateChange(BluetoothDevice, int, int) + */ + void onConnectionStateChange(BluetoothDevice device, int status, int newState); + + /** + * @param device + * @param requestId + * @param offset + * @param characteristic + * @see BluetoothGattServerCallback#onCharacteristicReadRequest(BluetoothDevice, int, int, BluetoothGattCharacteristic) + */ + boolean onCharacteristicReadRequest(BluetoothDevice device, int requestId, int offset, BluetoothGattCharacteristic characteristic); + + /** + * @param device + * @param requestId + * @param characteristic + * @param preparedWrite + * @param responseNeeded + * @param offset + * @param value + * @see BluetoothGattServerCallback#onCharacteristicWriteRequest(BluetoothDevice, int, BluetoothGattCharacteristic, boolean, boolean, int, byte[]) + */ + boolean onCharacteristicWriteRequest(BluetoothDevice device, int requestId, BluetoothGattCharacteristic characteristic, boolean preparedWrite, boolean responseNeeded, int offset, byte[] value); + + /** + * @param device + * @param requestId + * @param offset + * @param descriptor + * @see BluetoothGattServerCallback#onDescriptorReadRequest(BluetoothDevice, int, int, BluetoothGattDescriptor) + */ + boolean onDescriptorReadRequest(BluetoothDevice device, int requestId, int offset, BluetoothGattDescriptor descriptor); + + /** + * @param device + * @param requestId + * @param descriptor + * @param preparedWrite + * @param responseNeeded + * @param offset + * @param value + * @see BluetoothGattServerCallback#onDescriptorWriteRequest(BluetoothDevice, int, BluetoothGattDescriptor, boolean, boolean, int, byte[]) + */ + boolean onDescriptorWriteRequest(BluetoothDevice device, int requestId, BluetoothGattDescriptor descriptor, boolean preparedWrite, boolean responseNeeded, int offset, byte[] value); + +} 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 60d468e22..8ced4b8fd 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-2018 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2015-2019 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransaction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransaction.java new file mode 100644 index 000000000..bf4cad8df --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransaction.java @@ -0,0 +1,76 @@ +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer + + 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.btle; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; + +import androidx.annotation.Nullable; + +/** + * Groups a bunch of {@link BtLEServerAction actions} together, making sure + * that upon failure of one action, all subsequent actions are discarded. + * + * @author TREND + */ +public class ServerTransaction extends AbstractTransaction { + private final List mActions = new ArrayList<>(4); + private + @Nullable + GattServerCallback gattCallback; + + public ServerTransaction(String taskName) { + super(taskName); + } + + public void add(BtLEServerAction action) { + mActions.add(action); + } + + public List getActions() { + return Collections.unmodifiableList(mActions); + } + + public boolean isEmpty() { + return mActions.isEmpty(); + } + + @Override + public String toString() { + return String.format(Locale.US, "%s: Transaction task: %s with %d actions", getCreationTime(), getTaskName(), mActions.size()); + } + + public void setGattCallback(@Nullable GattServerCallback callback) { + gattCallback = callback; + } + + /** + * Returns the GattServerCallback for this transaction, or null if none. + */ + public + @Nullable + GattServerCallback getGattCallback() { + return gattCallback; + } + + @Override + public int getActionCount() { + return mActions.size(); + } +} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransactionBuilder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransactionBuilder.java new file mode 100644 index 000000000..5a8e7693d --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransactionBuilder.java @@ -0,0 +1,87 @@ +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer + + 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.btle; + +import android.bluetooth.BluetoothDevice; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import androidx.annotation.Nullable; +import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.ServerResponseAction; + +public class ServerTransactionBuilder { + private static final Logger LOG = LoggerFactory.getLogger(ServerTransactionBuilder.class); + + private final ServerTransaction mTransaction; + private boolean mQueued; + + public ServerTransactionBuilder(String taskName) { + mTransaction = new ServerTransaction(taskName); + } + + public ServerTransactionBuilder writeServerResponse(BluetoothDevice device, int requestId, int status, int offset, byte[] data) { + if(device == null) { + LOG.warn("Unable to write to device: null"); + return this; + } + ServerResponseAction action = new ServerResponseAction(device, requestId, status, offset, data); + return add(action); + } + + public ServerTransactionBuilder add(BtLEServerAction action) { + mTransaction.add(action); + return this; + } + + /** + * Sets a GattServerCallback instance that will be called when the transaction is executed, + * resulting in GattServerCallback events. + * + * @param callback the callback to set, may be null + */ + public void setGattCallback(@Nullable GattServerCallback callback) { + mTransaction.setGattCallback(callback); + } + + public + @Nullable + GattServerCallback getGattCallback() { + return mTransaction.getGattCallback(); + } + + /** + * To be used as the final step to execute the transaction by the given queue. + * + * @param queue + */ + public void queue(BtLEQueue queue) { + if (mQueued) { + throw new IllegalStateException("This builder had already been queued. You must not reuse it."); + } + mQueued = true; + queue.add(mTransaction); + } + + public ServerTransaction getTransaction() { + return mTransaction; + } + + public String getTaskName() { + return mTransaction.getTaskName(); + } +} 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 6c9141c82..eef19df95 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,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. @@ -16,12 +17,9 @@ along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.service.btle; -import java.text.DateFormat; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.List; -import java.util.Locale; import androidx.annotation.Nullable; @@ -31,20 +29,14 @@ import androidx.annotation.Nullable; * * @author TREND */ -public class Transaction { - private final String mName; +public class Transaction extends AbstractTransaction { private final List mActions = new ArrayList<>(4); - private final long creationTimestamp = System.currentTimeMillis(); private @Nullable GattCallback gattCallback; public Transaction(String taskName) { - this.mName = taskName; - } - - public String getTaskName() { - return mName; + super(taskName); } public void add(BtLEAction action) { @@ -59,15 +51,6 @@ public class Transaction { return mActions.isEmpty(); } - protected String getCreationTime() { - return DateFormat.getTimeInstance(DateFormat.MEDIUM).format(new Date(creationTimestamp)); - } - - @Override - public String toString() { - return String.format(Locale.US, "%s: Transaction task: %s with %d actions", getCreationTime(), getTaskName(), mActions.size()); - } - public void setGattCallback(@Nullable GattCallback callback) { gattCallback = callback; } @@ -80,4 +63,9 @@ public class Transaction { GattCallback getGattCallback() { return gattCallback; } + + @Override + public int getActionCount() { + return mActions.size(); + } } 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 7c5f9dbbe..5f6974a07 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,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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/AbortTransactionAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbortTransactionAction.java index f83daabaf..7d1a71d24 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbstractGattListenerWriteAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbstractGattListenerWriteAction.java index 18916f15e..47094693b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbstractGattListenerWriteAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbstractGattListenerWriteAction.java @@ -1,3 +1,19 @@ +/* Copyright (C) 2018-2019 Carsten Pfeiffer + + 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.btle.actions; import android.bluetooth.BluetoothGatt; 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 319cfb1ac..aeb5a9b09 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 71c3c3c9a..1a6f5be93 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 4ddc45468..45b86a5b4 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 ab09bf9bd..f802352a3 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 c0984d1f5..742cc695f 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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/ServerResponseAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ServerResponseAction.java new file mode 100644 index 000000000..817c25f32 --- /dev/null +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ServerResponseAction.java @@ -0,0 +1,72 @@ +/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Uwe Hermann + + 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.btle.actions; + +import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothGattCallback; +import android.bluetooth.BluetoothGattServer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import nodomain.freeyourgadget.gadgetbridge.Logging; +import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEServerAction; + +/** + * Invokes a response on a given GATT characteristic read. + * The result status will be made available asynchronously through the + * {@link BluetoothGattCallback} + */ +public class ServerResponseAction extends BtLEServerAction { + private static final Logger LOG = LoggerFactory.getLogger(ServerResponseAction.class); + + private final byte[] value; + private final int requestId; + private final int status; + private final int offset; + + public ServerResponseAction(BluetoothDevice device, int requestId, int status, int offset, byte[] data) { + super(device); + this.value = data; + this.requestId = requestId; + this.status = status; + this.offset = offset; + } + + @Override + public boolean run(BluetoothGattServer server) { + return writeValue(server, getDevice(), requestId, status, offset, value); + } + + protected boolean writeValue(BluetoothGattServer gattServer, BluetoothDevice device, int requestId, int status, int offset, byte[] value) { + if (LOG.isDebugEnabled()) { + LOG.debug("writing to server: " + device.getAddress() + ": " + Logging.formatBytes(value)); + } + + return gattServer.sendResponse(device, requestId, 0, offset, value); + } + + protected final byte[] getValue() { + return value; + } + + @Override + public boolean expectsResult() { + return false; + } +} 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 733e97009..384c7d584 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 f6d1937ed..bac898926 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 cbb476c76..ccd396df8 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 841b0ac55..e3b40bcdb 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 1d21315d8..eedb4c320 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 ac1e4e554..b057b028b 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/IntentListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/IntentListener.java index cb0df44aa..29b192e51 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/IntentListener.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/IntentListener.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Carsten Pfeiffer +/* Copyright (C) 2018-2019 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 c5bb0531d..0432d475c 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 53ac4f095..8787af3d5 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann +/* Copyright (C) 2016-2019 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 f59885afd..2d8bc99a1 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 051901717..b800e803f 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 104f18c2b..fab79f146 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 84c04efac..c377ee47b 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 1fdb01779..7f630c9fb 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-2018 Carsten Pfeiffer +/* Copyright (C) 2017-2019 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 769875b72..4b38f3546 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,5 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti 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 f15ba4cb1..d28e98136 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-2018 Carsten Pfeiffer +/* Copyright (C) 2017-2019 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 ccecc68b3..9059c935a 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-2018 Carsten Pfeiffer, Uwe Hermann +/* Copyright (C) 2016-2019 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 8f17dbc28..856d3c2f8 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 2649e2acb..062614a33 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 c3712c3f0..fac22020c 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 1ff7a4fc7..e72f21506 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 5963667f6..552be0412 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-2018 Carsten Pfeiffer, Uwe Hermann +/* Copyright (C) 2016-2019 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 660bedbfe..508636ff2 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGATTServer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGATTServer.java index 4515f2553..3820ab398 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGATTServer.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGATTServer.java @@ -1,20 +1,20 @@ -/* Copyright (C) 2018 Andreas Böhler - based on code from BlueWatcher, https://github.com/masterjc/bluewatcher +/* Copyright (C) 2018-2019 Andreas Böhler, Daniele Gobbetti + based on code from BlueWatcher, https://github.com/masterjc/bluewatcher - This file is part of Gadgetbridge. + 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 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. + 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 . */ + 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.casiogb6900; import android.bluetooth.BluetoothDevice; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGATTThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGATTThread.java index ecd668746..97f3c4401 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGATTThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGATTThread.java @@ -1,20 +1,20 @@ -/* Copyright (C) 2018 Andreas Böhler - based on code from BlueWatcher, https://github.com/masterjc/bluewatcher +/* Copyright (C) 2018-2019 Andreas Böhler + based on code from BlueWatcher, https://github.com/masterjc/bluewatcher - This file is part of Gadgetbridge. + 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 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. + 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 . */ + 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.casiogb6900; import android.content.Context; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGB6900DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGB6900DeviceSupport.java index a6650f739..bed8ad036 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGB6900DeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioGB6900DeviceSupport.java @@ -1,20 +1,20 @@ -/* Copyright (C) 2018 Andreas Böhler - based on code from BlueWatcher, https://github.com/masterjc/bluewatcher +/* Copyright (C) 2018-2019 Andreas Böhler + based on code from BlueWatcher, https://github.com/masterjc/bluewatcher - This file is part of Gadgetbridge. + 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 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. + 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 . */ + 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.casiogb6900; import android.bluetooth.BluetoothAdapter; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioHandlerThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioHandlerThread.java index 85d92482f..d049802c4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioHandlerThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casiogb6900/CasioHandlerThread.java @@ -1,20 +1,20 @@ -/* Copyright (C) 2018 Andreas Böhler - based on code from BlueWatcher, https://github.com/masterjc/bluewatcher +/* Copyright (C) 2019 Andreas Böhler, Daniele Gobbetti + based on code from BlueWatcher, https://github.com/masterjc/bluewatcher - This file is part of Gadgetbridge. + 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 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. + 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 . */ + 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.casiogb6900; import android.content.Context; 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 2ac36e5b8..82d3924e4 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 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 afa36e7a1..294501958 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-2018 João Paulo Barraca +/* Copyright (C) 2017-2019 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 d5122d1e2..ddf7ab837 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-2018 Andreas Shimokawa, João Paulo Barraca +/* Copyright (C) 2017-2019 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 d4c2ae374..fd17acb23 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-2018 João Paulo Barraca +/* Copyright (C) 2017-2019 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 65dde1262..09f9a5db9 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-2018 João Paulo Barraca +/* Copyright (C) 2017-2019 Daniele Gobbetti, 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 238e4e50a..fef27f1ae 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-2018 João Paulo Barraca +/* Copyright (C) 2017-2019 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 23603e8ce..896e06d6e 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-2018 João Paulo Barraca +/* Copyright (C) 2017-2019 Daniele Gobbetti, 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 65b666c39..c9fddce61 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-2018 Alberto, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2016-2019 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/AbstractHuamiOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiOperation.java index 6ad851019..05e070051 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiBatteryInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiBatteryInfo.java index 1b0d2083f..9bd15396d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiBatteryInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiBatteryInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer 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 a1d937a15..415d45ff9 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 6d02ac199..d0e3ec70c 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-2018 Andreas Shimokawa +/* Copyright (C) 2017-2019 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 c6253d535..36eba0bfe 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 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 9803e7791..5a572d17e 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,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Daniele Gobbetti, Lukas +/* Copyright (C) 2017-2019 Andreas Shimokawa, Daniele Gobbetti, Lukas Veneziano This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java index 3130d0df3..abe9686c7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Christian +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Christian Fischer, Daniele Gobbetti, JohnnySun, José Rebelo, Julien Pivotto, Kasha, Michal Novotny, Sergey Trofimov, Steffen Liebergeld @@ -59,6 +59,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInf import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.huami.ActivateDisplayOnLift; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.DisconnectNotificationSetting; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; @@ -1506,11 +1507,16 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport { case MiBandConst.PREF_MI2_GOAL_NOTIFICATION: setGoalNotification(builder); break; - case MiBandConst.PREF_ACTIVATE_DISPLAY_ON_LIFT: - case MiBandConst.PREF_DISPLAY_ON_LIFT_START: - case MiBandConst.PREF_DISPLAY_ON_LIFT_END: + case HuamiConst.PREF_ACTIVATE_DISPLAY_ON_LIFT: + case HuamiConst.PREF_DISPLAY_ON_LIFT_START: + case HuamiConst.PREF_DISPLAY_ON_LIFT_END: setActivateDisplayOnLiftWrist(builder); break; + case HuamiConst.PREF_DISCONNECT_NOTIFICATION: + case HuamiConst.PREF_DISCONNECT_NOTIFICATION_START: + case HuamiConst.PREF_DISCONNECT_NOTIFICATION_END: + setDisconnectNotification(builder); + break; case MiBandConst.PREF_MI2_DISPLAY_ITEMS: setDisplayItems(builder); break; @@ -1756,6 +1762,37 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport { return this; } + private HuamiSupport setDisconnectNotification(TransactionBuilder builder) { + DisconnectNotificationSetting disconnectNotificationSetting = HuamiCoordinator.getDisconnectNotificationSetting(getContext()); + LOG.info("Setting disconnect notification to " + disconnectNotificationSetting); + + switch (disconnectNotificationSetting) { + case ON: + builder.write(getCharacteristic(HuamiService.UUID_CHARACTERISTIC_3_CONFIGURATION), HuamiService.COMMAND_ENABLE_DISCONNECT_NOTIFCATION); + break; + case OFF: + builder.write(getCharacteristic(HuamiService.UUID_CHARACTERISTIC_3_CONFIGURATION), HuamiService.COMMAND_DISABLE_DISCONNECT_NOTIFCATION); + break; + case SCHEDULED: + byte[] cmd = HuamiService.COMMAND_ENABLE_DISCONNECT_NOTIFCATION.clone(); + + Calendar calendar = GregorianCalendar.getInstance(); + + Date start = HuamiCoordinator.getDisconnectNotificationStart(); + calendar.setTime(start); + cmd[4] = (byte) calendar.get(Calendar.HOUR_OF_DAY); + cmd[5] = (byte) calendar.get(Calendar.MINUTE); + + Date end = HuamiCoordinator.getDisconnectNotificationEnd(); + calendar.setTime(end); + cmd[6] = (byte) calendar.get(Calendar.HOUR_OF_DAY); + cmd[7] = (byte) calendar.get(Calendar.MINUTE); + + builder.write(getCharacteristic(HuamiService.UUID_CHARACTERISTIC_3_CONFIGURATION), cmd); + } + return this; + } + private HuamiSupport setDistanceUnit(TransactionBuilder builder) { MiBandConst.DistanceUnit unit = HuamiCoordinator.getDistanceUnit(); LOG.info("Setting distance unit to " + unit); @@ -1816,6 +1853,7 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport { setGoalNotification(builder); setInactivityWarnings(builder); setHeartrateSleepSupport(builder); + setDisconnectNotification(builder); setHeartrateMeasurementInterval(builder, getHeartRateMeasurementInterval()); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/actions/StopNotificationAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/actions/StopNotificationAction.java index 7bcb4c38d..1077aeedf 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/actions/StopNotificationAction.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/actions/StopNotificationAction.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/ActivityDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/ActivityDetailsParser.java index 41780a0f0..65b27d2aa 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/ActivityDetailsParser.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/ActivityDetailsParser.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, AndrewH, Carsten Pfeiffer, +/* Copyright (C) 2017-2019 Andreas Shimokawa, AndrewH, Carsten Pfeiffer, szilardx This file is part of Gadgetbridge. @@ -91,8 +91,8 @@ public class ActivityDetailsParser { i++; } - byte type = bytes[i++]; - int timeOffset = BLETypeConversions.toUnsigned(bytes[i++]); + byte type = bytes[i++]; // lgtm [java/index-out-of-bounds]] + int timeOffset = BLETypeConversions.toUnsigned(bytes[i++]); // lgtm [java/index-out-of-bounds] // handle timeOffset overflows (1 byte, always increasing, relative to base) if (lastTimeOffset <= timeOffset) { timeOffset = timeOffset - lastTimeOffset; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipFirmwareInfo.java index d4892a3bb..fe753e7c4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipFirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. @@ -105,6 +105,7 @@ public class AmazfitBipFirmwareInfo extends HuamiFirmwareInfo { crcToVersion.put(36157, "1.1.2.05"); crcToVersion.put(26444, "1.1.5.02"); crcToVersion.put(60002, "1.1.5.04"); + crcToVersion.put(5229, "1.1.5.12"); // resources crcToVersion.put(12586, "0.0.8.74"); @@ -128,7 +129,7 @@ public class AmazfitBipFirmwareInfo extends HuamiFirmwareInfo { crcToVersion.put(23073, "0.1.1.45"); crcToVersion.put(59245, "1.0.2.00"); crcToVersion.put(20591, "1.1.2.05"); - crcToVersion.put(5341, "1.1.5.02-04"); + crcToVersion.put(5341, "1.1.5.02-12"); // gps crcToVersion.put(61520, "9367,8f79a91,0,0,"); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipSupport.java index 7433d3b44..a11941d77 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipSupport.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Matthieu + Baerts, Roi Greenberg This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipTextNotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipTextNotificationStrategy.java index 4e893983e..e420be9b6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipTextNotificationStrategy.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipTextNotificationStrategy.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa +/* Copyright (C) 2017-2019 Andreas Shimokawa, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/BipActivityType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/BipActivityType.java index 527469b02..f3ade44bb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/BipActivityType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/BipActivityType.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/operations/AmazfitBipFetchLogsOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/operations/AmazfitBipFetchLogsOperation.java index 1ae211881..eb4a7c8b8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/operations/AmazfitBipFetchLogsOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/operations/AmazfitBipFetchLogsOperation.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. 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 7c77c0f6c..e25f6c5e4 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-2018 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2017-2019 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 a3d614624..748bf725c 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2FirmwareInfo.java index b9e842a03..baa3b924d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2FirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Davis +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Davis Mosenkovs This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2NotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2NotificationStrategy.java index 69b6a4c1a..76e1dc365 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2NotificationStrategy.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2NotificationStrategy.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Martin Piatka +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Martin Piatka This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2TextNotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2TextNotificationStrategy.java index 23ba96800..3abdad9e7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2TextNotificationStrategy.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2TextNotificationStrategy.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3FirmwareInfo.java index 4cfaeee09..26c507465 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3FirmwareInfo.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Davis +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Davis Mosenkovs This file is part of Gadgetbridge. @@ -55,7 +55,8 @@ public class MiBand3FirmwareInfo extends HuamiFirmwareInfo { crcToVersion.put(59800, "2.0.0.4"); crcToVersion.put(10023, "2.2.0.12"); crcToVersion.put(40344, "2.2.0.14"); - crcToVersion.put(4467, "2.2.0.42"); + crcToVersion.put(4467, "2.2.0.42"); + crcToVersion.put(61657, "2.3.0.2"); // resources crcToVersion.put(54724, "1.2.0.8"); @@ -63,8 +64,8 @@ public class MiBand3FirmwareInfo extends HuamiFirmwareInfo { crcToVersion.put(34642, "1.3.0.8"); crcToVersion.put(25278, "1.4.0.12-1.6.0.16"); crcToVersion.put(23249, "1.8.0.0"); - crcToVersion.put(1815, "2.0.0.4"); - crcToVersion.put(7225, "2.2.0.12-2.2.0.42"); + crcToVersion.put(1815, "2.0.0.4"); + crcToVersion.put(7225, "2.2.0.12-2.3.0.2"); // font crcToVersion.put(19775, "1"); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3Support.java index 942fadef8..abec5be78 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3Support.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractFetchOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractFetchOperation.java index 1a932a7c6..8fa50d654 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractFetchOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractFetchOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchActivityOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchActivityOperation.java index 075353b71..f5c959565 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchActivityOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchActivityOperation.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsDetailsOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsDetailsOperation.java index 2a9df39d1..67aaab3b4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsDetailsOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsDetailsOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsSummaryOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsSummaryOperation.java index f8d79e3b3..e8eb4cc2d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsSummaryOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsSummaryOperation.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation.java index 06917ddb8..35f973cbd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation.java index 6092edda8..de1178000 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/AbstractID115Operation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/AbstractID115Operation.java index 7a564e847..369234084 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/AbstractID115Operation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/AbstractID115Operation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Vadim Kaushan +/* Copyright (C) 2018-2019 Vadim Kaushan This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/FetchActivityOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/FetchActivityOperation.java index 9b4c97818..7f5aa8b50 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/FetchActivityOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/FetchActivityOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Vadim Kaushan +/* Copyright (C) 2018-2019 Vadim Kaushan This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/ID115Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/ID115Support.java index 600816633..a95021116 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/ID115Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/ID115Support.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Vadim Kaushan +/* Copyright (C) 2018-2019 Andreas Shimokawa, Carsten Pfeiffer, Vadim Kaushan This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/SendNotificationOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/SendNotificationOperation.java index bd9740f95..bbe01da99 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/SendNotificationOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/SendNotificationOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Vadim Kaushan +/* Copyright (C) 2018-2019 Vadim Kaushan 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 2dff60273..a55d4cde1 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-2018 Andreas Shimokawa, Sami Alaoui +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, 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 fc86275c7..d35619400 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-2018 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2016-2019 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 8c29a7917..c9f8a4175 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-2018 Daniele Gobbetti +/* Copyright (C) 2016-2019 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 b63cdd629..059780dcc 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-2018 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2016-2019 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 0c53d3b4a..0703ff15f 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-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 9f36d4a3b..334dec391 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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/AbstractMi1SFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1SFirmwareInfo.java index eab128f2e..7bf1c02ba 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 Carsten Pfeiffer, Daniele Gobbetti 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 67b71ea32..deaaed0d4 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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/BatteryInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java index bd9e83062..20ed2ed9a 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 76afe6a67..bcec4f661 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 e57f678af..0080ec819 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 27dfed54f..1fabf841e 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 b87fca9ac..d9f3539b4 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 Carsten Pfeiffer, Daniele Gobbetti 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 bcc1099a9..0a0a91928 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 Carsten Pfeiffer, Daniele Gobbetti 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 d4090c897..e0fb2b498 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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/Mi1SFirmwareInfoFW1.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW1.java index 9c39dbef4..c623caf88 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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/Mi1SFirmwareInfoFW2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW2.java index 2017d3ed6..3a6fd067a 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java index c8aa67913..3e8748eeb 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-2018 Andreas Shimokawa, atkyritsis, Carsten Pfeiffer, +/* Copyright (C) 2015-2019 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 1e4e0cd04..0fbe52ee3 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-2018 Carsten Pfeiffer, Daniele Gobbetti +/* Copyright (C) 2015-2019 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 1582c866f..e5a58483b 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-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 Carsten Pfeiffer, Daniele Gobbetti 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 09a1257e5..19763ebbf 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 611592ad4..d95110e72 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,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 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/V1NotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V1NotificationStrategy.java index de27197d6..407338138 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-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 0f7bf8f9d..39923a9de 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-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 Carsten Pfeiffer, Daniele Gobbetti 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 1ad53e1ff..951947c9f 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 72ec8e8a2..b38f0b340 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 52117d8d7..391d129a3 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 4681d31bd..df634cfae 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 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 f1d635b04..035ef65a3 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti 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 a15de8853..a748f74f0 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,5 +1,5 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Daniele Gobbetti, Pavel - Elagin, protomors +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Pavel Elagin, 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 f385908aa..5e0978686 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 033205900..9022af4e9 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 14c3e8cf4..42c29a6da 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerM7S.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerM7S.java index b66d388b2..84a0ecad0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerM7S.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerM7S.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Johann C. Rode, Sergio Lopez +/* Copyright (C) 2018-2019 jcrode, Johann C. Rode, Sergio Lopez 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 4bf12143e..fe9c1b678 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 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 8cb570b40..4c7e15836 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 3934558c6..7dfa84a47 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 96b44a9e1..2cfc6178d 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-2018 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2015-2019 Andreas Shimokawa, Daniele Gobbetti, Johann C. Rode 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 799312144..853ed062e 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-2018 Andreas Shimokawa, Daniele Gobbetti, Uwe Hermann +/* Copyright (C) 2015-2019 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/AppMessageHandlerRealWeather.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerRealWeather.java index 6ab93359d..c9f0d93f1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerRealWeather.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerRealWeather.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Johann C. Rode, Sergio Lopez +/* Copyright (C) 2018-2019 Johann C. Rode, Sergio Lopez 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 index f6c31da15..f4ff39ca4 100644 --- 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 @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Sergio Lopez +/* Copyright (C) 2018-2019 Sergio Lopez This file is part of Gadgetbridge. 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 fb203c76b..fd9b2b8e3 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-2018 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2016-2019 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 6a8106baf..898b77f01 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-2018 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2015-2019 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 873585b0d..652724013 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-2018 Andreas Shimokawa +/* Copyright (C) 2017-2019 Andreas Shimokawa This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerYWeather.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerYWeather.java index aa7e1aeb8..ada75871e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerYWeather.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerYWeather.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Johann C. Rode, Sergio Lopez +/* Copyright (C) 2018-2019 Johann C. Rode 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 67fd562bd..9d046be7b 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 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 d1a616ac2..2adb41f2a 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 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 b9c483f50..59b2c8689 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,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2017-2019 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 2ff8e58c5..d03d15f22 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 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 60dcde346..f6c98a42f 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 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 2c575b9b0..1c61b70b9 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-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2016-2019 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 f194201a4..ee0843a92 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-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2016-2019 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 34e0ec902..40126af2e 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 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 97747335e..0ca80d6a3 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Julien Pivotto, Uwe Hermann This file is part of Gadgetbridge. 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 8b0d85fc1..647a1a2b2 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-2018 Andreas Shimokawa +/* Copyright (C) 2017-2019 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 9314c17f3..5d43878f4 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,6 +1,6 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele - Gobbetti, Frank Slezak, Julien Pivotto, Kevin Richter, Sergio Lopez, Steffen - Liebergeld, Uwe Hermann +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Frank Slezak, jcrode, Johann C. Rode, Julien Pivotto, Kevin Richter, + Sergio Lopez, Steffen Liebergeld, Uwe Hermann This file is part of Gadgetbridge. 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 c3d4f30cc..f048cd5fc 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 e8df7511f..c8b5eeaf1 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-2018 Andreas Shimokawa +/* Copyright (C) 2016-2019 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 6e3299d17..da7696162 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-2018 Andreas Shimokawa, Daniele Gobbetti, Uwe Hermann +/* Copyright (C) 2016-2019 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 e4804e63d..e81550639 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-2018 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2016-2019 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 2f8fde4fc..654021da3 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-2018 Andreas Shimokawa, Daniele Gobbetti +/* Copyright (C) 2017-2019 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 55294501b..f7b8bd158 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-2018 Daniele Gobbetti +/* Copyright (C) 2017-2019 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 3df79c9b6..bda815a2f 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Pavel Elagin This file is part of Gadgetbridge. 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 50361f0af..23ba998a9 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,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi1Protocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi1Protocol.java index 196559e35..43fb57044 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi1Protocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi1Protocol.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 José Rebelo +/* Copyright (C) 2018-2019 José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi3Protocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi3Protocol.java index 38d192837..ea047abbf 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi3Protocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi3Protocol.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 José Rebelo +/* Copyright (C) 2018-2019 José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiIoThread.java index 012f0c28d..ba11899b7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiIoThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiIoThread.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 José Rebelo +/* Copyright (C) 2018-2019 José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiProtocol.java index 07f809905..340f9e6fb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiProtocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiProtocol.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 José Rebelo +/* Copyright (C) 2018-2019 José Rebelo This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiSupport.java index 7736387a0..a5c80a22d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 José Rebelo +/* Copyright (C) 2018-2019 José Rebelo 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 a41844e84..b90c14cc8 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/Watch9DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/Watch9DeviceSupport.java index 2d6e21de8..0d4cc82fd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/Watch9DeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/Watch9DeviceSupport.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2018 maxirnilian +/* Copyright (C) 2018-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, maxirnilian This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/operations/InitOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/operations/InitOperation.java index f26ac5553..fa714ec43 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/operations/InitOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/operations/InitOperation.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 maxirnilian +/* Copyright (C) 2018-2019 maxirnilian 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 index 5cac3ed15..eadde19dd 100644 --- 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 @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Andreas Shimokawa, ladbsoft +/* Copyright (C) 2018-2019 Andreas Shimokawa, Carsten Pfeiffer, ladbsoft This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java index 65fa1674f..7b2d99cac 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, +/* Copyright (C) 2015-2019 0nse, Andreas Shimokawa, Carsten Pfeiffer, Julien Pivotto, Kranz, Sebastian Kranz, Steffen Liebergeld This file is part of Gadgetbridge. @@ -1044,12 +1044,12 @@ public class ZeTimeDeviceSupport extends AbstractBTLEDeviceSupport { if (musicControlMsg[6] > volume) { musicCmd.event = GBDeviceEventMusicControl.Event.VOLUMEUP; if(volume < 90) { - volume += 10; + volume += (byte) 10; } } else { musicCmd.event = GBDeviceEventMusicControl.Event.VOLUMEDOWN; if(volume > 10) { - volume -= 10; + volume -= (byte) 10; } } try { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBAutoFetchReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBAutoFetchReceiver.java index 165b13656..af5da58ce 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBAutoFetchReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBAutoFetchReceiver.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Daniele Gobbetti, Martin +/* Copyright (C) 2018-2019 Daniele Gobbetti, Martin This file is part of Gadgetbridge. 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 bbee17b84..b8e1daf70 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 dbeecd0e7..54120ddf6 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 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 94d7ffa11..53eff14ac 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,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Julien - Pivotto, Steffen Liebergeld +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo, + 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 376509a83..b5a2ea28f 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 7a2a48738..69a33d7cb 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,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Julien - Pivotto, Steffen Liebergeld +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo, + Julien Pivotto, Steffen Liebergeld This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java index dcc122168..22b9e9e8c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java @@ -1,3 +1,19 @@ +/* Copyright (C) 2019 Carsten Pfeiffer, 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.util; import java.util.ArrayList; 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 de111b41f..b5cbf9665 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Felix - Konstantin Maurer, Taavi Eomäe +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Felix Konstantin Maurer, Taavi Eomäe 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 0bfbca0e5..b6cfa8101 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-2018 Andreas Shimokawa, Carsten Pfeiffer +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BengaliLanguageUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BengaliLanguageUtils.java index 13e76735e..4007d8d52 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BengaliLanguageUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BengaliLanguageUtils.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2017-2018 Aniruddha Adhikary +/* Copyright (C) 2017-2019 Aniruddha Adhikary, Carsten Pfeiffer, Daniele + Gobbetti, Utsob Roy 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 e83beaf10..7f532291a 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-2018 Frank Slezak +/* Copyright (C) 2017-2019 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 ba6a01b7f..671d79af0 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-2018 Carsten Pfeiffer +/* Copyright (C) 2015-2019 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 67d24ccf7..c234a4a39 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-2018 Andreas Shimokawa, AndrewH, Carsten Pfeiffer, +/* Copyright (C) 2015-2019 Andreas Shimokawa, AndrewH, Carsten Pfeiffer, Daniele Gobbetti, Pavel Elagin 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 fafce9b4a..02121a3f4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java @@ -1,6 +1,7 @@ -/* Copyright (C) 2015-2018 0nse, Andreas Shimokawa, Carsten Pfeiffer, - Daniele Gobbetti, João Paulo Barraca, Kranz, ladbsoft, maxirnilian, - protomors, Quallenauge, Sami Alaoui, tiparega, Vadim Kaushan +/* Copyright (C) 2015-2019 0nse, Andreas Böhler, Andreas Shimokawa, + Carsten Pfeiffer, Daniele Gobbetti, João Paulo Barraca, José Rebelo, + Kranz, ladbsoft, maxirnilian, protomors, Quallenauge, Sami Alaoui, tiparega, + Vadim Kaushan This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/EmojiConverter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/EmojiConverter.java index 79dce69dd..2968c71c3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/EmojiConverter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/EmojiConverter.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2018 Andreas Shimokawa, Matthieu Baerts +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Matthieu Baerts, Taavi Eomäe This file is part of Gadgetbridge. @@ -19,10 +20,14 @@ package nodomain.freeyourgadget.gadgetbridge.util; import android.content.Context; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import io.wax911.emojify.EmojiManager; import io.wax911.emojify.EmojiUtils; public class EmojiConverter { + private static final Logger LOG = LoggerFactory.getLogger(EmojiConverter.class); private static final String[][] simpleEmojiMapping = { {"\uD83D\uDE00", ":-D"}, // grinning @@ -80,8 +85,12 @@ public class EmojiConverter { private static String convertAdvancedEmojiToAscii(String text, Context context) { initEmojiData(context); - - return EmojiUtils.shortCodify(text); + try { + return EmojiUtils.shortCodify(text); + } catch (Exception e){ + LOG.warn("An exception occured when converting advanced emoji to ASCII: " + text); + return text; + } } public static String convertUnicodeEmojiToAscii(String text, Context context) { 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 c842e208f..035f7a9a8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Felix - Konstantin Maurer, JohnnySun, Taavi Eomäe +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Felix Konstantin Maurer, JohnnySun, Taavi Eomäe 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 08d8f8e09..aace268af 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Felix Konstantin Maurer, Taavi Eomäe, 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 1089280de..13b8867c5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java @@ -1,5 +1,5 @@ -/* Copyright (C) 2016-2018 Carsten Pfeiffer, Daniele Gobbetti, Felix - Konstantin Maurer +/* Copyright (C) 2016-2019 Carsten Pfeiffer, Daniele Gobbetti, Dikay900, + 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 fbef26e6e..748131542 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-2018 Alberto, Carsten Pfeiffer, Daniele Gobbetti, +/* Copyright (C) 2017-2019 Alberto, Carsten Pfeiffer, Daniele Gobbetti, Taavi Eomäe 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 9e192dcc3..9411c1016 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-2018 ivanovlev +/* Copyright (C) 2017-2019 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 431e34085..ef36d98b2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LanguageUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LanguageUtils.java @@ -1,6 +1,6 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Aniruddha Adhikary, Daniele - Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, Ted Stein, Thomas, Yaron - Shahrabani +/* Copyright (C) 2017-2019 Andreas Shimokawa, Aniruddha Adhikary, Daniele + Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg, + Ted Stein, Thomas, Yaron Shahrabani This file is part of Gadgetbridge. 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 5b22182c2..1052532b1 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-2018 Andreas Shimokawa, Daniele Gobbetti, Julien Pivotto +/* Copyright (C) 2015-2019 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 b95cb8df9..4e26fed0d 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,4 @@ -/* Copyright (C) 2017-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2017-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Lukas Veneziano This file is part of Gadgetbridge. 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 c0bbceee8..3d9007c5c 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,4 @@ -/* Copyright (C) 2016-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Frank Slezak This file is part of Gadgetbridge. 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 a07e464b3..3dfd928bc 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-2018 Carsten Pfeiffer, JohnnySun +/* Copyright (C) 2016-2019 Carsten Pfeiffer, JohnnySun This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RtlUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RtlUtils.java index d01df1587..e68cebc2c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RtlUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RtlUtils.java @@ -1,3 +1,19 @@ +/* Copyright (C) 2018-2019 Andreas Shimokawa, Carsten Pfeiffer, Roi Greenberg + + 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.util; import android.text.TextUtils; 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 d5a4ef324..007853deb 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,5 @@ -/* Copyright (C) 2017-2018 Carsten Pfeiffer, João Paulo Barraca +/* Copyright (C) 2017-2019 Carsten Pfeiffer, Daniele Gobbetti, João Paulo + Barraca, Roi Greenberg 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 f549963f3..77c799bcb 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-2018 José Rebelo +/* Copyright (C) 2017-2019 Carsten Pfeiffer, 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 f112935a1..9dafe1163 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-2018 Carsten Pfeiffer +/* Copyright (C) 2016-2019 Carsten Pfeiffer, Daniele Gobbetti 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 5cbfd9ed0..d3ce720c9 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Michal Novotny +/* Copyright (C) 2017-2019 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 69bc71ce0..64a1e8488 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2016-2019 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 89dda36a7..4c6f5f24c 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-2018 Andreas Shimokawa, Carsten Pfeiffer, Daniele +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele Gobbetti, Taavi Eomäe This file is part of Gadgetbridge. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 14ca7300c..e2e04d236 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -236,7 +236,7 @@ Pá So Chytré buzení - Nepodařilo se nastavit budík, zkuste to znovu! + Došlo k chybě při nastavování budíku, zkuste to znovu. Čas buzení odeslán do zařízení. Chybí data, provést stažení? Stahnout %1$s dat z %2$s @@ -323,7 +323,7 @@ Srdeční tep Srdeční tep Uložit hrubý záznam do databáze - Pokud je zatrženo, tak jsou data uložena v původní podobě pro pozdější vyhodnocení. Databáze bude v tom případě větší! + Ukládá data v původní podobě, takže je databáze větší, ale umožňuje to pozdější vyhodnocení. Správa databáze Správa databáze Operace s databází použijí následující cestu v zařízení. @@ -649,4 +649,19 @@ Opravdu uvést do továrního nastavení\? Uvedení do továrního nastavení smaže z připojeného zařízení všechna data (je-li toto podporováno). Xiaomi/Huami také provedou změnu Bluetooth MAC adresy a budou se pro Gadgetbridge tvářit jako nová zařízení. Casio GB-6900 + Cvičení + Filtr notifikací + Pro konfiguraci nesmí být aplikace zakázána + Vložte požadovaná slova, jedno na řádek + Filtr notifikací uložen + Nefiltrovat + Zobrazit při výskytu slov + Nezobrazit při výskytu slov + Alespoň jedno ze slov + Všechna slova + Prosím vložte alespoň jedno slovo + Filtrovací režim + Konfigurace režimu + Uložit konfiguraci + Nepřipojeno, budíky neodeslány. \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 879c80e72..414ce5020 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,464 +1,477 @@ - + - Gadgetbridge - Gadgetbridge - Einstellungen - Debug - Beenden - Spenden - Synchronisieren - Schlafaufzeichnung (ALPHA) - Verlorenes Gerät finden - Bildschirmfoto machen - Trennen - Gerät löschen - %1$s löschen - Dies wird das Gerät und alle zugehörigen Daten löschen! - Navigationsmenü öffnen - Navigationsmenü schließen - Halte die Karte lange gedrückt, um die Verbindung zu trennen - Trenne - Verbinde - Erstelle Screenshot des Gerätes - Debug - - App-Manager - Apps im Zwischenspeicher - Installierte Apps - Installierte Zifferblätter - Löschen - Löschen und aus dem Zwischenspeicher entfernen - Erneut installieren - Im Pebble Appstore suchen - Aktivieren - Deaktivieren - HRM aktivieren - HRM deaktivieren - System Wetter-App aktivieren - System Wetter-App deaktivieren - Installiere die Wetter-Benachrichtigungs-App - Konfigurieren - Nach oben - - Sperre für Benachrichtigungen - - Blockierte Kalenderbenachrichtigungen - - FW/App Installer - Es soll die Firmware %s anstelle der aktuell installierten Version auf das Mi Band installiert werden. - Es sollen die Firmwares %1$s und %2$s anstelle der aktuell installierten Versionen auf das Mi Band gespielt werden. - Diese Firmware ist getestet worden und ist mit Gadgetbridge kompatibel. - Diese Firmware ist nicht getestet und könnte inkompatibel mit Gadgetbridge sein.\n\nEs wird nicht empfohlen, sie auf dem Mi Band zu installieren! - Wenn du dennoch fortfahren möchtest und das Gerät anschliessend korrekt funktioniert, melde bitte den Gadgetbridge-Entwicklern, dass diese Firmwareversion %s funktioniert - - Einstellungen - Allgemeine Einstellungen - Verbinde mit Gadgetbridge, wenn Bluetooth eingeschaltet wird - Automatisch starten - Verbindung automatisch wiederherstellen - Bevorzugter Audioplayer - Standard - Datum und Uhrzeit - Uhrzeit synchronisieren - Synchronisiere die Uhrzeit mit dem Gerät nach dem Verbindungsaufbau und wenn die Zeit oder Zeitzone auf dem Android Gerät geändert wird - Farbschema - Hell - Dunkel - Sprache - Gadgetbridge-Benachrichtigung ausblenden - Das Symbol in der Statusleiste und die Benachrichtigung auf dem Sperrbildschirm werden angezeigt - Das Symbol in der Statusleiste und die Benachrichtigung auf dem Sperrbildschirm werden nicht angezeigt - Benachrichtigungen - Wiederholungen - Anrufe - SMS - Pebble Nachrichten - Unterstützung für Anwendungen, die Benachrichtigungen an die Pebble mit dem PebbleKit senden. - Andere Benachrichtigungen - …auch wenn der Bildschirm an ist - Bitte nicht stören - Benachrichtigungen nicht senden, wenn im \"Nicht Stören\"-Modus - Transliteration - Aktiviere dies, falls dein Gerät keine Unterstützung für den Zeichensatz deiner Sprache hat - Immer - Wenn der Bildschirm aus ist - Niemals - Privatsphäre - Privatsphäre-Modus für Anrufe - Name und Telefonnummer anzeigen - Verstecke den Namen, aber zeige die Telefonnummer an - Zeige den Namen an, aber verstecke die Telefonnummer - Verstecke Name und Telefonnummer - App-Benachrichtigungen blockieren - Kalender blockieren - Vorgefertigte Nachrichten - Antworten - Gemeinsame Endung - Ablehnen von Anrufen - Auf der Pebble aktualisieren - Entwickleroptionen - Mi Band MAC Adresse - Pebble-Einstellungen - Aktivitätstracker - Bevorzugter Aktivitätstracker - Pebble Health synchronisieren - Misfit synchronisieren - Morpheuz synchronisieren - Unterstützung für ausgehende Anrufe - Falls dies deaktiviert wird, vibriert die Pebble 2/LE nicht bei ausgehenden Anrufen - Erlaube Zugriff von anderen Android-Apps - Experimentelle Unterstützung für Android Apps, die PebbleKit benutzen - Pebble Timeline - Sonnenauf- und -untergang - Sende Sonnenauf- und -untergangszeiten abhänging vom Standort auf die Pebble Timeline - Synchronisiere Kalender - Sende Termine an die Timeline - Verworfene Benachrichtigungen automatisch entfernen - Benachrichtigungen werden automatisch von der Pebble entfernt, wenn sie auf dem Android-Gerät verworfen werden - Privatsphäre-Modus - Normale Benachrichtigungen - Verschiebe den Benachrichtigungstext außerhalb des Bildschirms - Zeige nur das Benachrichtigungs-Symbol - Standort - Standort bestimmen - Breitengrad - Längengrad - Automatisch Standort aktualisieren - Versuche, den aktuellen Standort abzufragen und nutze den gespeicherten Standort, falls das fehlschlägt - Bitte netzwerkbasierte Standortbestimmung einschalten - Standort wurde bestimmt - Benachrichtigungsprotokoll erzwingen - Diese Option erzwingt das neuste Benachrichtigungsprotokoll abhängig von der Firmwareversion. NUR EINSCHALTEN, WENN DU WEISST, WAS DU TUST! - Ungetestete Features freischalten - Schaltet ungetestete Features frei. NUR EINSCHALTEN, WENN DU WEISST WAS DU TUST! - BLE immer bevorzugen - Nutze den experimentellen LE support für alle Pebbles anstelle von klassischem BT. Setzt voraus, dass die \"Pebble LE\" gekoppelt wird, nachdem die nicht-LE Pebble einmal verbunden war. - Pebble 2/LE GATT MTU Limit - Wenn deine Pebble 2/Pebble LE nicht so wie erwartet funktioniert, versuche die MTU zu begrenzen (erlaubte Werte 20 bis 512) - Watch App Logging einschalten - Schreibt Logs von Watch Apps in Gadgetbridge-Logs (Pebble muss nach Ändern der Option erneut verbunden werden) - nicht ausgereiftes PebbleKit ACKen - Nachrichten, die an externe Drittanbieter-Apps geschickt werden, werden immer und sofort bestätigt - Wiederverbindungsversuche - Einheiten - Zeitformat - Bildschirm-An-Dauer - Den ganzen Tag Herzfrequenz messen - HPlus/Makibes Einstellungen - Nicht verbunden - Verbinde - Verbunden - Unbekannter Zustand - HW: %1$s FW: %2$s - Firmware-Version %1$s - (unbekannt) - Test - Test Benachrichtigung - Dies ist eine Testbenachrichtigung von Gadgetbridge - Bluetooth wird nicht unterstützt. - Bluetooth ist deaktiviert. - Tippe auf das verbundene Gerät, um den App-Manager zu starten - Tippe auf das verbundene Gerät, um die Aktivitätsdaten anzuzeigen - Tippe auf das verbundene Gerät, um es vibrieren zu lassen - Tippe zum Verbinden auf das gewünschte Gerät - Verbindung kann nicht aufgebaut werden. Bluetooth-Adresse ungültig? - Gadgetbridge läuft - Installiere Datei %1$d/%2$d - Installation fehlgeschlagen - Installation erfolgreich - DU VERSUCHST EINE FIRMWARE ZU INSTALLIEREN; FAHRE AUF EIGENES RISIKO FORT.\n\n\nDiese Firmware ist für HW Revision: %s - Du bist dabei die folgende app zu installieren:\n\n\n%1$s Version %2$s von %3$s\n - N/A - initialisiert - %1$s von %2$s - Gerätesuche - Suche beenden - Suche starten - Neues Gerät verbinden - %1$s (%2$s) - Gerät koppeln - Verwende den Bluetooth-Kopplungsdialog in Android, um dein Gerät zu koppeln. - Kopple dein Mi Band - Koppeln mit %s… - Verbindung mit %1$s (%2$s) herstellen - Kann mit %1$s (%2$s) nicht koppeln - Verbindung wird hergestellt: %1$s (%2$s) - Bereits mit %1$s (%2$s) verbunden, stelle Verbindung her… - Keine MAC-Adresse erhalten, koppeln nicht möglich. - Gerätespezifische Einstellungen - Mi Band / Amazfit Einstellungen - Männlich - Weiblich - Anderes - Links - Rechts - Keine gültigen Benutzerinformationen angegeben, verwende Dummy-Daten für\'s Erste. - Wenn Dein Mi Band vibriert und blinkt, tippe ein paar Mal schnell hintereinander darauf. - Installieren - Mache dein Gerät auffindbar. Derzeit verbundene Geräte werden wahrscheinlich nicht erkannt. Aktiviere die Standortbestimmung (zum Beispiel GPS) in Android 6+. Deaktiviere den Privatsphäreschutz für Gadgetbridge, da er zu Abstürzen und Neustarts deines Telefons führen kann. Wenn nach einigen Minuten kein Gerät erkannt wird, versuche es nach einem Neustart deines Telefons erneut. - Tipp: - Gerätebild - Name/Alias - Anzahl der Vibrationen - Schlafaufzeichnung - Logdateien schreiben - Initialisiere - Rufe Aktivitätsdaten ab - Von %1$s bis %2$s - Am linken oder rechten Arm getragen? - Vibrationsprofile - Stakkato - Kurz - Mittel - Lang - Wassertropfen - Klingel - Wecker - Vibration - Versuch - SMS-Benachrichtigung - Vibrationseinstellungen - Sonstige Benachrichtigung - E-Mail-Benachrichtigung - Eingehende Anrufe - Chat - Navigation - Soziale Netzwerke - Minuten insgesamt - Schritte pro Minute - Verlegtes Gerät suchen - Abbrechen, um die Vibration zu stoppen. - Deine Aktivität - Wecker stellen - Wecker stellen - Wecker stellen - So - Mo - Di - Mi - Do - Fr - Sa - Intelligenter Wecker - Beim Stellen der Wecker ist ein Fehler aufgetreten. Bitte erneut versuchen. - Wecker wurden an das Gerät gesendet! - Keine Daten. Gerät synchronisieren? - %1$s an Daten werden übertragen, beginnend mit %2$s - Ziel Anzahl Schritte pro Tag - Fehler beim Ausführen von \'%1$s\' - Deine Aktivität (ALPHA) - Kann keine Verbindung herstellen: %1$s - Kann keinen Handler für die Installation dieser Datei finden. - Konnte folgende Datei nicht installieren: %1$s - Kann die gegebene Firmware nicht installieren. Sie passt nicht zur Hardware-Revision der Pebble. - Bitte warten, Installationsstatus wird festgestellt… - Gadget-Akkustand niedrig! - %1$s Akku übrig: %2$s%% - Zuletzt aufgeladen: %s\n - Anzahl Ladungen: %s - Dein Schlaf - Schlaf pro Woche - Heutiger Schlaf, Ziel: %1$s - Schritte pro Woche - Deine Aktivität und dein Schlaf - Firmware wird aktualisiert… - Datei kann nicht installiert werden, Gerät nicht bereit. - %1$s: %2$s %3$s - Kompatible Version - Ungetestete Version! - Verbindung zum Gerät: %1$s - Pebble Firmware %1$s - Korrekte Hardware-Revision - Falsche Hardware-Revision! - %1$s (%2$s) - Problem mit der Firmwareübertragung. NICHT das Mi Band neu starten! - Problem bei der Firmware Metadatenübertragung - Firmware-Installation erfolgreich beendet - Firmware-Installation erfolgreich beendet, Gerät wird neu gestartet… - Schreiben der Firmware fehlgeschlagen - Schritte - Kalorien - Distanz - Uhrzeit - Puls - Batterie - Live Aktivität - Schritte heute, Ziel: %1$s - Transfer von Aktivitätsdaten nicht bestätigen (kein ACK) - Wenn der Transfer der Aktivitätsdaten nicht bestätigt wird, werden die Daten nicht auf dem MiBand gelöscht. Das ist sinnvoll, wenn neben Gadgetbridge noch andere Apps auf das MiBand zugreifen. - Aktivitätsdaten verbleiben auf dem MiBand, auch nach der Synchronisierung. Hilfreich, wenn das MiBand mit weiteren Apps verwendet wird. - Benutze Modus mit niedriger Latenz für Firmware-Updates - Dies kann bei Geräten helfen, bei denen Firmwareupdates fehlschlagen. - Schritteverlauf - Akt. Schritte pro Minute - Schritte insgesamt - Verlauf Schritte pro Minute - Starte deine Aktivität - Aktivität - Leichter Schlaf - Tiefschlaf - Nicht getragen - Nicht verbunden. - Alle Alarme deaktiviert - Aktivitätsdaten auf dem Gerät lassen - Inkompatible Firmware - Diese Firmware ist nicht mit dem Gerät kompatibel - Wecker für zukünftige Ereignisse vormerken - Verwende den Herzfrequenzsensor, um die Schlaferkennung zu verbessern - Zeitausgleich in Stunden (um den Schlaf von Schichtarbeitern zu erkennen) - Datumsformat - Zeit - Zeit & Datum - Benachrichtigungen bei Schrittziel - Das Band vibriert, wenn das tägliche Schrittziel erreicht ist - Angezeigte Items - Wähle aus, welche Items auf dem Band angezeigt werden sollen - Display beim Anheben aktivieren - Drehe dein Handgelenk, um die Anzeige zu wechseln - Bitte nicht stören - Es werden keine Benachrichtigungen während einer Aktivität empfangen - Inaktivitätswarnungen - Das Band wird vibrieren, wenn du für eine Weile inaktiv warst - Grenzwert für Inaktivität (in Minuten) - Deaktiviere Inaktivitätswarnungen zu einer bestimmten Zeit - Startzeit - Endzeit - Übertrage Daten ab %1$s - Warte auf Verbindung - Über Dich - Geburtsjahr - Geschlecht - Größe in cm - Gewicht in kg - Authentifiziere - Authentifizierung erforderlich - Zzz - Widget hinzufügen - Gewünschte Schlafdauer in Stunden - Ein Wecker wurde auf %1$02d:%2$02d gestellt - Hardwarerevision: %1$s - Firmware-Version: %1$s - Fehler beim Erstellen des Verzeichnisses für Logdateien: %1$s - "HF: " - Firmwareupdate wird durchgeführt - Firmware wurde nicht gesendet - Puls - Puls - Rohdaten in der Datenbank speichern - Wenn eingeschaltet, werden Daten so wie sie eingehen für eine spätere Analyse gespeichert. Achtung: Die Datenbank wird dadurch grösser! - Datenbankverwaltung - Datenbankverwaltung - Die Datenbankoperationen verwenden den folgenden Pfad auf dem Gerät. \nDieser Pfad ist von anderen Android-Apps und ihrem Computer aus zugreifbar. \nSie finden die exportierte Datenbank hier (bzw. legen die zu importierende dort ab): - Legacy-Datenbank löschen - Kann nicht auf den Exportpfad zugreifen. Bitte die Entwickler kontaktieren. - Exportiert nach: %1$s - Fehler beim Exportieren der DB: %1$s - Fehler beim Exportieren der Einstellungen: %1$s - Daten importieren? - Wirklich die aktuelle Datenbank überschreiben? Alle aktuellen Aktivitätsdaten (sofern vorhanden) gehen verloren. - Import erfolgreich. - Fehler beim Importieren der DB: %1$s - Fehler beim Importieren der Einstellungen: %1$s - Aktivitätsdaten löschen? - Wirklich die komplette Datenbank löschen? Alle Aktivitätsdaten und Informationen über Deine Geräte gehen verloren. - Daten erfolgreich gelöscht. - Löschen der Datenbank fehlgeschlagen. - Alte Aktivitätsdatenbank löschen? - Wirklich die alte Aktivitätsdatenbank löschen? Nicht importierte Aktivitätsdaten gehen verloren. - Alte Aktivitätsdatenbank erfolgreich gelöscht. - Löschen der alten Aktivitätsdatenbank fehlgeschlagen. - Überschreiben - Abbrechen - Löschen - - Vibration - - Pebble-Kopplung - Ein Kopplungsdialog sollte auf dem Android-Gerät erscheinen. Falls das nicht passiert, schau in die Benachrichtigungen und akzeptiere die Kopplungsanfrage. Akzeptiere danach die Kopplungsanfrage auf deiner Pebble - Stelle sicher, dass dieses Skin in der Wetter-App aktiviert ist, damit du Wetterdaten auf deine Pebble erhältst. \n\nKeine Konfiguration nötig. \n\nDu kannst die System-Wetter-App deiner Pebble im App-Management aktivieren. \n\nUnterstützte Watchfaces werden die Wetterdaten automatisch anzeigen. - Bluetooth-Kopplung aktivieren - Deaktiviere dies, falls du Probleme beim Verbinden hast - Metrisch - Imperial (US/UK) - 24h - AM/PM - Wecker - (%1$s) - Gefunden! - Mi2: Uhrzeitformat - Installiere Version %1$s vor dem Installieren der Firmware! - Text-Benachrichtigung - = 1.0.1.28 und installiertes Mili_pro.ft* benötigt.]]> - Aus - Aus - Automatisch (Schlaferkennung) - Geplant (Zeitintervall) - Versuche mit %1$s zu koppeln - Kopplung mit %1$s soeben fehlgeschlagen. - Versuche zu verbinden mit: %1$s - Aktiviere Bluetooth, um Geräte zu finden. - Erfolgreich gekoppelt mit %1$s. - Koppeln mit %1$s? - Wähle Koppeln, um dein Gerät zu verbinden. Falls dies fehlschlägt, versuche es erneut ohne Kopplung. - Koppeln - Nicht koppeln -Geschwindigkeitszonen - Es soll die Firmware %s auf die Amazfit Bip gespielt werden. + Gadgetbridge + Gadgetbridge + Einstellungen + Debug + Beenden + Spenden + Synchronisieren + Schlafaufzeichnung (ALPHA) + Verlorenes Gerät finden + Bildschirmfoto machen + Trennen + Gerät löschen + %1$s löschen + Dadurch werden das Gerät und alle zugehörigen Daten gelöscht! + Navigationsmenü öffnen + Navigationsmenü schließen + Langes Drücken der Karte trennt die Verbindung + Trennen + Verbinden… + Einen Screenshot des Gerätes erstellen + Debug + + App-Manager + Apps im Zwischenspeicher + Installierte Apps + Installierte Zifferblätter + Löschen + Löschen und aus dem Zwischenspeicher entfernen + Erneut installieren + Im Pebble Appstore suchen + Aktivieren + Deaktivieren + HRM aktivieren + HRM deaktivieren + System Wetter-App aktivieren + System Wetter-App deaktivieren + Installiere die Wetterbenachrichtigungs-App + Konfigurieren + Nach oben + + Blacklist für Benachrichtigung + + Kalender auf Blacklist + + FW/App-Installer + Du installierst jetzt die Firmware %s anstelle der Firmware, die sich derzeit auf deinem Mi-Band befindet. + Du bist dabei, die %1$s und %2$s Firmware zu installieren, anstatt die, die sich derzeit auf deinem Mi Band befinden. + Diese Firmware wurde getestet und ist bekanntlich mit Gadgetbridge kompatibel. + Diese Firmware ist nicht getestet und ist möglicherweise nicht mit Gadgetbridge kompatibel. +\n +\nDu wirst GEBETEN, diese nicht auf dein Mi Band zu installieren! + Wenn du dennoch fortfahren möchtest und das Gerät anschliessend korrekt funktioniert, melde bitte den Gadgetbridge-Entwicklern, das sie die Firmwareversion %s auf die Whitelist setzen sollen. + + Einstellungen + Allgemeine Einstellungen + Mit Gadgetbridge-Gerät verbinden, wenn Bluetooth eingeschaltet ist + Automatisch starten + Verbindung automatisch wiederherstellen + Bevorzugter Audioplayer + Standard + Datum und Uhrzeit + Uhrzeit synchronisieren + Synchronisiere die Zeit mit dem Gadgetbridge-Gerät, wenn du dich verbindest und wenn sich die Zeit oder die Zeitzone auf dem Android-Gerät ändert + Farbschema + Hell + Dunkel + Sprache + Gadgetbridge-Benachrichtigung ausblenden + Das Symbol in der Statusleiste und die Benachrichtigung auf dem Sperrbildschirm werden angezeigt + Das Symbol in der Statusleiste und die Benachrichtigung auf dem Sperrbildschirm werden nicht angezeigt + Benachrichtigungen + Wiederholungen + Telefonanrufe + SMS + Pebble-Nachrichten + Unterstützung für Apps, die Benachrichtigungen an die Pebble via PebbleKit senden. + Unterstützung allgemeine Benachrichtigung + …auch wenn der Bildschirm an ist + Bitte nicht stören + Unerwünschte Benachrichtigungen werden in diesem Modus gestoppt + Umwandlung + Aktiviere dies, falls dein Gerät keine Unterstützung für die Schriftart deiner Sprache hat + Immer + Wenn der Bildschirm aus ist + Niemals + Privatsphäre + Datenschutz beim Anrufen + Name und Telefonnummer anzeigen + Name ausblenden, aber Nummer anzeigen + Nummer ausblenden, aber Name anzeigen + Name und Telefonnummer ausblenden + Apps-Blacklist + Kalender-Blacklist + Nachrichtenvorlagen + Antworten + Gemeinsame Endung + Anrufabweisung + Update auf Pebble + Entwickleroptionen + Mi Band Adresse + Pebble-Einstellungen + Aktivitäts-Tracker + Bevorzugter Aktivitäts-Tracker + Pebble Gesundheit synchronisieren + Misfit synchronisieren + Morpheuz synchronisieren + Unterstützung für ausgehende Anrufe + Deaktivieren hindert auch die Pebble 2/LE daran, bei ausgehenden Anrufen zu vibrieren + Zugriff auf Android Drittanbieter-Apps zulassen + Experimentelle Unterstützung für Android-Apps mit PebbleKit aktivieren + Pebble-Zeitleiste + Sonnenauf- und Untergänge + Sende Sonnenauf- und -untergangszeiten abhängig vom Standort auf die Pebble-Zeitleiste + Synchronisiere Kalender + Sende Kalenderereignisse an die Zeitleiste + Abgewiesene Benachrichtigungen automatisch entfernen + Wenn Benachrichtigungen vom Android-Gerät entfernt werden, geschieht das auch automatisch auf der Pebble + Datenschutzmodus + Normale Benachrichtigungen + Verschiebe den Benachrichtigungstext außerhalb des Bildschirms + Nur das Benachrichtigungssymbol anzeigen + Standort + Standort ermitteln + Breitengrad + Längengrad + Standort aktuell halten + Versuche, den aktuellen Standort zu ermitteln und nutze den gespeicherten Standort, falls das fehlschlägt + Bitte Netzwerkstandort aktivieren + Standort wurde ermittelt + Benachrichtigungsprotokoll erzwingen + Diese Option erzwingt das neuste Benachrichtigungsprotokoll abhängig von der Firmwareversion. NUR EINSCHALTEN, WENN DU WEISST, WAS DU TUST! + Ungetestete Features aktivieren + Ungetestete Funktionen aktivieren. WEISST DU WAS DU TUST! + BLE immer bevorzugen + Nutze die experimentelle LE-Unterstützung für alle Pebbles anstelle von BT-Classic. Dies erfordert zuerst eine Kopplung mit Nicht-LE und dann Pebble LE + Pebble 2/LE GATT MTU Limit + Wenn deine Pebble 2/Pebble LE nicht so wie erwartet funktioniert, versuche die MTU zu begrenzen (erlaubte Werte 20 bis 512) + Watch-App-Protokollierung aktivieren + Schreibt Logs von Watch Apps in Gadgetbridge-Logs (erfordert erneute Verbindung) + nicht ausgereiftes PebbleKit ACKen + Nachrichten, die an externe Drittanbieter-Apps geschickt werden, werden immer und sofort bestätigt + Erneute Verbindungsversuche + Einheiten + Zeitformat + Bildschirm-An-Dauer + Ganztägige Herzfrequenzmessung + HPlus/Makibes Einstellungen + Nicht verbunden + Verbinden + Verbunden + Unbekannter Zustand + HW: %1$s FW: %2$s + Firmware-Version %1$s + (unbekannt) + Test + Testbenachrichtigung + Dies ist eine Testbenachrichtigung von Gadgetbridge + Bluetooth wird nicht unterstützt. + Bluetooth ist deaktiviert. + Tippe auf das verbundene Gerät, um den App-Manager zu starten + Tippe auf das verbundene Gerät, um die Aktivitätsdaten anzuzeigen + Tippe auf das verbundene Gerät, um es vibrieren zu lassen + Tippe auf ein Gerät, um eine Verbindung herzustellen + Keine Verbindung möglich. Bluetooth-Adresse ungültig\? + Gadgetbridge läuft + Binärdatei installieren %1$d/%2$d + Installation fehlgeschlagen + Installiert + DU VERSUCHST EINE FIRMWARE ZU INSTALLIEREN , FAHRE AUF EIGENES RISIKO FORT. +\n +\n +\nDiese Firmware ist für HW Revision: %s + Du bist dabei die folgende App zu installieren: +\n +\n +\n%1$s Version %2$s von %3$s +\n + N/A + initialisiert + %1$s von %2$s + Geräteerkennung + Scannen anhalten + Entdeckung starten + Neues Gerät verbinden + %1$s (%2$s) + Gerät koppeln + Verwende den Android-Bluetooth-Kopplungsdialog, um das Gerät zu koppeln. + Kopple dein Mi Band + Koppeln mit %s… + Verbindung mit %1$s (%2$s) herstellen + Kein koppeln mit %1$s (%2$s) möglich + Verbindung wird hergestellt: %1$s (%2$s) + Bereits an %1$s (%2$s) gebunden, verbinden… + Keine MAC-Adresse erhalten, koppeln nicht möglich. + Gerätespezifische Einstellungen + Mi Band / Amazfit Einstellungen + Männlich + Weiblich + Andere + Links + Rechts + Keine gültigen Benutzerdaten angegeben, für die jetzt Dummy-Benutzerdaten verwendet werden. + Wenn Dein Mi Band vibriert und blinkt, tippe ein paar Mal hintereinander darauf. + Installieren + Mache dein Gerät auffindbar. Derzeit verbundene Geräte werden wahrscheinlich nicht erkannt. Standort aktivieren (zum Beispiel GPS) in Android 6+. Deaktiviere den Privatsphäreschutz für Gadgetbridge, da er zu Abstürzen und Neustarts deines Telefons führen kann. Wenn nach einigen Minuten kein Gerät erkannt wird, versuche es nach dem Neustart deines mobilen Gerätes erneut. + Hinweis: + Geräteabbild + Name/Alias + Vibrationszähler + Schlafüberwachung + Protokolldateien schreiben + Initialisieren + Aktivitätsdaten abrufen + Von %1$s bis %2$s + Wird links oder rechts getragen\? + Vibrationsprofile + Stakkato + Kurz + Mittel + Lang + Wassertropfen + Klingel + Wecker + Vibration + Versuchen + SMS-Benachrichtigung + Vibrationseinstellungen + Allgemeine Benachrichtigung + E-Mail-Benachrichtigung + Benachrichtigung bei eingehenden Anrufen + Chat + Navigation + Soziale Netzwerke + Minuten insgesamt + Schritte pro Minute + Verlorenes Gerät finden + Abbrechen, um die Vibration zu stoppen. + Deine Aktivität + Alarme konfigurieren + Alarme konfigurieren + Alarmdetails + So + Mo + Di + Mi + Do + Fr + Sa + Intelligentes Aufwecken + Beim Einstellen der Alarme ist ein Fehler aufgetreten. Bitte erneut versuchen. + Wecker ans Gerät gesendet. + Keine Daten. Gerät synchronisieren? + Im Begriff %1$s Daten zu übertragen, beginnend mit %2$s + Tägliches Schrittziel + Fehler beim Ausführen \'%1$s\' + Deine Aktivität (ALPHA) + Keine Verbindung möglich: %1$s + Kann keinen Handler finden, um diese Datei zu installieren. + Angegebene Datei kann nicht installiert werden: %1$s + Angegebene Firmware kann nicht installiert werden: Sie passt nicht zur Hardware-Revision deiner Pebble. + Bitte warten, Installationsstatus wird ermittelt… + Gadget-Akku schwach! + %1$s Akku übrig: %2$s%% + Letzter Ladevorgang: %s +\n + Anzahl der Ladungen: %s + Dein Schlaf + Schlaf pro Woche + Schlaf heute, Ziel: %1$s + Schritte pro Woche + Deine Aktivität und Schlaf + Firmware aktualisieren… + Datei kann nicht installiert werden, Gerät nicht bereit. + %1$s: %2$s %3$s + Kompatible Version + Ungetestete Version! + Verbindung zum Gerät: %1$s + Pebble Firmware %1$s + Korrekte Hardware-Revision + Falsche Hardware-Revision! + %1$s (%2$s) + Problem mit der Firmwareübertragung. DEIN MI BAND NICHT NEU STARTEN! + Problem bei der Firmware-Metadatenübertragung + Firmware-Installation abgeschlossen + Firmware-Installation erfolgreich beendet, Gerät wird neu gestartet… + Firmware aktualisieren fehlgeschlagen + Schritte + Kalorien + Distanz + Uhr + Herzfrequenz + Akku + Live-Aktivität + Schritte heute, Ziel: %1$s + Keine ACK-Aktivitätsdatenübertragung durchführen + Wenn die Aktivitätsdaten nicht an das Band gesendet werden, werden sie nicht gelöscht. Nützlich, wenn Gadgetbridge zusammen mit anderen Apps verwendet wird. + Aktivitätsdaten verbleiben auf dem Mi Band, auch nach der Synchronisierung. Nützlich, wenn Gadgetbridge zusammen mit anderen Apps verwendet wird. + Verwende den Low-Latency-Modus für Firmwareaktualisierung + Dies kann bei Geräten helfen, bei denen Firmwareupdates fehlschlagen. + Schrittverlauf + Aktuelle Schritte/min + Schritte insgesamt + Schrittverlauf pro Minute + Starte deine Aktivität + Aktivität + Leichter Schlaf + Tiefschlaf + Nicht getragen + Nicht verbunden. + Alle Alarme deaktiviert + Aktivitätsdaten auf dem Gerät lassen + Inkompatible Firmware + Diese Firmware ist nicht mit dem Gerät kompatibel + Alarme für zukünftige Ereignisse vormerken + Verwende den Herzfrequenzsensor, um die Schlaferkennung zu verbessern + Gerätezeitversatz in Stunden (Erkennung des Schlafes von Schichtarbeitern) + Datumsformat + Zeit + Zeit & Datum + Zielbenachrichtigung + Das Band vibriert, wenn das Tagesschrittziel erreicht ist + Anzeigeelemente + Die auf der Bandanzeige anzuzeigenden Elemente auswählen + Anzeige beim Anheben aktivieren + Handgelenk drehen, um die Information zu wechseln + Bitte nicht stören + Wenn das Band aktiv ist, erhält es keine Benachrichtigungen + Inaktivitätswarnungen + Das Band vibriert, wenn du eine Weile nicht aktiv warst + Grenzwert für Inaktivität (in Minuten) + Deaktivieren von Inaktivitätswarnungen für eine bestimmte Zeit + Startzeit + Endzeit + Übertrage Daten ab %1$s + Warten auf Wiederverbindung + Über Dich + Geburtsjahr + Geschlecht + Größe in cm + Gewicht in kg + Authentifizieren + Authentifizierung erforderlich + Zzz + Widget hinzufügen + Gewünschte Schlafdauer in Stunden + Ein Wecker wurde auf %1$02d:%2$02d gestellt + Entwicklungsstand: %1$s + Firmware-Version: %1$s + Fehler beim Erstellen des Verzeichnisses für Protokolldateien: %1$s + "HF: " + Firmwareupdate wird durchgeführt + Firmware nicht gesendet + Herzfrequenz + Herzfrequenz + Rohdaten in der Datenbank speichern + Speichert Daten \"wie sie sind\" und erhöht die Datenbanknutzung, um eine spätere Auswertung zu ermöglichen. + Datenbankverwaltung + Datenbankverwaltung + Die Datenbankoperationen verwenden den folgenden Pfad auf deinem Gerät. +\nDieser Pfad ist für andere Android-Apps und deinem Computer zugänglich. +\nDu findest die exportierte Datenbank hier (bzw. lege die zu importierende dort ab): + Legacy-Datenbank löschen + Kann nicht auf den Exportpfad zugreifen. Bitte die Entwickler kontaktieren. + Exportiert nach: %1$s + Fehler beim Exportieren der DB: %1$s + Fehler beim Exportieren der Einstellungen: %1$s + Daten importieren? + Die aktuelle Datenbank wirklich überschreiben\? Alle aktuellen Aktivitätsdaten (falls vorhanden) gehen verloren. + Importiert. + Fehler beim Importieren der DB: %1$s + Fehler beim Importieren der Einstellungen: %1$s + Aktivitätsdaten löschen? + Die gesamte Datenbank wirklich löschen\? Alle Aktivitätsdaten und Informationen über Deine Geräte gehen verloren. + Daten gelöscht. + Datenbank löschen fehlgeschlagen. + Alte Aktivitätsdatenbank löschen? + Die alte Aktivitätsdatenbank wirklich löschen\? Nicht importierte Aktivitätsdaten gehen verloren. + Alte Aktivitätsdaten gelöscht. + Löschen der alten Aktivitätsdatenbank fehlgeschlagen. + Überschreiben + Abbrechen + Löschen + + Vibration + + Pebble koppeln + Auf deinem Android-Gerät erscheint ein Koppeln-Dialog. Wenn nicht, schaue in die Benachrichtigungsübersicht und akzeptiere die Kopplungsanforderung. Akzeptiere es auch danach auf deiner Pebble. + Stelle sicher, dass dieses Skin in der Wetterbenachrichtigungsapp aktiviert ist, damit du Wetterdaten auf deiner Pebble erhältst. +\n +\nHier ist Keine Konfiguration nötig. +\n +\nDu kannst die Systemwetter-App deiner Pebble in App-Verwaltung aktivieren. +\n +\nUnterstützte Zifferblätter zeigen das Wetter automatisch an. + Bluetooth-Kopplung aktivieren + Deaktiviere dies, wenn du Probleme beim Verbinden hast + Metrisch + Imperial (US/UK) + 24h + AM/PM + Wecker + (%1$s) + Du hast es gefunden! + Mi2: Zeitformat + Du musst die Version %1$s installieren, bevor du diese Firmware installieren kannst! + Textbenachrichtigungen + Benötigt Firmware >= 1.0.1.28 und installiertes Mili_pro.ft*. + Aus + Aus + Automatisch (Schlaferkennung) + Geplant (Zeitintervall) + Versucht mit %1$s zu koppeln + Bindung mit %1$s sofort fehlgeschlagen. + Versuchen zu verbinden mit: %1$s + Aktiviere Bluetooth, um Geräte zu erkennen. + Gebunden an %1$s. + Koppeln mit %1$s? + Wähle Koppeln, um dein Gerät zu verbinden. Falls dies fehlschlägt, versuche es erneut ohne koppeln. + Koppeln + Nicht koppeln + Geschwindigkeitszonen + Du bist dabei, die Firmware %s auf deine Amazfit Bip zu installieren. \n -\nBitte stelle sicher, dass Du zuerst die .gps firmware, dann die .res Datei, und zum Schluss die .fw Datei installierst. Deine Uhr wird sich nach der Installation der .fw Datei neu starten. +\nBitte stelle sicher, dass du die .fw Datei, dann die .res Datei und schließlich die .gps Datei installierst. Deine Uhr wird nach der Installation der .fw Datei neu gestartet. \n -\nHinweis: Du musst die .res and .gps Dateien nicht installieren, falls diese genau die gleichen Dateien wie die sind, die Du schon mit einer vorigen .fw Datei zusammen installiert hattest. +\nHinweis: Du musst die .res und .gps nicht installieren, wenn diese Dateien genau die gleichen sind wie die zuvor installierten. \n \nINSTALLATION AUF EIGENE GEFAHR! Amazfit Bip Firmware %1$s - Aktion bei Tastendruck + Tastenaktionen Bestimmte Aktion bei Tastendruck auf dem Mi Band 2 - Anzahl der Tastendrücke, die einen Broadcast auslöst - Zu sendende Broadcast-Nachricht + Anzahl der Tastendrücke, um die Nachrichtenübertragung auszulösen + Zu sendende Nachricht Aktiviere Tastenaktion Aktiviere Aktion bei einer bestimmten Anzahl an Tastendrücken - Aktiviere Vibration - Vibriere, wenn die Tastenaktion ausgelöst wurde + Bandvibration aktivieren + Bandvibration aktivieren, wenn die Tastenaktion ausgelöst wurde Maximale Verzögerung zwischen den Tastendrücken Maximale Verzögerung zwischen den Tastendrücken in Millisekunden Verzögerung nach Tastenaktion - Auf Android Gerät öffnen - Stummschalten - Antwort -Verbinden - Hintergrund JS + Auf Android-Gerät öffnen + Lautlos + Antworten + Verbinden + Hintergrund JS aktivieren Amazfit Bip Einstellungen Amazfit Cor Firmware %1$s Vereinfachtes Chinesisch Traditionelles Chinesisch Englisch - - Es soll die Firmware %s auf das Amazfit Cor gespielt werden. + Du bist dabei, die Firmware %s auf deine Amazfit Cor zu installieren. \n -\nBitte stelle sicher, dass du zuerst die .res-Datei und im Anschluss die .fw-Datei installierst. Nach der Installation der .fw-Datei startet deine Uhr neu. +\nBitte stelle sicher, dass du die .fw Datei und die .res Datei installierst. Deine Uhr wird nach der Installation der .fw Datei neu gestartet. \n -\nHinweis: Die .res-Datei muss nicht neu installiert werden, falls die exakt gleiche Datei bereits bei einer vorherigen Version installiert wurde. +\nHinweis: Du musst die .res nicht installieren, wenn diese Dateie genau die gleiche ist wie die zuvor installierte. \n -\nFORTFAHREN AUF EIGENE GEFAHR! - Anzahl an Tastendrücken - Seitwärts-Wischgesten in der Statistik-Anzeige aktivieren - - Wenn aktiviert, können Watchfaces Informationen zu Wetter, Ladezustand usw. anzeigen. - - ganztägige Pulsmessung - minütlich +\nINSTALLATION AUF EIGENE GEFAHR! + Anzahl der Tastendrücke + Streichen nach links/rechts im Diagrammbetrieb aktivieren + Wenn aktiviert, ermöglicht es Zifferblättern, Wetter, Akkuinfo usw. anzuzeigen. + Ganztägige Herzfrequenzmessung + einmal pro Minute alle 5 Minuten alle 10 Minuten alle 30 Minuten - stündlich - - automatisch - Web-View Aktivität - + einmal pro Stunde + Automatisch + Webansicht-Aktivität Wetter Firmware Ungültige Daten - GPS Firmware + GPS-Firmware Unbekanntes Gerät Testgerät Pebble @@ -473,22 +486,18 @@ Exrizu K8 No.1 F1 Teclast H30 - - Ort für das Wetter (CM/LOS) - + Wetterstandort (CM/LOS) Automatischer Export Automatischer Export aktiviert Speicherort für Export Exportintervall Exportiere alle %d Stunden - Datenbankexport fehlgeschlagen! Bitte überprüfe deine Einstellungen. - "Nachricht senden, wenn eingestellte Anzahl an Knopfdrücken erreicht ist " - Verzögerung nachdem Tastenaktion erkannt wurde (Dauer in button_id) oder 0 für sofortige Auslösung + Nachricht senden, wenn eingestellte Anzahl an Tastendrücken erreicht ist + Verzögerung nach einer Tastenaktion (Zahl in button_id) oder 0 für sofort Spanisch - Ein - Deine Aktivitätsverfolgungen + Deine Aktivitätsverläufe Nicht gemessen Aktivität Leichter Schlaf @@ -503,19 +512,15 @@ Laufband Alle auswählen Teilen - Empfangenes Datum zurücksetzen - + Abrufdatum zurücksetzen Schriftart - GPS Almanach - GPS Fehlerkorrektur + GPS-Kalender + GPS-Fehlerkorrektur Quellen Ziffernblatt - XWatch - - Exportverzeichnis wählen - Gadgetbridge Benachrichtigungen - + Exportort wählen + Gadgetbridge-Benachrichtigungen Status Aktivität Wetter @@ -524,36 +529,31 @@ Kompass Einstellungen Alipay -Es soll die Firmware %s auf das Mi Band 3 gespielt werden. + Du bist dabei, die Firmware %s auf dein Mi Band 3 zu installieren. \n -\nBitte stelle sicher, dass du zuerst die .fw-Datei und im Anschluss die .res-Datei installierst. Nach der Installation der .fw-Datei startet dein Mi Band 3 neu. +\nBitte stelle sicher, dass du die .fw Datei und die .res Datei installierst. Deine Uhr wird nach der Installation der .fw Datei neu gestartet. \n -\nHinweis: Die .res-Datei muss nicht neu installiert werden, falls die exakt gleiche Datei bereits bei einer vorherigen Version installiert wurde. +\nHinweis: Du musst die .res nicht installieren, wenn diese Dateie genau die gleiche ist wie die zuvor installiert \n \nNICHT GETESTET, DIES KÖNNTE DEIN GERÄT UNBENUTZBAR MACHEN, INSTALLATION AUF EIGENE GEFAHR! - "Experimentell. Nur kompatibel mit der Pebble 2. Nur aufspielen falls Sie Verbindungsprobleme haben. " - Automatischer Abruf von Aktivitätsdaten + Dies ist nur für Pebble 2 und experimentell, versuche dies, wenn du Verbindungsprobleme hast + Aktivitätsdaten automatisch abrufen Mi Band 3 Q8 Alipay (Schnellzugriff) Wetter (Schnellzugriff) - Sperrliste alle für Benachrichtigungen - Positivliste alle für Benachrichtigungen - - - Das Abrufen erfolgt beim Entsperren des Bildschirms. Funktioniert nur, wenn ein Sperrmechanismus eingestellt ist! - Sobald die Uhr vibriert, den Knopf betätigen oder kurz schütteln. + Blacklist für alle Benachrichtigungen + Whitelist für alle Benachrichtigungen + Abruf erfolgt beim Entsperren des Bildschirms. Funktioniert nur, wenn ein Sperrmechanismus eingestellt ist! + Wenn deine Uhr vibriert, schüttel das Gerät oder drücke die Taste. Kalibrieren Watch 9 koppeln Minuten: Stunden: Sekunden: Watch 9 kalibrieren - Stelle die Uhrzeit ein, die aktuell auf der Uhr zusehen ist. - -Kalibriere Gerät - - + Stelle die Zeit ein, die dir dein Gerät gerade anzeigt. + Gerät kalibrieren ID115 Einstellungen Mi Band 2 Einstellungen Mi Band 3 Einstellungen @@ -570,19 +570,16 @@ Polnisch Koreanisch Japanisch - - LED Farbe wechseln - FM Frequenz wechseln - Minimale Zeit zwischen den Benachrichtigungen - Von rechts nach links - Dies anschalten, wenn dein Gerät keine Sprachen von rechts nach links anzeigen kann + LED-Farbe ändern + FM-Frequenz ändern + Zeitabstand zwischen den Benachrichtigungen + Rechts-nach-Links + Aktivieren, wenn dein Gerät keine Sprachen von rechts-nach-links anzeigen kann Nur GATT-Client Bildschirmausrichtung - Minimale Zeit zwischen den Abrufen Alle %d Minuten abrufen - - %1$s Batterie gering + %1$s Akku schwach Kein Limit 5 Sekunden 10 Sekunden @@ -592,35 +589,60 @@ 5 Minuten 10 Minuten 30 Minuten - Fehlende Schritte: %1$d - Überschritte: %1$d - Aktueller / Maximaler Puls: %1$d / %2$d - MiBand-Bildschirm entsperren - Wische nach oben, um den Bildschirm vom MiBand zu entriegeln. + Überschritten: %1$d + Aktuelle / Maximale Herzfrequenz: %1$d / %2$d + Band-Bildschirm entsperren + Nach oben wischen, um den Band-Bildschirm zu entsperren Nachtmodus - Niedrigere MiBand-Bildschirmhelligkeit nachts automatisch einstellen - + Bandhelligkeit nachts automatisch verringern Diagrammeinstellungen - Maximaler Puls - Minimaler Puls - - Akzeptieren - + Maximale Herzfrequenz + Minimale Herzfrequenz + Ok Bei Sonnenuntergang - Maximale Zeilenlänge von rechts nach links + Rechts-nach-Links maximale Zeilenlänge Verschlafen: %1$s Benachrichtigungen Musik Mehr - Warnung! Keine Daten - - LED Farbe - - FM Frequenz + LED-Farbe + FM-Frequenz Ungültige Frequenz Bitte eine Frequenz zwischen 87,5 und 108,0 eingeben Sprach- und Gebietseinstellungen - + Wirklich auf Werkseinstellung zurücksetzen\? + Beim Zurücksetzen auf die Werkseinstellungen werden alle Daten vom angeschlossenen Gerät gelöscht (falls unterstützt). Xiaomi/Huami-Geräte ändern auch die Bluetooth-MAC-Adresse, so dass sie als neue Geräte bei Gadgetbrige erscheinen. + Verlängert oder verkürzt die Zeilen, in die der Rechts-nach-Links Text getrennt wird + %1$s Akku schwach: %2$s + Schlafmangel: %1$s + Übung + MyKronoz ZeTime + ID115 + Watch 9 + Roidmi + Roidmi 3 + Casio GB-6900 + Kontextabhängiges Arabisch + Aktivieren, um kontextabhängiges Arabisch zu unterstützen + Rechts nach Links Unterstützung + Protokoll teilen + Bitte beachte, dass Gadgetbridge Dateien protokolliert, die viele persönliche Informationen enthalten können, einschließlich, aber nicht beschränkt auf Gesundheitsdaten, eindeutige Identifikatoren (wie die MAC-Adresse eines Geräts), Musikpräferenzen usw. Erwäge, die Datei zu bearbeiten und diese Informationen zu entfernen, bevor du die Datei in einem Bericht über öffentliche Probleme sendest. + Benachrichtigungsfilter + App muss nicht auf der Blacklist stehen, um konfiguriert zu werden + Gewünschte Wörter eingeben, neue Zeile für jedes Wort + Benachrichtigungsfilter gespeichert + Nicht filtern + Wenn Wörter enthalten sind anzeigen + Wenn Wörter enthalten sind blockieren + Mindestens eines der Wörter + Alle Wörter + Bitte mindestens ein Wort eingeben + Filtermodus + Modus-Konfiguration + Konfiguration speichern + Nicht verbunden, Alarm nicht eingestellt. + Benachichtigung beim Verbindung trennen + \ No newline at end of file diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 2a8f608bd..5b274ccda 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1,6 +1,6 @@ -"Gadgetbridge " - + + "Gadgetbridge " Gadgetbridge Ρυθμίσεις Αποσφαλμάτωση @@ -17,12 +17,9 @@ Αυτό θα διαγράψει την συσκευή και όλα τα δεδομένα σχετικά με αυτή! Πατήστε συνεχόμενα στη καρτέλα της συσκευής για αποσύνδεση Γίνεται αποσύνδεση - Γίνεται σύνδεση + Συνδέστε… Λήψη στιγμιότυπου από τη συσκευή - - Αποσφαλμάτωση - Άνοιγμα συρταριού πλοήγησης Κλείσιμο συρταριού πλοήγησης Εφαρμογές στην προσωρινή μνήμη @@ -41,11 +38,8 @@ Εγκαταστείστε την εφαρμογή ειδοποίησης Καιρού Επιλογές Μετακίνηση στη κορυφή - Αποκλεισμένες ειδοποιήσεις - Αποκλεισμένα ημερολόγια - Εγκαταστάτης εφαρμογών/FW Πρόκειται να εγκαταστήσετε την έκδοση λογισμικού %s αντί για αυτή που έχετε τώρα στο Mi Band σας. "Πρόκειται να εγκαταστήστε το λογισμικό έκδοσης %s στο Amazfit Bip σας. @@ -73,9 +67,7 @@ \nΔΕΝ συνίσταται η εγκατάσταση του στο Mi Band σας! Διαχειριστής εφαρμογών Αν ακόμη θέλετε να προχωρήσετε και μετά όλα λειτουργούν κανονικά, παρακαλούμε ενημερώστε τους δημιουργούς του Gadgetbridge σχετικά με την %s έκδοση. - Ρυθμίσεις - Γενικές ρυθμίσεις Σύνδεση με την φορετή συσκευή όταν το Bluetooth στο κινητό ενεργοποιείται Αυτόματη έναρξη @@ -83,21 +75,16 @@ Προτιμώμενο πρόγραμμα ήχου Προεπιλογή Σύρετε αριστερά/δεξιά για τα διαγράμματα της δραστηριότητας - Ημερομηνία και ώρα Συγχρονισμός ώρας Συγχρονισμός ώρας στη φορετή συσκευή όταν αυτή συνδέεται με το κινητό ή όταν αλλάζετε ζώνη ώρας - Θέμα Ανοιχτόχρωμο Σκούρο - Γλώσσα - Απόκρυψη του εικονιδίου της εφαρμογής Gadgetbridge από τη μπάρα ειδοποιήσεων Το εικονίδιο θα φαίνεται στη γραμμή κατάστασης και οι ειδοποιήσεις στην οθόνη κλειδώματος Απόκρυψη του εικονίδιου από τη γραμμή κατάστασης και των ειδοποιήσεων από την οθόνη κλειδώματος - Ειδοποιήσεις Επαναλήψεις Τηλεφωνικές κλήσεις @@ -110,69 +97,53 @@ "Μη επιθυμητές ειδοποιήσεις δεν στελνονται σε αυτή τη λειτουργία " Αλλαγή χαρακτήρων Ενεργοποιήστε αυτή την επιλογή αν η συσκευή σας δεν υποστηρίζει τις γραμματοσειρές της γλώσσας σας - Πάντα Όταν η οθόνη είναι σβηστή Ποτέ - Ιδιωτικότητα Λειτουργία ιδιωτικότητας στη διάρκεια των κλήσεων Να φαίνεται όνομα κι αριθμός Να φαίνεται μόνο ο αριθμός Να φαίνεται μόνο το όνομα Απόκρυψη ονόματος και αριθμού - - Αποκλεισμένες εφαρμογές Αποκλεισμένα ημερολόγια - Προκαθορισμένα μηνύματα Απαντήσεις Κοινή κατάληξη Απόρριψη κλήσης Αναβάθμιση στο Pebble - Επιλογές προγραμματιστή Διεύθυνση Bluetooth του Mi Band - Ρυθμίσεις για Pebble - Ανιχνευτές δραστηριότητας Προτιμώμενοι ανιχνευτές δραστηριότητας Συγχρονισμός Pebble Heath Συγχρονισμός Misfit Συγχρονισμός Morpheuz - Υποστήριξη εξερχομένων κλήσεων Απενεργοποιώντας αυτό θα απενεργοποιηθεί και η δόνηση στο Pebble2/LE στις εξερχόμενες κλήσεις - Να επιτραπεί η πρόσβαση σε εφαρμογές τρίτων "Να επιτραπεί η δοκιμαστική υποστήριξη για τις Android εφαρμογές χρησιμοποιώντας το PebbleKit" - Χρονολόγιο Pebble Ανατολή και Δύση του ήλιου Αποστολή της ώρας ανατολής και δύσης, βασισμένη στη τοποθεσία, στο χρονολόγιο Pebble Συγχρονισμός ημερολογίου Αποστολή των γεγονότων του ημερολογίου στο χρονολόγιο - Αυτόματη αφαίρεση ειδοποιήσεων που έχουν απορριφθεί Οι ειδοποιήσεις να αφαιρούνται από το Pebble αυτόματα, όταν απορρίπτονται στο τηλέφωνο - Λειτουργία ιδιωτικότητας Ειδοποιήσεις Μετατόπιση της ειδοποίησης εκτός οθόνης Να φαίνεται μόνο το εικονίδιο της ειδοποίησης - Τοποθεσία Ανάκτηση τοποθεσίας Γεωγραφικό πλάτος Γεωγραφικό μήκος Να κρατείτε η τοποθεσία ενημερωμένη Προσπάθεια χρήσης της παρούσας τοποθεσίας κατά τον χρόνο εκτέλεσης, εναλλακτικά χρήση της αποθηκευμένης τοποθεσίας - Παρακαλώ ενεργοποιήστε τις υπηρεσίες τοποθεσίας Η τοποθεσία βρέθηκε - Πρωτόκολλο υποχρεωτικών ειδοποιήσεων Αυτή η επιλογή υποχρεώνει την χρήση του πιο πρόσφατου πρωτοκόλλου ειδοποιήσεων ανάλογα με την έκδοση του λογισμικού. ΕΝΕΡΓΟΠΟΙΗΣΤΕ ΜΟΝΟ ΑΝ ΞΕΡΕΤΕ ΤΙ ΚΑΝΕΤΕ! Να επιτρέπονται τα μη δοκιμασμένα χαρακτηριστικά @@ -187,15 +158,12 @@ "Θα αναγκάσει τα μηνύματα που στέλνονται από εφαρμογές τρίτων να γνωστοποιούνται πάντα και άμεσα" Χρήση JS στο παρασκήνιο Αν επιλεχθεί, θα επιτρέπει στα watchfaces να δείχνουν το καιρό, την μπαταρία κλπ. - Προσπάθειες επανασύνδεσης - Μονάδες Μορφή ώρας Διάρκεια ανάμματος οθόνης Μέτρηση καρδιακού σφυγμού όλη τη μέρα Ρυθμίσεις για HPlus/Makibes - Μη συνδεδεμένο Γίνεται σύνδεση Συνδεδεμένο @@ -228,7 +196,6 @@ Αρχικοποίηση %1$s από %2$s Εύρεση συσκευής - Σταμάτημα σάρωσης Έναρξη ανεύρεσης Σύνδεση νέας συσκευής @@ -258,7 +225,6 @@ Εικόνα της συσκευής Όνομα/Ψευδώνυμο Αριθμός δονήσεων - Καταγραφή ύπνου Ενεργοποίηση αρχείων καταγραφής Αρχικοποίηση @@ -266,7 +232,6 @@ Από %1$s έως %2$s Σε ποιο χέρι το φοράτε; Προφίλ δόνησης - Κοφτή Σύντομη Μέτρια @@ -275,30 +240,25 @@ Κουδούνισμα Ξυπνητήρι Δόνηση - Δοκιμή Ειδοποιήσεις SMS Ρυθμίσεις δόνησης Γενικές ειδοποιήσεις Ειδοποιήσεις email Τοποθεσία καιρού (για τις ROM Cyanogenmod ή LineageOS) - Ειδοποιήσεις εισερχομένων κλήσεων Συζήτηση Πλοήγηση Κοινωνικά δίκτυα - Μέτρηση υγείας όλη τη μέρα κάθε λεπτό κάθε 5 λεπτά κάθε 10 λεπτά κάθε 30 λεπτά κάθε ώρα - Ζώνες ταχύτητας Λεπτά σε σύνολο Βήματα ανά λεπτό - Εντοπισμός συσκευής Ακυρώστε για να σταματήσει η δόνηση. Η δραστηριότητά σας @@ -366,7 +326,6 @@ %1$s: %2$s %3$s Χρήση της λειτουργίας χαμηλής καθυστέρησης για τις αναβαθμίσεις λογισμικού Αυτό μπορεί να βοηθήσει για συσκευές που η αναβάθμιση λογισμικού αποτυγχάνει. - Ιστορικό βημάτων Τρέχων ρυθμός βημάτων/λεπτό Συνολικός αριθμός βημάτων @@ -383,7 +342,7 @@ Αυτό το λογισμικό δεν είναι συμβατό με τη συσκευή Ξυπνητήρια που θα \"κρατηθούν\" για τα επερχόμενα συμβάντα του ημερολογίου Χρήση του αισθητήρα παλμών για να βελτιωθεί η ανίχνευση του ύπνου - Αντιστάθμιση χρόνου σε ώρες (για να ανιχνευθεί ο ύπνος, σε εργαζόμενους που δουλεύουν βράδυ) + Αντιστάθμιση χρόνου σε ώρες (για να ανιχνευθεί ο ύπνος, σε εργαζόμενους που δουλεύουν βράδυ) Μορφή ημερομηνίας Ώρα Ώρα και ημερομηνία @@ -415,25 +374,19 @@ Απενεργοποιήστε την προειδοποίηση αδράνειας για κάποιο χρόνο Ώρα έναρξης Ώρα λήξης - Αυτόματα Απλοποιημένα Κινεζικά Παραδοσιακά Κινεζικά Αγγλικά - "Θα μεταφέρετε δεδομένα από %1$s" - Αναμονή για επανασύνδεση - Σχετικά με εσάς Έτος γέννησης Φύλλο Ύψος σε εκατοστά Βάρος σε κιλά - Επαλήθευση ταυτότητας Απαιτείται επαλήθευση ταυτότητας - Ζzz Πρόσθεση widget Προτιμώμενος χρόνος ύπνου (σε ώρες) @@ -446,7 +399,6 @@ Το λογισμικό δεν απεστάλη στη συσκευή Σφυγμοί Σφυγμοί - Αποθήκευση των ακατέργαστων εγγραφών στη βάση δεδομένων Με αυτή την επιλογή θα αποθηκευτούν τα δεδομένα \"ως έχουν\", μεγαλώνοντας τη χρήση της βάσης δεδομένων για να είναι διαθέσιμα για ερμηνεία αργότερα. Διαχείριση βάσης δεδομένων @@ -475,12 +427,9 @@ Αντικατάσταση Ακύρωση Διαγραφή - Δόνηση - Σύζευξη Pebble Ένα παράθυρο σύζευξης θα εμφανιστεί στην Abdroid συσκευή σας. Αν αυτό δεν συμβεί, δείτε στη περιοχή ειδοποιήσεων και δεχθείτε την σύζευξη. Επίσης μετά δεχθείτε την σύζευξη και στο Pebble σας. - Βεβαιωθείτε ότι αυτό το θέμα είναι ενεργοποιημένο στην εφαρμογή του καιρού ώστε να λάβει τις πληροφορίες το Pebble. \n \nΔεν χρειάζονται εδώ ρυθμίσεις. @@ -490,17 +439,12 @@ \nΤα watchfaces που υποστηρίζουν την εφαρμογή του καιρού, θα δείξουν τον καιρό αυτόματα. Ενεργοποίηση σύζευξης Bluetooth Απενεργοποιήστε αυτή την επιλογή αν έχετε προβλήματα σύνδεσης - Μετρικό (S.I.) Αγγλοσαξωνικό - 24ωρο πμ/μμ - Ξυπνητήρι - Δραστηριότητα προβολής ιστού - (%1$s) Το βρήκατε! Mi Band 2: Μορφή ώρας @@ -520,7 +464,6 @@ Διαλέξτε \"Σύζευξη\" για να γίνει η σύζευξη των συσκευών. Αν αυτό αποτύχει, προσπαθήστε πάλι χωρίς σύζευξη. Σύζευξη Μη γίνει Σύζευξη - Άνοιγμα στο τηλέφωνο Σίγαση Απάντηση @@ -546,20 +489,17 @@ Exrizu K8 No.1 F1 Teclast H30 -Καιρός + Καιρός Αυτόματη εξαγωγή ρυθμίσεων Η αυτόματη εξαγωγή είναι ενεργοποιημένη Διαδρομή εξαγωγής Κάθε πότε θα γίνεται η εξαγωγή Εξαγωγή κάθε %d ώρες - Η εξαγωγή της βάσης δεδομένων απέτυχε! Παρακαλώ ελέγξτε τις ρυθμίσεις σας. Διαλέξτε διαδρομή εξαγωγής -Ισπανικά - + Ισπανικά Ειδοποιήσεις Gadgetbridge -"XWatch " - + "XWatch " Ανοιχτό Η δραστηριότητα σας καταγράφεται Δεν μετρήθηκε @@ -574,11 +514,9 @@ Δραστηριότητες Ποδηλασία Διάδρομος - Επιλογή όλων Διαμοιρασμός Επαναφορά ημερομηνίας λήψης - μόνο GATT πελάτες Αυτό είναι πειραματικό χαρακτηριστικό και μόνο για το Pebble 2 , δοκιμάστε το μόνο αν έχετε προβλήματα συνδεσιμότητας Alipay (συντόμευση) @@ -591,11 +529,9 @@ Πυξίδα Ρυθμίσεις "Alipay " -"Q8 " + "Q8 " Μαύρη λίστα για όλες τις ειδοποιήσεις Να ειδοποιήσει όλες οι ειδοποιήσεις - - —Πρόκειται να εγκαταστήσετε το λογισμικό %s για το Mi Band 3. \n \nΠαρακαλώ βεβαιωθείτε ότι θα εγκαταστήσετε το αρχείο .fw και μετά το αρχείο .res. Το smartwatch θα επανεκκινήσει μετά την εγκατάσταση του .fw αρχείου. @@ -605,25 +541,19 @@ \nΜΗ ΕΠΑΡΚΩΣ ΔΟΚΙΜΑΣΜΕΝΟ, ΜΠΟΡΕΙ ΝΑ ΧΑΛΑΣΕΙ Η ΣΥΣΚΕΥΗ ΣΑΣ, \nΠΡΟΧΩΡΗΣΤΕ ΜΕ ΔΙΚΗ ΣΑΣ ΕΥΘΥΝΗ! Αυτόματη λήψη δεδομένων δραστηριότητας - "Mi Band 3 " Η λήψη των δεδομένων γίνεται μόνο όταν ξεκλειδώσετε την οθόνη. Δουλεύει μόνο όταν έχετε ορίσει έναν τρόπο κλειδώματος οθόνης! Ελάχιστος χρόνος μεταξύ λήψης δεδομένων Λήψη δεδομένων κάθε %d λεπτά - Ρύθμιση (καλιμπράρισμα) συσκευής - - Ρυθμίσεις ID115 Προσανατολισμός οθόνης - Ρυθμίσεις Mi Band 2 Ρυθμίσεις Mi Band 3 Ρυθμίσεις Amazfit Cors Οριζόντια Κάθετα Όταν το smartwatch δονείται, κουνήστε το ή πατήστε το κουμπί του. - Ξεκλείδωμα οθόνης Mi Band Σύρετε προς τα πάνω για να ξεκλειδώσετε την οθόνη του Mi Band Ρώσικα @@ -633,15 +563,12 @@ Πολωνικά Κορεάτικα Ιαπωνικά - "MyKronoz ZeTime " "ID115 " Watch9 - Ειδοποιήσεις Μουσική Περισσότερα - Λεπτά: Ώρες: Δευτερόλεπτα: @@ -649,7 +576,7 @@ Αρχική ρύθμιση (καλιμπράρισμα) Σύζευξη Watch 9 Αρχική ρύθμιση (καλιμπράρισμα) Watch 9 -Ελάχιστος χρόνος μεταξύ ειδοποιήσεων + Ελάχιστος χρόνος μεταξύ ειδοποιήσεων Χωρίς όριο 5 δευτερόλεπτα 10 δευτερόλεπτα @@ -659,7 +586,6 @@ 5 λεπτά 10 λεπτά 30 λεπτά - "Κοιμηθήκατε %1$s έως %2$s" Δεν κοιμηθήκατε Νορβηγικά (Bokmål) @@ -667,27 +593,21 @@ Αλλαγή συχνότητας FM Λειτουργία \"νύχτας\" Μείωση φωτεινότητας της οθόνης του Mi band 3 κατά τη διάρκεια της νύχτας - ΟΚ - Στη δύση του ηλίου "Roidmi " Roidmi3 - Αποστολή αρχείου καταγραφής Παρακαλώ έχετε υπ\'όψιν σας ότι τα αρχεία καταγραφής του Gedgetbridge ενδέχεται να περιέχουν προσωπικά δεδομένα συμπεριλαμβανομένων δεδομένα υγείας, μοναδικά χαρακτηριστικά (όπως διευθύνσεις MAC), μουσικές επιλογές κλπ. προσπαθήστε να επεξεργαστείτε το αρχείο καταγραφής και να αφαιρέσετε αυτές τις πληροφορίες πριν το στείλετε για την αναφορά προβλήματος. Προσοχή! - Χρώμα LED - Συχνότητα FM Μη έγκυρη συχνότητα Παρακαλώ εισάγετε συχνότητα από 87.5 έως 108.0 -"Από δεξιά προς αριστερά " + "Από δεξιά προς αριστερά " "Ενεργοποιήστε αυτή την επιλογή αν η συσκευή σας δεν έχει υποστήριξη για γλώσσες που γράφονται από δεξιά " Μέγιστο μήκος γραμμής στις γλώσσες που γράφονται από δεξιά Μακραίνει ή κονταίνει τις γραμμές στις γλώσσες που γράφονται από δεξιά - %1$s χαμηλή μπαταρία %1$s χαμηλή μπαταρία: %2$s \n @@ -699,12 +619,10 @@ "Ρυθμίσεις γραφήματος " Μέγιστοι παλμοί Ελάχιστοι παλμοί - Συμφραζόμενα Αραβικά Ενεργοποιήστε αυτή την επιλογή για υποστήριξη συμφραζόμενων Αραβικών Υποστήριξη γλωσσών γραφής από τα δεξιά Χωρίς δεδομένα - Ρυθμίσεις γλώσσας και περιοχής Επαναφορά εργοστασιακών ρυθμίσεων; Κάνοντας επαναφορά εργοστασιακών ρυθμίσεων όλα τα δεδομένα θα διαγραφούν απο την συνδεδεμένη συσκευή (αν υποστηρίζεται). Στις συσκευές Xiaomi/Huami η διεύθυνση MAC θα αλλάξει, έτσι θα εμφανιστούν ως καινούργια συσκευή στην εφαρμογή. @@ -723,4 +641,6 @@ Ρύθμιση λειτουργίας Απογοήτευση ρυθμίσεων Δεν υπάρχει σύνδεση, το ξυπνητήρι δεν ρυθμίστηκε. + Ασκηση + Ειδοποίηση αποσύνδεσης \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a2df0ce86..76946e0ef 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,4 +1,4 @@ - + Gadgetbridge Gadgetbridge @@ -18,7 +18,7 @@ Fermer le tiroir de navigation Presser longuement l\'icône pour déconnecter Déconnexion - Connexion + Connexion… Capturer l\'écran de l\'appareil Déboguer @@ -577,7 +577,7 @@ Temps de sommeil préféré en heures Lorsque votre bracelet vibre, secouez-le ou pressez son bouton. %1$s niveau de batterie bas - %1$s niveau de batterie bas: %2$s + %1$s niveau de batterie base : %2$s Manque de sommeil: %1$s Excès de sommeil: %1$s Sans limite @@ -639,4 +639,23 @@ Temps de sommeil préféré en heures Arabe contextuel A cocher pour activer le support \"Arabe contextuel\" - + Confirmer la réinitialisation usine \? + Procéder à une réinitialisation usine supprimera toutes es données de l\'appareil connecté (si cela est supporté). Les appareils Xiami/Huami changeront aussi leur adresse MAC Bluetooth, ils apparaîtront donc comme de nouveau appareils dans GadgetBridge. + Déverrouillage de l\'écran du Band + Activité physique + Casio GB-6900 + Filtre de notifications + L\'application ne doit pas être en liste noire pour pouvoir être configurée + Saisissez les mot désirés, chacun sur une ligne + Filtre des notifications sauvegardé + Ne pas filtrer + Montrer lorsque contient les mots + Bloquer lorsque contient les mots + Au moins un des mots + Tous les mots + Veuillez entrer au moins un mot + Mode Filtre + Mode Configuration + Sauvegarder la configuration + Non connecté, l\'alarme n\'est pas définie + \ No newline at end of file diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 082d27e77..8e4aa9df0 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -1,377 +1,371 @@ - Gadgetbridge - Gadgetbridge - הגדרות - ניפוי שגיאות - יציאה - סנכרון - מעקב שינה (בבדיקה) - איתור התקן שאבד - צילום המסך - ניתוק - מחיקת התקן - מחיקת %1$s - פעולה זו תמחק את ההתקן ואת כל המידע המשויך אליו! - ניפוי שגיאות - - מנהל יישומונים - יישומונים במטמון - יישומונים מותקנים - מסיכות שעון מותקנות - מחיקה - מחיקה והסרה מהמטמון - התקנה מחדש - חיפוש בחנות היישומונים של Pebble - הפעלה - נטרול - הפעלת מעקב דופק - נטרול מעקב דופק - הפעלת יישומון מזג האוויר של המערכת - השבתת יישומון מזג האוויר של המערכת - התקנת יישומון דיווח מזג האוויר - הגדרה - העברה למעלה - - רשימת התראות חסומות - - - התקנת קושחה/יישומון - הקושחה המועמדת להתקנה היא %s במקום זו המותקנת על ה־Mi Band שלך נכון לעכשיו. - הקושחות המועמדות להתקנה הנן %1$s ו־%2$s במקום אלו המותקנת על ה־Mi Band שלך נכון לעכשיו. - קושחה זו נבדקה וידוע כי היא נתמכת ב־Gadgetbridge. - קושחה זו לא נבדקה ויתכן כי אינה נתמכת ב־Gadgetbridge.\n\nלא מומלץ להתקין אותה על ה־Mi Band שלך! - אם בכל זאת בחרת להמשיך והדברים ממשיכים לעבוד כרגיל, נא לספר למפתחים של Gadgetbridge להוסיף לרשימת ההיתר את גרסת הקושחה %s. - - הגדרות - הגדרות כלליות - התחברות להתקן Gadgetbridge כאשר ה־Bluetooth פועל - התחלה אוטומטית - התחברות אוטומטית מחדש - נגן מדיה מועדף - בררת מחדל - שעה ותאריך - סנכרון השעה - סנכרון השעה בהתקן ה־Gadgetbridge בעת ההתחברות וכאשר השעה או אזור הזמן משתנים בהתקן ה־Android - ערכת עיצוב - בהירה - כהה - שפה - הסתרת ההתראות של Gadgetbridge - הסמל בשורת המצב והדיווח במסך הנעילה מופיעים - הסמל בשורת המצב והדיווח במסך הנעילה מוסתרים - דיווחים - חזרות - שיחות טלפון - מסרונים - הודעות Pebble - תמיכה ביישומונים ששולחים דיווחים ל־Pebble באמצעות PebbleKit. - תמיכה בדיווחים גנריים - …גם כאשר המסך פעיל - לא להפריע - התראות בלתי רצויות נחסמות במצב הזה - תעתיק - תמיד - כאשר המסך כבוי - לעולם לא - פרטיות - מצב פרטיות שיחה - להציג שם ומספר - להסתיר את השם אך להציג את המספר - להסתיר את השם והמספר - רשימת יישומונים שחורה - הודעות מוגדרות - תגובות - סיומת משותפת - התעלמות משיחות - עדכון ב־Pebble - אפשרויות פיתוח - כתובת - הגדרות Pebble - עוקבי פעילות - עוקב פעילות מועדף - סנכרון Pebble Health - סנכרון Misfit - סנכרון Morpheuz - תמיכה בשיחות יוצאות - נטרול אפשרות זו גם תנטרל את הרטט לשיחות יוצאות ב־Pebble 2/LE - לאפשר גישה ליישומוני צד שלישי באנדרואיד - הפעלת תמיכה ניסיונית ביישומוני Android באמצעות PebbleKit - זריחה ושקיעה - שליחת מועדי זריחה ושקיעה בהתבסס על המיקום לציר הזמן של Pebble - הסרה אוטומטית של דיווחים שהתעלמת מהם - דיווחים מוסרים אוטומטית מה־Pebble כשהתעלמת מהם בהתקן האנדרואיד - מצב פרטיות - דיווחים רגילים - החלקת טקסט הדיווח אל מחוץ למסך - הצגת סמל הדיווח בלבד - מיקום - קבלת המיקום - רוחב - אורך - להשאיר את המיקום מעודכן - לנסות לקבל את המיקום הנוכחי בזמן ההפעלה, יש להשתמש במיקום שנשמר רק כגיבוי - נא להפעיל את החיבור לרשת - המיקום התקבל - אילוץ פרוטוקול דיווח - אפשרות זו מאלצת את השימוש בפרוטוקול הדיווח העדכני ביותר בהתאם לגרסת החומרה. שההשלכות תהיינה ברורות לך לחלוטין! - הפעלת תכונות שלא נבדקו - הפעלת תכונות שלא נבדקו. שההשלכות תהיינה ברורות לך לחלוטין! - תמיד להעדיף BLE - שימוש בתמיכה ניסיונית ב־Pebble LE, עבור כל סוגי ה־Pebble במקום ה־Bluetooth הקלסי. נדרש צימוד שאינו LE תחילה ולאחר מכן צימוד מסוג „Pebble LE“ - מגבלת ה־MTU של GATT ל־Pebble 2/LE - אם ה־Pebble 2/Pebble LE שלך אינו עובד כצפוי, יש לנסות אפשרות זאת כדי להגביל את כמות הנתונים המועברת - MTU (טווח תקני 20–512) - הפעלת מעקב רישום אחר יישומון השעון - יגרום לרישומים מיישומי השעון להיות מתועדים ב־Gadgetbridge (נדרשת הפעלה מחדש) - אישור מסירה מוקדם מצד PebbleKit - יגרום להודעות שנשלחות ליישומוני צד שלישי לקבל אישור מסירה תמיד ובאופן מיידי - ניסיונות חיבור מחדש - יחידות - תבנית הזמן - משך מסך פעיל - מדידת דופק במשך כל היום - הגדרות HPlus/Makibes - לא מחובר - בהתחברות - מחובר - מצב לא ידוע - (לא ידוע) - בדיקה - התראה לבדיקה - זוהי התראה לבדיקה מ־Gadgetbridge - אין תמיכה ב־Bluetooth. - ה־Bluetooth מנוטרל. - נקישה על ההתקן המחובר למנהל היישומים - נקישה על ההתקן המחובר לפעילות - נקישה על ההתקן המחובר לרטט - יש לגעת בהתקן כדי להתחבר - לא ניתן להתחבר. כתובת ה־Bluetooth שגויה? - Gadgetbridge פעיל - התקנת הבינרי %1$d/%2$d - ההתקנה נכשלה - ההתקנה הצליחה - זהו ניסיון להתקנת קושחה, ניתן להמשיך אם ברורות לך ההשלכות.\n\n\n קושחה זו מיועדת לחומרה במהדורה: %s - היישומון המועמד להתקנה הוא:\n\n\n%1$s גרסה %2$s מאת %3$s\n - לא זמין - מאותחל - %1$s מאת %2$s - גילוי התקנים - להפסיק את הסריקה - להתחיל בגילוי - חיבור התקן חדש - %1$s‏ (%2$s) - צימוד התקן - יש להשתמש בדו־שיח צימוד ה־Bluetooth לאנדרואיד כדי ליצור צימוד להתקן. - צימוד ה־Mi Band שלך - מתבצע צימוד עם %s… - נוצר איגוד עם %1$s‏ (%2$s) - לא ניתן ליצור צימוד עם %1$s ‏(%2$s) - מתבצע איגוד: %1$s‏ (%2$s) - כבר נוצר איגוד עם %1$s (%2$s), מתבצעת התחברות… - לא הועברה כתובת חומרה, לא ניתן לצמד. - הגדרות ייעודיות להתקן - הגדרות Mi Band / Amazfit - זכר - נקבה - אחר - שמאל - ימין - לא ניתנו נתוני משתמש, נעשה שימוש בנתוני דמה לבינתיים. - כאשר ה־Mi Band שלך רוטט ומהבהב, יש לגעת בו מספר פעמים ברצף. - התקנה - יש להפעיל את האפשרות לאיתור ההתקן שלך. התקנים שכבר מחוברים כעת לא יתגלו. יש להפעיל מיקום (GPS) באנדרואיד 6+. יש לנטרל את שומר הפרטיות עבור Gadgetbridge כיוון שתכונה זו עשויה להקריס ולהפעיל מחדש את הטלפון שלך. אם לא נמצא אף התקן לאחר מספר דקות יש לנסות שוב לאחר הפעלת הטלפון הנייד שלך מחדש. - לתשומת לבך: - תמונת ההתקן - שם/כינוי - ספירת רטט - מעקב שינה - כתיבת קובצי רישום - מתבצע אתחול - נתוני הפעילות מתקבלים - מ־%1$s עד %2$s - על יד ימין או שמאל? - פרופיל רטט - סטקטו - קצר - בינוני - ארוך - טיפת מים - צלצול - שעון מעורר - רטט - בדיקה - התראת מסרון - הגדרות רטט - התראות כלליות - התראה על דוא״ל - התראה על שיחה נכנסת - צ׳אט - ניווט - רשת חברתית - איתור התקן שאבד - יש לבטל כדי לעצור את הרטט. - הפעילות שלך - הגדרת שעון מעורר - הגדרת שעון מעורר - פרטי השעון המעורר - יום א׳ - יום ב׳ - יום ג׳ - יום ד׳ - יום ה - יום ו׳ - שבת - השכמה חכמה - אירעה שגיאה בעת הגדרת ההתראות, נא לנסות שוב. - ההתראות נשלחו להתקן. - אין נתונים. לסנכרן מול ההתקן? - בהכנות להעברת %1$s של נתונים החל מ־%2$s - יעד צעדים יומי - שגיאה בהפעלת ‚%1$s‘ - הפעילות שלך (ניסיוני) - לא ניתן להתחבר: %1$s - לא ניתן למצוא מנגנון להתקנת הקובץ הזה. - לא ניתן להתקין את הקובץ הנתון: %1$s - לא ניתן להתקין את הקושחה הנתונה: היא אינה תואמת את מהדורת החומרה של ה־Pebble שלך. - נא להמתין בעת איתור מצב ההתקנה… - הסוללה של הגאדג׳ט חלשה! - נותר בסוללה של %1$s:‏ %2$s%% - טעינה אחרונה: %s \n - מספר טעינות: %s - השינה שלך - שינה בשבוע - שינה היום, יעד: %1$s - צעדים בשבוע - הפעילות והשינה שלך - הקושחה מתעדכנת… - לא ניתן להתקין את הקובץ, ההתקן לא מוכן. - %3$s %2$s :%1$s - גרסה תואמת - גרסה שלא נבדקה! - חיבור להתקן: %1$s - הקושחה של ה־Pebble‏ %1$s - מהדורת החומרה הנכונה - מהדורת החומרה אינה תואמת! - %1$s‏ (%2$s) - אירעה תקלה עם העברת הקושחה. נא לא להפעיל מחדש את ה־Mi Band שלך! - אירעה תקלה עם העברת נתוני העל של הקושחה - התקנת הקושחה הושלמה - התקנת הקושחה הושלמה, ההתקן מופעל מחדש… - צריבת הקושחה נכשלה - צעדים - פעילות חיה - צעדים היום, יעד: %1$s - לא לשלוח אישור על העברת נתוני פעילות - אם נתוני הפעילות לא יקבלו אישור על ההעברה הם לא יימחקו. שימושי אם נעשה שימוש ביישומונים שונים למעט Gadgetbridge. - תכונה זו תגרום לשמירת נתוני הפעילות על ה־Mi Band גם לאחר הסנכרון. שימושי אם נעשה שימוש ביישומונים שונים למעט Gadgetbridge. - שימוש במצב חיבור מהיר לעדכוני קושחה - הפעלת אפשרות זו עשויה לסייע במקרים שבהם עדכון הקושחה נכשל. - היסטוריית הצעדים - צעדים/דקה נכון לעכשיו - סך כל הצעדים - היסטוריית צעדים בדקה - התחלת הפעילות שלך - פעילות - שינה קלה - שינה עמוקה - לא נענד - לא מחובר. - כל ההתראות מנוטרלות - להשאיר את נתוני הפעילות בהתקן - קושחה בלתי נתמכת - קושחה זו אינה נתמכת בהתקן - התראות לשמירה עבור אירועים עתידיים - ניתן להשתמש בחיישן הדופק כדי לשפר את איתור השינה - הפרש זמן בהתקן בשעות (לזיהוי שינה של עובדי משמרות) - תבנית זמן - זמן - - הפעלת התצוגה עם הנפת היד - עומדת להתרחש העברה מאז %1$s - בהמתנה לחיבור מחדש - עליך - שנת הלידה - מגדר - גובה בס״מ - משקל בק״ג - מתבצע אימות - נדרש אימות - חררר - הוספת וידג׳ט - משך השינה המועדף בשעות - הוגדר שעון מעורר לשעה %1$02d:%2$02d - מהדורת חומרה: %1$s - מהדורת קושחה: %1$s - אירעה שגיאה ביצירת תיקייה לקובצי הרישום: %1$s - "דופק: " - מתבצע עדכון קושחה - לא נשלחה קושחה - דופק - דופק - אחסון נתונים גולמיים במסד הנתונים - הנתונים מאוחסנים כמו שהם, מה שיגרום להגדלת נפח מסד הנתונים לצד אפשרות לפענוח בעתיד. - ניהול מסד נתונים - ניהול מסד נתונים - פעולות מסד הנתונים משתמשות בנתיב הבא בהתקן שלך. + Gadgetbridge + Gadgetbridge + הגדרות + ניפוי שגיאות + יציאה + סנכרון + מעקב שינה (בבדיקה) + איתור התקן שאבד + צילום המסך + ניתוק + מחיקת התקן + מחיקת %1$s + פעולה זו תמחק את ההתקן ואת כל המידע המשויך אליו! + ניפוי שגיאות + + מנהל יישומונים + יישומונים במטמון + יישומונים מותקנים + מסיכות שעון מותקנות + מחיקה + מחיקה והסרה מהמטמון + התקנה מחדש + חיפוש בחנות היישומונים של Pebble + הפעלה + נטרול + הפעלת מעקב דופק + נטרול מעקב דופק + הפעלת יישומון מזג האוויר של המערכת + השבתת יישומון מזג האוויר של המערכת + התקנת יישומון דיווח מזג האוויר + הגדרה + העברה למעלה + + רשימת התראות חסומות + + + התקנת קושחה/יישומון + הקושחה המועמדת להתקנה היא %s במקום זו המותקנת על ה־Mi Band שלך נכון לעכשיו. + הקושחות המועמדות להתקנה הנן %1$s ו־%2$s במקום אלו המותקנת על ה־Mi Band שלך נכון לעכשיו. + קושחה זו נבדקה וידוע כי היא נתמכת ב־Gadgetbridge. + קושחה זו לא נבדקה ויתכן כי אינה נתמכת ב־Gadgetbridge.\n\nלא מומלץ להתקין אותה על ה־Mi Band שלך! + אם בכל זאת בחרת להמשיך והדברים ממשיכים לעבוד כרגיל, נא לספר למפתחים של Gadgetbridge להוסיף לרשימת ההיתר את גרסת הקושחה %s. + + הגדרות + הגדרות כלליות + התחברות להתקן Gadgetbridge כאשר ה־Bluetooth פועל + התחלה אוטומטית + התחברות אוטומטית מחדש + נגן מדיה מועדף + בררת מחדל + שעה ותאריך + סנכרון השעה + סנכרון השעה בהתקן ה־Gadgetbridge בעת ההתחברות וכאשר השעה או אזור הזמן משתנים בהתקן ה־Android + ערכת עיצוב + בהירה + כהה + שפה + הסתרת ההתראות של Gadgetbridge + הסמל בשורת המצב והדיווח במסך הנעילה מופיעים + הסמל בשורת המצב והדיווח במסך הנעילה מוסתרים + דיווחים + חזרות + שיחות טלפון + מסרונים + הודעות Pebble + תמיכה ביישומונים ששולחים דיווחים ל־Pebble באמצעות PebbleKit. + תמיכה בדיווחים גנריים + …גם כאשר המסך פעיל + לא להפריע + התראות בלתי רצויות נחסמות במצב הזה + תעתיק + תמיד + כאשר המסך כבוי + לעולם לא + פרטיות + מצב פרטיות שיחה + להציג שם ומספר + להסתיר את השם אך להציג את המספר + להסתיר את השם והמספר + רשימת יישומונים שחורה + הודעות מוגדרות + תגובות + סיומת משותפת + התעלמות משיחות + עדכון ב־Pebble + אפשרויות פיתוח + כתובת + הגדרות Pebble + עוקבי פעילות + עוקב פעילות מועדף + סנכרון Pebble Health + סנכרון Misfit + סנכרון Morpheuz + תמיכה בשיחות יוצאות + נטרול אפשרות זו גם תנטרל את הרטט לשיחות יוצאות ב־Pebble 2/LE + לאפשר גישה ליישומוני צד שלישי באנדרואיד + הפעלת תמיכה ניסיונית ביישומוני Android באמצעות PebbleKit + זריחה ושקיעה + שליחת מועדי זריחה ושקיעה בהתבסס על המיקום לציר הזמן של Pebble + הסרה אוטומטית של דיווחים שהתעלמת מהם + דיווחים מוסרים אוטומטית מה־Pebble כשהתעלמת מהם בהתקן האנדרואיד + מצב פרטיות + דיווחים רגילים + החלקת טקסט הדיווח אל מחוץ למסך + הצגת סמל הדיווח בלבד + מיקום + קבלת המיקום + רוחב + אורך + להשאיר את המיקום מעודכן + לנסות לקבל את המיקום הנוכחי בזמן ההפעלה, יש להשתמש במיקום שנשמר רק כגיבוי + נא להפעיל את החיבור לרשת + המיקום התקבל + אילוץ פרוטוקול דיווח + אפשרות זו מאלצת את השימוש בפרוטוקול הדיווח העדכני ביותר בהתאם לגרסת החומרה. שההשלכות תהיינה ברורות לך לחלוטין! + הפעלת תכונות שלא נבדקו + הפעלת תכונות שלא נבדקו. שההשלכות תהיינה ברורות לך לחלוטין! + תמיד להעדיף BLE + שימוש בתמיכה ניסיונית ב־Pebble LE, עבור כל סוגי ה־Pebble במקום ה־Bluetooth הקלסי. נדרש צימוד שאינו LE תחילה ולאחר מכן צימוד מסוג „Pebble LE“ + מגבלת ה־MTU של GATT ל־Pebble 2/LE + אם ה־Pebble 2/Pebble LE שלך אינו עובד כצפוי, יש לנסות אפשרות זאת כדי להגביל את כמות הנתונים המועברת - MTU (טווח תקני 20–512) + הפעלת מעקב רישום אחר יישומון השעון + יגרום לרישומים מיישומי השעון להיות מתועדים ב־Gadgetbridge (נדרשת הפעלה מחדש) + אישור מסירה מוקדם מצד PebbleKit + יגרום להודעות שנשלחות ליישומוני צד שלישי לקבל אישור מסירה תמיד ובאופן מיידי + ניסיונות חיבור מחדש + יחידות + תבנית הזמן + משך מסך פעיל + מדידת דופק במשך כל היום + הגדרות HPlus/Makibes + לא מחובר + בהתחברות + מחובר + מצב לא ידוע + (לא ידוע) + בדיקה + התראה לבדיקה + זוהי התראה לבדיקה מ־Gadgetbridge + אין תמיכה ב־Bluetooth. + ה־Bluetooth מנוטרל. + נקישה על ההתקן המחובר למנהל היישומים + נקישה על ההתקן המחובר לפעילות + נקישה על ההתקן המחובר לרטט + יש לגעת בהתקן כדי להתחבר + לא ניתן להתחבר. כתובת ה־Bluetooth שגויה? + Gadgetbridge פעיל + התקנת הבינרי %1$d/%2$d + ההתקנה נכשלה + ההתקנה הצליחה + זהו ניסיון להתקנת קושחה, ניתן להמשיך אם ברורות לך ההשלכות.\n\n\n קושחה זו מיועדת לחומרה במהדורה: %s + היישומון המועמד להתקנה הוא:\n\n\n%1$s גרסה %2$s מאת %3$s\n + לא זמין + מאותחל + %1$s מאת %2$s + גילוי התקנים + להפסיק את הסריקה + להתחיל בגילוי + חיבור התקן חדש + %1$s‏ (%2$s) + צימוד התקן + יש להשתמש בדו־שיח צימוד ה־Bluetooth לאנדרואיד כדי ליצור צימוד להתקן. + צימוד ה־Mi Band שלך + מתבצע צימוד עם %s… + נוצר איגוד עם %1$s‏ (%2$s) + לא ניתן ליצור צימוד עם %1$s ‏(%2$s) + מתבצע איגוד: %1$s‏ (%2$s) + כבר נוצר איגוד עם %1$s (%2$s), מתבצעת התחברות… + לא הועברה כתובת חומרה, לא ניתן לצמד. + הגדרות ייעודיות להתקן + הגדרות Mi Band / Amazfit + זכר + נקבה + אחר + שמאל + ימין + לא ניתנו נתוני משתמש, נעשה שימוש בנתוני דמה לבינתיים. + כאשר ה־Mi Band שלך רוטט ומהבהב, יש לגעת בו מספר פעמים ברצף. + התקנה + יש להפעיל את האפשרות לאיתור ההתקן שלך. התקנים שכבר מחוברים כעת לא יתגלו. יש להפעיל מיקום (GPS) באנדרואיד 6+. יש לנטרל את שומר הפרטיות עבור Gadgetbridge כיוון שתכונה זו עשויה להקריס ולהפעיל מחדש את הטלפון שלך. אם לא נמצא אף התקן לאחר מספר דקות יש לנסות שוב לאחר הפעלת הטלפון הנייד שלך מחדש. + לתשומת לבך: + תמונת ההתקן + שם/כינוי + ספירת רטט + מעקב שינה + כתיבת קובצי רישום + מתבצע אתחול + נתוני הפעילות מתקבלים + מ־%1$s עד %2$s + על יד ימין או שמאל? + פרופיל רטט + סטקטו + קצר + בינוני + ארוך + טיפת מים + צלצול + שעון מעורר + רטט + בדיקה + התראת מסרון + הגדרות רטט + התראות כלליות + התראה על דוא״ל + התראה על שיחה נכנסת + צ׳אט + ניווט + רשת חברתית + איתור התקן שאבד + יש לבטל כדי לעצור את הרטט. + הפעילות שלך + הגדרת שעון מעורר + הגדרת שעון מעורר + פרטי השעון המעורר + יום א׳ + יום ב׳ + יום ג׳ + יום ד׳ + יום ה + יום ו׳ + שבת + השכמה חכמה + אירעה שגיאה בעת הגדרת ההתראות, נא לנסות שוב. + ההתראות נשלחו להתקן. + אין נתונים. לסנכרן מול ההתקן? + בהכנות להעברת %1$s של נתונים החל מ־%2$s + יעד צעדים יומי + שגיאה בהפעלת ‚%1$s‘ + הפעילות שלך (ניסיוני) + לא ניתן להתחבר: %1$s + לא ניתן למצוא מנגנון להתקנת הקובץ הזה. + לא ניתן להתקין את הקובץ הנתון: %1$s + לא ניתן להתקין את הקושחה הנתונה: היא אינה תואמת את מהדורת החומרה של ה־Pebble שלך. + נא להמתין בעת איתור מצב ההתקנה… + הסוללה של הגאדג׳ט חלשה! + נותר בסוללה של %1$s:‏ %2$s%% + טעינה אחרונה: %s \n + מספר טעינות: %s + השינה שלך + שינה בשבוע + שינה היום, יעד: %1$s + צעדים בשבוע + הפעילות והשינה שלך + הקושחה מתעדכנת… + לא ניתן להתקין את הקובץ, ההתקן לא מוכן. + %3$s %2$s :%1$s + גרסה תואמת + גרסה שלא נבדקה! + חיבור להתקן: %1$s + הקושחה של ה־Pebble‏ %1$s + מהדורת החומרה הנכונה + מהדורת החומרה אינה תואמת! + %1$s‏ (%2$s) + אירעה תקלה עם העברת הקושחה. נא לא להפעיל מחדש את ה־Mi Band שלך! + אירעה תקלה עם העברת נתוני העל של הקושחה + התקנת הקושחה הושלמה + התקנת הקושחה הושלמה, ההתקן מופעל מחדש… + צריבת הקושחה נכשלה + צעדים + פעילות חיה + צעדים היום, יעד: %1$s + לא לשלוח אישור על העברת נתוני פעילות + אם נתוני הפעילות לא יקבלו אישור על ההעברה הם לא יימחקו. שימושי אם נעשה שימוש ביישומונים שונים למעט Gadgetbridge. + תכונה זו תגרום לשמירת נתוני הפעילות על ה־Mi Band גם לאחר הסנכרון. שימושי אם נעשה שימוש ביישומונים שונים למעט Gadgetbridge. + שימוש במצב חיבור מהיר לעדכוני קושחה + הפעלת אפשרות זו עשויה לסייע במקרים שבהם עדכון הקושחה נכשל. + היסטוריית הצעדים + צעדים/דקה נכון לעכשיו + סך כל הצעדים + היסטוריית צעדים בדקה + התחלת הפעילות שלך + פעילות + שינה קלה + שינה עמוקה + לא נענד + לא מחובר. + כל ההתראות מנוטרלות + להשאיר את נתוני הפעילות בהתקן + קושחה בלתי נתמכת + קושחה זו אינה נתמכת בהתקן + התראות לשמירה עבור אירועים עתידיים + ניתן להשתמש בחיישן הדופק כדי לשפר את איתור השינה + הפרש זמן בהתקן בשעות (לזיהוי שינה של עובדי משמרות) + תבנית זמן + זמן + + הפעלת התצוגה עם הנפת היד + עומדת להתרחש העברה מאז %1$s + בהמתנה לחיבור מחדש + עליך + שנת הלידה + מגדר + גובה בס״מ + משקל בק״ג + מתבצע אימות + נדרש אימות + חררר + הוספת וידג׳ט + משך השינה המועדף בשעות + הוגדר שעון מעורר לשעה %1$02d:%2$02d + מהדורת חומרה: %1$s + מהדורת קושחה: %1$s + אירעה שגיאה ביצירת תיקייה לקובצי הרישום: %1$s + "דופק: " + מתבצע עדכון קושחה + לא נשלחה קושחה + דופק + דופק + אחסון נתונים גולמיים במסד הנתונים + הנתונים מאוחסנים כמו שהם, מה שיגרום להגדלת נפח מסד הנתונים לצד אפשרות לפענוח בעתיד. + ניהול מסד נתונים + ניהול מסד נתונים + פעולות מסד הנתונים משתמשות בנתיב הבא בהתקן שלך. \nנתיב זה נגיש ליישומונים אחרים של Android ולמחשב שלך. \nאת הנתונים שייצאת ממסד הנתונים (ואת מסדי הנתונים שמיועדים לייבוא) ניתן למצוא שם: - מחיקת מסד נתונים מיושן - לא ניתן לגשת לנתיב הייצוא. נא ליצור קשר עם המפתחים. - ייוצא אל: %1$s - שגיאה בייצוא מסד הנתונים: %1$s - לייבא נתונים? - באמת לשכתב על מסד הנתונים הנוכחי? כל נתונים הפעילות הנוכחיים שלך (אם יש כאלה) ילכו לאיבוד. - הייבוא הצליח. - שגיאה בייבוא מסד הנתונים: %1$s - למחוק את נתוני הפעילות? - באמת למחוק את כל מסד הנתונים? כל נתוני הפעילות והמידע על ההתקנים שלך ילך לאיבוד. - הנתונים נמחקו. - מחיקת מסד הנתונים נכשלה. - למחוק את מסד נתוני הפעילות המיושן? - ללמחוק את מסד נתוני הפעילות המיושן? נתוני פעילות שלא ייובאו ילכו לאיבוד. - נתוני פעילות ישנים נמחקו. - מחיקת מסד נתוני הפעילות הישן נכשל. - שכתוב - ביטול - מחיקה - - רטט - - צימוד Pebble - במסך של התקן האנדרואיד שלך אמורה לקפוץ חלונית צימוד. אם החלונית לא מופיעה, יש לחפש במגירת הדיווחים ולאשר את בקשת הצימוד. לאחר מכן יש לאשר את בקשת הצימוד ב־Pebble שלך. - נא לוודא שערכת עיצוב זו מופעלת ביישומון דיווח מזג האוויר כדי לקבל נתוני מזג אוויר ל־Pebble שלך.\n\nלא נדרשות כאן הגדרות.\n\nניתן להפעיל את יישומון מזג האוויר המערכתי של ה־Pebble שלך ממנהל היישומונים.\n\nמסיכות השעון התומכות יציגו את מזג האוויר אוטומטית. - הפעלת צימוד Bluetooth - יש לנטרל זאת אם עולות תקלות בחיבור - מטרית - אימפריאלית - 24ש׳ - AM/PM - שעון מעורר - (%1$s) - מצאת את זה! - Mi2: תבנית זמן -תרומה + מחיקת מסד נתונים מיושן + לא ניתן לגשת לנתיב הייצוא. נא ליצור קשר עם המפתחים. + ייוצא אל: %1$s + שגיאה בייצוא מסד הנתונים: %1$s + לייבא נתונים? + באמת לשכתב על מסד הנתונים הנוכחי? כל נתונים הפעילות הנוכחיים שלך (אם יש כאלה) ילכו לאיבוד. + הייבוא הצליח. + שגיאה בייבוא מסד הנתונים: %1$s + למחוק את נתוני הפעילות? + באמת למחוק את כל מסד הנתונים? כל נתוני הפעילות והמידע על ההתקנים שלך ילך לאיבוד. + הנתונים נמחקו. + מחיקת מסד הנתונים נכשלה. + למחוק את מסד נתוני הפעילות המיושן? + ללמחוק את מסד נתוני הפעילות המיושן? נתוני פעילות שלא ייובאו ילכו לאיבוד. + נתוני פעילות ישנים נמחקו. + מחיקת מסד נתוני הפעילות הישן נכשל. + שכתוב + ביטול + מחיקה + + רטט + + צימוד Pebble + במסך של התקן האנדרואיד שלך אמורה לקפוץ חלונית צימוד. אם החלונית לא מופיעה, יש לחפש במגירת הדיווחים ולאשר את בקשת הצימוד. לאחר מכן יש לאשר את בקשת הצימוד ב־Pebble שלך. + נא לוודא שערכת עיצוב זו מופעלת ביישומון דיווח מזג האוויר כדי לקבל נתוני מזג אוויר ל־Pebble שלך.\n\nלא נדרשות כאן הגדרות.\n\nניתן להפעיל את יישומון מזג האוויר המערכתי של ה־Pebble שלך ממנהל היישומונים.\n\nמסיכות השעון התומכות יציגו את מזג האוויר אוטומטית. + הפעלת צימוד Bluetooth + יש לנטרל זאת אם עולות תקלות בחיבור + מטרית + אימפריאלית + 24ש׳ + AM/PM + שעון מעורר + (%1$s) + מצאת את זה! + Mi2: תבנית זמן + תרומה פתיחת מגירת הניווט סגירת מגירת הניווט לחיצה ארוכה על הכרטיס כדי לנתק מתבצע ניתוק - מתבצעת התחברות + מתבצעת התחברות… מסך ההתקן מצולם - - יומנים חסומים - הסתרת המספר אך הצגת השם חסימת יומנים - ציר זמן Pebble סנכרון יומן שליחת אירועים מהיומן לציר הזמן - אזורי מהירות סך כל הדקות צעדים לדקה - קלוריות מרחק שעון @@ -398,7 +392,6 @@ \n \nהמשך התהליך הוא על אחריותך! יש להפעיל אפשרות זו אם להתקן אין תמיכה בגופן השפה שלך - קושחה של Amazfit Bip גרסה %1$s שגיאה בייצוא ההעדפה: %1$s שגיאה בייבוא העדפה: %1$s @@ -418,7 +411,7 @@ יש לבחור בצימוד כדי לצמד את ההתקנים שלך. אם התהליך נכשל, יש לנסות שוב ללא צימוד. לצמד לא לצמד -פעולות כפתור + פעולות כפתור ציון פעולות בלחיצה על הכפתור של Mi Band 2 ספירת לחיצות על הכפתור מספר לחיצות על הכפתור כדי להפעיל שידור הודעה @@ -434,13 +427,11 @@ פתיחה בהתקן Android השתקה תגובה -הפעלת JS ברקע + הפעלת JS ברקע המתנה לאחר התאמת פעולת כפתור אחת (המספר נמצא בתוספת של intent בשם button_id) או 0 לתגובה מיידית פעילות תצוגת דפדפן - - התחברות + התחבר … כשאפשרות זו פעילה, יתאפשר למסיכות השעון להציג מזג אוויר, סוללה וכו׳. - פעולה זו תתקין את הקושחה %s במקום הנוכחית שעל ה־Amazfit Cor שלך. \n \nנא לוודא את התקנת קובץ ה־‎.fw, ולאחר מכן את קובץ ה־‎.res. השעון שלך יופעל מחדש לאחר התקנת קובץ ה־‎.fw @@ -450,22 +441,18 @@ \nהמשך מעבר לנקודה זו הוא על אחריותך! קושחה %1$s של Amazfit Cor הפעלת הסטה לימין/שמאל בפעילות התרשימים - הגדרות Amazfit Bip אוטומטי סינית מפושטת סינית מסורתית אנגלית - מדד דופק ליום פעם בדקה כל 5 דקות כל 10 דקות כל חצי שעה פעם בשעה - מיקום מזג אוויר (CM/LOS) - קושחה נתונים שגויים גופן @@ -488,20 +475,17 @@ Exrizu K8 No.1 F1 Teclast H30 -מזג אוויר + מזג אוויר ייצוא אוטומטי ייצוא אוטומטי מופעל מיקום לייצוא הפרשים בין ייצוא לייצוא לייצא בכל %d שעות - ייצוא מסד הנתונים נכשל! נא לבדוק את ההגדרות שלך. נא לבחור את מיקום הייצוא -ספרדית - + ספרדית הודעות של Gadgetbridge -XWatch - + XWatch פעיל מסלולי הפעילות שלך ללא מדידה @@ -516,11 +500,9 @@ פעילויות רכיבת אופניים הליכון - בחירת הכול שיתוף איפוס מועד הקבלה - מצב פעילות מזג אוויר @@ -529,7 +511,7 @@ מצפן הגדרות Alipay -לקוח GATT בלבד + לקוח GATT בלבד מצב זה מיועד ל־Pebble 2 והוא ניסיוני, ניתן לנסות זאת אם נתקלת בבעיות חיבור Alipay (קיצור דרך) מזג אוויר (קיצור דרך) @@ -544,39 +526,26 @@ Mi Band 3 הוספת כולם לרשימה השחורה של ההתראות הוספת כולם לרשימת ההיתר של ההתראות - - אחזור אוטומטי של נתוני פעילות - האחזור מתבצע בעת שחרור נעילת המסך. עובד רק אם הוגדר מנגנון נעילה! - זמן מזערי בין אחזורים מתבצע אחזור כל %d דקות - MyKronoz ZeTime - רוסית - הגדרות ID115 כיוון המסך - אופקי אנכי ID115 - הגדרות Mi Band 2 הגדרות Mi Band 3 הגדרות Amazfit Cors התראות עוד -מוזיקה + מוזיקה כיול התקן - - כשהשעון שלך רוטט, עליך לנער את ההתקן או ללחוץ על הכפתור שלו. - Watch 9 - דקות: שעות: שניות: @@ -584,7 +553,7 @@ כיול צימוד Watch 9 כיול Watch 9 -שחרור נעילת מסך הצמיד + שחרור נעילת מסך הצמיד יש לגרור כלפי מעלה כדי לשחרר את נעילת המסך של הצמיד גרמנית איטלקית @@ -592,7 +561,6 @@ פולנית קוריאנית יפנית - שנתך החלה ב־%1$s ונמשכה עד %2$s לא ישנת נורווגית ספרותית @@ -606,47 +574,39 @@ 5 דקות 10 דקות 30 דקות - מצב לילה הנמכת בהירות המסך אוטומטית בלילה - בשקיעה אישור - שיתוף יומן נא לשים לב שקובצי היומן של Gadgetbridge עשויים להכיל פרטים אישיים רבים, לרבות אך לא רק נתונים רפואיים, מזהים ייחודיים (כגון כתובת החומרה של המכשיר), העדפות מוזיקליות וכו׳. מוטב לערוך את הקובץ ולהסיר את המידע הזה בטרם הגשתו באופן ציבורי כדי לדווח על תקלה. אזהרה! -החלפת צבע נורית + החלפת צבע נורית החלפת תדירות FM Roidmi Roidmi 3 - צבע נורית - תדר FM תדר שגוי נא לבחור בתדר בין 87.5 לבין 108.0 -הסוללה של %1$s חלשה + הסוללה של %1$s חלשה הסוללה של %1$s חלשה: %2$s הגדרות תרשימים דופק מרבי דופק מזערי - מימין לשמאל יש להפעיל אפשרות זו אם ההתקן לא יכול להציג שפות מימין לשמאל גודל שורה מרבי מימין לשמאל קיצור או הארכת השורות שאליהן מופרד טקסט מימין לשמאל - ערבית מחוברת יש להפעיל אפשרות זו כדי לתמוך בערבית מחוברת תמיכה בטקסט מימין לשמאל הגדרות שפה ואיזור -מחסור בשינה: %1$s + מחסור בשינה: %1$s עודף שינה: %1$s מחסור בצעדים: %1$d עודף צעדים: %1$d אין נתונים - דופק נוכחי / מרבי: %1$d ‏/ %2$d לאפס להגדרות יצרן\? איפוס להגדרות יצרן ימחק את כל הנתונים מההתקן המקושר (אם יש תמיכה בזה). מכשירים מבית Xiaomi/Huami גם משנים את כתובת החומרה (MAC), כך שבעיני Gadgetbridge הם נחשבים למכשירים חדשים. @@ -665,4 +625,6 @@ תצורת מצב שמירת תצורה לא מחובר, לא הוגדר שעון מעורר. + אימון + התראת ניתוק \ No newline at end of file diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml new file mode 100644 index 000000000..154224965 --- /dev/null +++ b/app/src/main/res/values-id/strings.xml @@ -0,0 +1,26 @@ + +Gadgetbridge + Gadgetbridge + Pengaturan + Keluar + Donasi + Sinkronisasi + Cari handphone hilang + Ambil gambar layar + Ubah warna LED + Ubah frekuensi FM + Sambungkan + Putuskan + Hapus perangkat + Hapus %1$s + "Tindakan ini akan menghapus semua perangkat dan data " + Buka laci navigasi + Tutup laci navigasi + Tekan lama kartu untuk memutuskan + Sedang memutuskan + Sedang menyambungkan + Sedang mengambil gambar layar + Kalibrasi perangkat + Perbaikan + Kembalikan ke pengaturan pabrik\? + \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ae65a1f33..86efb18d9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,402 +1,402 @@ - Gadgetbridge - Gadgetbridge - Impostazioni - Debug - Esci - Donazioni - Sincronizza - Monitoraggio del sonno (ALPHA) - Trova dispositivo smarrito - Cattura screenshot - Disconnetti - Rimuovi dispositivo - Rimuovi %1$s - Il dispositivo verrà rimosso e tutti i dati ad esso associati verranno cancellati! - Apri menu - Chiudi menu - Pressione prolungata sulla scheda per scollegare - Disconnessione - Connessione - Screenshot del dispositivo - Debug - - Gestione app - App nella cache - App installate - Watchface installate - Cancella - Cancella e rimuovi dalla cache - Re-installazione - Cerca nell\'Appstore di Pebble - Attiva - Disattiva - Attiva il monitor del battito cardiaco - Disattiva il monitor del battito cardiaco - Attiva l\'Applicazione Meteo - Disattiva l\'Applicazione Meteo - Installa l\'applicazione per le notifiche meteo - Configura - Sposta in cima - - Blocco notifiche - - Calendari ignorati - - Installazione FW/App - 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. + Gadgetbridge + Gadgetbridge + Impostazioni + Debug + Esci + Donazioni + Sincronizza + Monitoraggio del sonno (ALPHA) + Trova dispositivo smarrito + Cattura screenshot + Disconnetti + Rimuovi dispositivo + Rimuovi %1$s + Il dispositivo verrà rimosso e tutti i dati ad esso associati verranno cancellati! + Apri menu + Chiudi menu + Pressione prolungata sulla scheda per scollegare + Disconnessione + Connessione … + Screenshot del dispositivo + Debug + + Gestione app + App nella cache + App installate + Watchface installate + Cancella + Cancella e rimuovi dalla cache + Re-installazione + Cerca nell\'Appstore di Pebble + Attiva + Disattiva + Attiva il monitor del battito cardiaco + Disattiva il monitor del battito cardiaco + Attiva l\'Applicazione Meteo + Disattiva l\'Applicazione Meteo + Installa l\'applicazione per le notifiche meteo + Configura + Sposta in cima + + Blocco notifiche + + Calendari ignorati + + Installazione FW/App + 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 è 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 compatibili. - - Impostazioni - Impostazioni - Collegati al dispositivo Gadgetbridge quando il bluetooth viene acceso - Avvio automatico - Riconnessione automatica - Applicazione musicale preferita - Default - Data e ora - Sincronizza l\'ora - Sincronizza l\'orario al collegamento con il dispositivo Gadgetbridge e quando viene cambiato l\'orario o il fuso orario nel dispositivo Android - Tema - Chiaro - Scuro - Lingua - Nascondi l\'icona di Gadgetbridge nell\'area delle notifiche - L\'icona nella barra di stato e la notifica nella schermata di blocco vengono mostrate - L\'icona nella barra di stato e la notifica nella schermata di blocco non vengono mostrate - Notifiche - Ripetute - Chiamate telefoniche - SMS - Messaggi Pebble - Supporto per applicazioni che inviano le notifiche a Pebble usando PebbleKit. - Supporto Notifiche Generiche - …anche se lo schermo è acceso - Non disturbare - Notifiche indesiderate sono bloccate in questa modalità - Traslitterazione - Abilita questa opzione se il tuo dispositivo non supporta tutti i caratteri della tua lingua - Sempre - se lo schermo è spento - Mai - Privacy - Impostazioni privacy chiamate - Mostra nome e numero chiamante - Nascondi il nome ma mostra il numero del chiamante - Nascondi il numero ma mostra il nome - Nascondi nome e numero del chiamante - Blocca applicazioni - Messaggi preimpostati - Risposte - Suffisso applicato alle risposte automatiche - Rifiuto chiamata - Invia al Pebble - Opzioni di sviluppo - Indirizzo Mi Band - Impostazioni Pebble - Tracciatore di attività - Tracciatore delle attività preferito - Sincronizza Pebble Health - Sincronizza Misfit - Sincronizza Morpheuz - Mostra le chiamate in uscita - Disabilitando questa funzionalità impedirá la vibrazione del Pebble 2 quando si effettua una chiamata - Consenti accesso ad altre applicazioni - Attiva il supporto sperimentale ad applicazioni Android con PebbleKit - Alba e tramonto - Mostra gli orari calcolati per l\'alba e il tramonto sulla timeline - Sincronizza calendario - Rimuovi automaticamente le notifiche - Le notifiche vengono rimosse automaticamente dal Pebble dopo averle nascoste sul dispositivo Android - Impostazioni privacy - Notifiche normali - Sposta il testo delle notifiche fuori dallo schermo - Mostra solo l\'icona della notifica - Posizione - Acquisisci posizione - Latitudine - Longitudine - Mantieni aggiornata la posizion - Cerca di ottenere la posizione aggiornata durante l\'utilizzo, usa quella memorizzata come backup - Per cortesia abilita la localizzazione utilizzando la rete - posizione acquisita - Forza protocollo delle notifiche - Questa opzione forza l\'utilizzo della versione più recente del protocollo delle notifiche legato al firmware del tuo dispositivo. ABILITALA SOLO SE SAI COSA STAI FACENDO! - Abilita funzionalità non testate - Abilita funzionalità non testate. SAI QUELLO CHE STAI FACENDO! - Usa sempre BLE - 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 eseguite su Pebble - Il log delle applicazioni che girano su Pebble verrà aggiunto a quello di Gadgetbridge (richiede riconessione) - Invia l\'ACK dei messaggi PebbleKit prematuramente - I messaggi inviati alle applicazioni di terze parti verranno immediatamente confermate - Tentativi di riconessione - - Unità - Formato dell\'orario - Durata dell\'accensione dello schermo - Misura il battito cardiaco continuativamente - Impostazioni HPlus/Makibes - Non connesso - In collegamento - Connesso - Versione firmware: %1$s - (sconosciuto) - Test - Notifica di prova - Notifica di prova creata da Gadgetbridge - Bluetooth non supportato. - Bluetooth disabilitato. - Tocca il dispositivo connesso per gestire le App - Tocca il dispositivo connesso per vedere le tue attività - Tocca il dispositivo connesso per la vibrazione - tocca il dispositivo a cui connettersi - Impossibile connettersi. Indirizzo Bluetooth non valido? - Gadgetbridge in esecuzione - Installazione del binario %1$d/%2$d - Installazione fallita - 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 - inizializzato - %1$s di %2$s - Ricerca dispositivi - Interrompi scansione - Inizia scansione - Connetti un nuovo dispositivo - %1$s (%2$s) - Accoppia dispositivo - Utilizza la funzione del sistema operativo per accoppiare il dispositivo. - Accoppia la Mi Band - Accoppiamento con %s… - Creazione bonding con %1$s (%2$s) - Impossibile completare il pairing con %1$s (%2$s) - Bonding in corso: %1$s (%2$s) - Accoppiamento già effettuato con %1$s (%2$s), connessione in corso… - Indirizzo MAC mancante, impossibile completare l\'accoppiamento. - Impostazioni specifiche dispositivo - Impostazioni Mi Band / Amazfit - Uomo - Donna - Altro - Sinistro - Destro - Dati dell\'utente non inseriti, vengono usati dati d\'esempio. - Quando la Mi Band vibra e lampeggia, dalle qualche leggero colpetto. - Installa - Imposta il tuo dispositivo perchè sia rilevabile. I dispositivi attualmente connessi non saranno probabilmente rilevati. Abilita i servizi di geolocalizzazione su android 6+. Disabilita Privacy Guard per Gadgetbridge, potrebbe causare crash e riavvii. Se non vedi il tuo dispositivo entro un paio di minuti, riprova dopo avere riavviato il dispositivo Android. - Nota: - Immagine dispositivo - Nome / Soprannome - Numero vibrazioni - Monitoraggio del sonno - Salva il log su file - Inizializzazione in corso - Recupero dati attività - Da %1$s a %2$s - Indossato sul braccio sinistro o destro? - Profilo vibrazioni - Staccato - Breve - Medio - Lungo - Goccia - Anello - Sveglia - Vibrazione - Test - Notifiche SMS - Impostazioni vibrazioni - Notifiche generiche - Notifiche Email - Notifiche chiamata in arrivo - Chat - Navigazione - Social Network - Zone di velocità - Minuti totali - Passi al minuto - Trova dispositivo smarrito - Annulla per fermare la vibrazione. - Le tue attività - Configurazione sveglia - Configurazione sveglia - Sveglia - Dom - Lu - Mar - Mer - Gio - Ven - Sab - Sveglia intelligente - Errore nell\'impostazione delle sveglie, riprova di nuovo. - Sveglie inviate al dispositivo. - 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\' - Le tue attività (ALPHA) - Impossibile connettere: %1$s - 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… - Batteria del dispositivo bassa! - %1$s batteria rimanente: %2$s%% - Ultima ricarica: %s \n - Numero di ricariche: %s - Il tuo sonno - Sonno settimanale - Sonno di oggi, obiettivo: %1$s - Passi della settimana - Attività e sonno - Aggiornamento del Firmware… - Il file non può essere installato, il dispositivo non è pronto. - %1$s: %2$s %3$s - Firmware Amazfit Bip %1$s - Versione compatibile - Versione non testata! - Connessione al device: %1$s - Firmware Pebble: %1$s - Versione hardware corretta - Conflitto nella versione hardware! - %1$s (%2$s) - 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… - Aggiornamento del firmware non riuscita - Passi - Calorie - Distanza - Orologio - Pulsazioni - Batteria - Attività in tempo reale - Passi di oggi, traguardo: %1$s - Non confermare il trasferimento dati - Se il trasferimento non viene confermato, i dati rimangono memorizzati sulla Mi Band. Utile se GB è usato insieme ad altre app. - Conserva i dati delle attività sulla Mi Band anche dopo averli sincronizzati. Utile se GB è usato insieme ad altre app. - Utilizza la modalità a bassa latenza per gli aggiornamenti del firmware - Può essere utile quando l\'aggiornamento del firmware fallisce. - Storico dei passi - Passi/minuto - Passi totali - Storico passi/minuto - Inizia la tua attività - Attività - Sonno leggero - Sonno profondo - Non indossata - Non connesso. - Tutte le sveglie disabilitate - Conserva i dati delle attività sul dispositivo - Firmware non compatibile - Questo firmware non è compatibile con il dispositivo - Sveglie da riservare per i prossimi eventi del calendario - Utilizza il sensore del battito cardiaco per migliorare il riconoscimento del sonno - Sfasamento dell\'orario per il device (per consentire il rilevamento del sonno per chi lavora a turni) - Formato Data - Ora - Ora e data - Notifica raggiungimento obbiettivi - La band vibrerà una volta raggiunto l\'obbiettivo passi giornalieri - Elementi mostrati - Scelta elementi da mostrare sullo schermo della band - Attiva il display quando sollevato - Rotazione polso per cambiare vista - Non disturbare - La band non riceverà notifiche quando è attiva - Allarmi inattività - La band vibrerà dopo un determinato periodo di inattività - Limite inattività (in minuti) - Disabilita allarmi inattività per un intervallo di tempo - Ora inizio - Ora fine - Vengono trasferiti dati a partire dal %1$s - in attesa di riconnessione - Informazioni sull\'utilizzatore - Anno di nascita - Genere - Altezza in cm - Peso in kg - In autenticazione - Autenticazione necessaria - Zzz - Aggiungi widget - Ore di sonno preferite - Impostata sveglia per %1$02d:%2$02d - Versione Hardware: %1$s - Versione Firmware: %1$s - Errore durante la creazione della directory per i file di log: %1$s - "HR: " - Aggiornamento firmware in corso - Firmware non inviato - Battito cardiaco - Battito cardiaco - Memorizza i record grezzi nel database - Salva i dati \"as is\", aumentando l\'utilizzo del database in modo da permettere interrogazioni successive. - 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): - Elimina database nel vecchio formato - Impossibile accedere al path esterno. Per cortesia contatta gli sviluppatori del progetto. - Esportato su: %1$s - Errore esportando il DB: %1$s - "Errore nell\'esportazione delle preferenze: %1$s" - Importare i dati? - Vuoi davvero sovrascrivere il database attuale? Tutte le tue attività saranno perse. - Importazione avvenuta con successo. - Errore importando il DB: %1$s - "Errore nell\'importazione della preferenza: %1$s" - Cancella i dati delle attività? - Vuoi davvero cancellare il database? Tutte le informazioni sulle tue attività e sui tuoi dispositivi saranno perse. - Dati cancellati con successo. - 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 delle vechie attività eliminati con successo. - Cancellazione del database nel vecchio formato fallita. - Sovrascrivi - Annulla - Cancella - - Vibrazione - - Pairing del 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 - Metrico - Imperiale - 24H - AM/PM - Sveglia - Trovato! - Mi2: Formato dell\'orario - E\' necessario installare la verione %1$s prima di installare questo firmware! - Notifiche - Richiede firmware versione minima 1.9.1.28 e Mili_pro.ft* installati. - spento - Spento - Automatico (rilevamento del sonno) - Tentativo di connessione a %1$s in corso - La connessione con %1$s è subito fallita. - Tentativo di connessione con: %1$s - Abilitare Bluetooth per l\'individuazione dei dispositivi. - Non connettersi -Connetti + 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 compatibili. + + Impostazioni + Impostazioni + Collegati al dispositivo Gadgetbridge quando il bluetooth viene acceso + Avvio automatico + Riconnessione automatica + Applicazione musicale preferita + Default + Data e ora + Sincronizza l\'ora + Sincronizza l\'orario al collegamento con il dispositivo Gadgetbridge e quando viene cambiato l\'orario o il fuso orario nel dispositivo Android + Tema + Chiaro + Scuro + Lingua + Nascondi l\'icona di Gadgetbridge nell\'area delle notifiche + L\'icona nella barra di stato e la notifica nella schermata di blocco vengono mostrate + L\'icona nella barra di stato e la notifica nella schermata di blocco non vengono mostrate + Notifiche + Ripetute + Chiamate telefoniche + SMS + Messaggi Pebble + Supporto per applicazioni che inviano le notifiche a Pebble usando PebbleKit. + Supporto Notifiche Generiche + …anche se lo schermo è acceso + Non disturbare + Notifiche indesiderate sono bloccate in questa modalità + Traslitterazione + Abilita questa opzione se il tuo dispositivo non supporta tutti i caratteri della tua lingua + Sempre + se lo schermo è spento + Mai + Privacy + Impostazioni privacy chiamate + Mostra nome e numero chiamante + Nascondi il nome ma mostra il numero del chiamante + Nascondi il numero ma mostra il nome + Nascondi nome e numero del chiamante + Blocca applicazioni + Messaggi preimpostati + Risposte + Suffisso applicato alle risposte automatiche + Rifiuto chiamata + Invia al Pebble + Opzioni di sviluppo + Indirizzo Mi Band + Impostazioni Pebble + Tracciatore di attività + Tracciatore delle attività preferito + Sincronizza Pebble Health + Sincronizza Misfit + Sincronizza Morpheuz + Mostra le chiamate in uscita + Disabilitando questa funzionalità impedirá la vibrazione del Pebble 2 quando si effettua una chiamata + Consenti accesso ad altre applicazioni + Attiva il supporto sperimentale ad applicazioni Android con PebbleKit + Alba e tramonto + Mostra gli orari calcolati per l\'alba e il tramonto sulla timeline + Sincronizza calendario + Rimuovi automaticamente le notifiche + Le notifiche vengono rimosse automaticamente dal Pebble dopo averle nascoste sul dispositivo Android + Impostazioni privacy + Notifiche normali + Sposta il testo delle notifiche fuori dallo schermo + Mostra solo l\'icona della notifica + Posizione + Acquisisci posizione + Latitudine + Longitudine + Mantieni aggiornata la posizion + Cerca di ottenere la posizione aggiornata durante l\'utilizzo, usa quella memorizzata come backup + Per cortesia abilita la localizzazione utilizzando la rete + posizione acquisita + Forza protocollo delle notifiche + Questa opzione forza l\'utilizzo della versione più recente del protocollo delle notifiche legato al firmware del tuo dispositivo. ABILITALA SOLO SE SAI COSA STAI FACENDO! + Abilita funzionalità non testate + Abilita funzionalità non testate. SAI QUELLO CHE STAI FACENDO! + Usa sempre BLE + 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 eseguite su Pebble + Il log delle applicazioni che girano su Pebble verrà aggiunto a quello di Gadgetbridge (richiede riconessione) + Invia l\'ACK dei messaggi PebbleKit prematuramente + I messaggi inviati alle applicazioni di terze parti verranno immediatamente confermate + Tentativi di riconessione + + Unità + Formato dell\'orario + Durata dell\'accensione dello schermo + Misura il battito cardiaco continuativamente + Impostazioni HPlus/Makibes + Non connesso + In collegamento + Connesso + Versione firmware: %1$s + (sconosciuto) + Test + Notifica di prova + Notifica di prova creata da Gadgetbridge + Bluetooth non supportato. + Bluetooth disabilitato. + Tocca il dispositivo connesso per gestire le App + Tocca il dispositivo connesso per vedere le tue attività + Tocca il dispositivo connesso per la vibrazione + tocca il dispositivo a cui connettersi + Impossibile connettersi. Indirizzo Bluetooth non valido? + Gadgetbridge in esecuzione + Installazione del binario %1$d/%2$d + Installazione fallita + 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 + inizializzato + %1$s di %2$s + Ricerca dispositivi + Interrompi scansione + Inizia scansione + Connetti un nuovo dispositivo + %1$s (%2$s) + Accoppia dispositivo + Utilizza la funzione del sistema operativo per accoppiare il dispositivo. + Accoppia la Mi Band + Accoppiamento con %s… + Creazione bonding con %1$s (%2$s) + Impossibile completare il pairing con %1$s (%2$s) + Bonding in corso: %1$s (%2$s) + Accoppiamento già effettuato con %1$s (%2$s), connessione in corso… + Indirizzo MAC mancante, impossibile completare l\'accoppiamento. + Impostazioni specifiche dispositivo + Impostazioni Mi Band / Amazfit + Uomo + Donna + Altro + Sinistro + Destro + Dati dell\'utente non inseriti, vengono usati dati d\'esempio. + Quando la Mi Band vibra e lampeggia, dalle qualche leggero colpetto. + Installa + Imposta il tuo dispositivo perchè sia rilevabile. I dispositivi attualmente connessi non saranno probabilmente rilevati. Abilita i servizi di geolocalizzazione su android 6+. Disabilita Privacy Guard per Gadgetbridge, potrebbe causare crash e riavvii. Se non vedi il tuo dispositivo entro un paio di minuti, riprova dopo avere riavviato il dispositivo Android. + Nota: + Immagine dispositivo + Nome / Soprannome + Numero vibrazioni + Monitoraggio del sonno + Salva il log su file + Inizializzazione in corso + Recupero dati attività + Da %1$s a %2$s + Indossato sul braccio sinistro o destro? + Profilo vibrazioni + Staccato + Breve + Medio + Lungo + Goccia + Anello + Sveglia + Vibrazione + Test + Notifiche SMS + Impostazioni vibrazioni + Notifiche generiche + Notifiche Email + Notifiche chiamata in arrivo + Chat + Navigazione + Social Network + Zone di velocità + Minuti totali + Passi al minuto + Trova dispositivo smarrito + Annulla per fermare la vibrazione. + Le tue attività + Configurazione sveglia + Configurazione sveglia + Sveglia + Dom + Lu + Mar + Mer + Gio + Ven + Sab + Sveglia intelligente + Errore nell\'impostazione delle sveglie, riprova di nuovo. + Sveglie inviate al dispositivo. + 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\' + Le tue attività (ALPHA) + Impossibile connettere: %1$s + 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… + Batteria del dispositivo bassa! + %1$s batteria rimanente: %2$s%% + Ultima ricarica: %s \n + Numero di ricariche: %s + Il tuo sonno + Sonno settimanale + Sonno di oggi, obiettivo: %1$s + Passi della settimana + Attività e sonno + Aggiornamento del Firmware… + Il file non può essere installato, il dispositivo non è pronto. + %1$s: %2$s %3$s + Firmware Amazfit Bip %1$s + Versione compatibile + Versione non testata! + Connessione al device: %1$s + Firmware Pebble: %1$s + Versione hardware corretta + Conflitto nella versione hardware! + %1$s (%2$s) + 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… + Aggiornamento del firmware non riuscita + Passi + Calorie + Distanza + Orologio + Pulsazioni + Batteria + Attività in tempo reale + Passi di oggi, traguardo: %1$s + Non confermare il trasferimento dati + Se il trasferimento non viene confermato, i dati rimangono memorizzati sulla Mi Band. Utile se GB è usato insieme ad altre app. + Conserva i dati delle attività sulla Mi Band anche dopo averli sincronizzati. Utile se GB è usato insieme ad altre app. + Utilizza la modalità a bassa latenza per gli aggiornamenti del firmware + Può essere utile quando l\'aggiornamento del firmware fallisce. + Storico dei passi + Passi/minuto + Passi totali + Storico passi/minuto + Inizia la tua attività + Attività + Sonno leggero + Sonno profondo + Non indossata + Non connesso. + Tutte le sveglie disabilitate + Conserva i dati delle attività sul dispositivo + Firmware non compatibile + Questo firmware non è compatibile con il dispositivo + Sveglie da riservare per i prossimi eventi del calendario + Utilizza il sensore del battito cardiaco per migliorare il riconoscimento del sonno + Sfasamento dell\'orario per il device (per consentire il rilevamento del sonno per chi lavora a turni) + Formato Data + Ora + Ora e data + Notifica raggiungimento obbiettivi + La band vibrerà una volta raggiunto l\'obbiettivo passi giornalieri + Elementi mostrati + Scelta elementi da mostrare sullo schermo della band + Attiva il display quando sollevato + Rotazione polso per cambiare vista + Non disturbare + La band non riceverà notifiche quando è attiva + Allarmi inattività + La band vibrerà dopo un determinato periodo di inattività + Limite inattività (in minuti) + Disabilita allarmi inattività per un intervallo di tempo + Ora inizio + Ora fine + Vengono trasferiti dati a partire dal %1$s + in attesa di riconnessione + Informazioni sull\'utilizzatore + Anno di nascita + Genere + Altezza in cm + Peso in kg + In autenticazione + Autenticazione necessaria + Zzz + Aggiungi widget + Ore di sonno preferite + Impostata sveglia per %1$02d:%2$02d + Versione Hardware: %1$s + Versione Firmware: %1$s + Errore durante la creazione della directory per i file di log: %1$s + "HR: " + Aggiornamento firmware in corso + Firmware non inviato + Battito cardiaco + Battito cardiaco + Memorizza i record grezzi nel database + Salva i dati \"as is\", aumentando l\'utilizzo del database in modo da permettere interrogazioni successive. + 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): + Elimina database nel vecchio formato + Impossibile accedere al path esterno. Per cortesia contatta gli sviluppatori del progetto. + Esportato su: %1$s + Errore esportando il DB: %1$s + "Errore nell\'esportazione delle preferenze: %1$s" + Importare i dati? + Vuoi davvero sovrascrivere il database attuale? Tutte le tue attività saranno perse. + Importazione avvenuta con successo. + Errore importando il DB: %1$s + "Errore nell\'importazione della preferenza: %1$s" + Cancella i dati delle attività? + Vuoi davvero cancellare il database? Tutte le informazioni sulle tue attività e sui tuoi dispositivi saranno perse. + Dati cancellati con successo. + 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 delle vechie attività eliminati con successo. + Cancellazione del database nel vecchio formato fallita. + Sovrascrivi + Annulla + Cancella + + Vibrazione + + Pairing del 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 + Metrico + Imperiale + 24H + AM/PM + Sveglia + Trovato! + Mi2: Formato dell\'orario + E\' necessario installare la verione %1$s prima di installare questo firmware! + Notifiche + Richiede firmware versione minima 1.9.1.28 e Mili_pro.ft* installati. + spento + Spento + Automatico (rilevamento del sonno) + Tentativo di connessione a %1$s in corso + La connessione con %1$s è subito fallita. + Tentativo di connessione con: %1$s + Abilitare Bluetooth per l\'individuazione dei dispositivi. + Non connettersi + 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. @@ -412,24 +412,18 @@ \n \nPROCEDI A TUO RISCHIO E PERICOLO! Abilita 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. - Esporta automaticamente le preferenze Esportazione automatica abilitata Esporta posizione Intervallo di esportazione Esporta ogni %d ora/e - Stato sconosciuto Impostazioni Amazfit Bip Misurazione battito continua @@ -438,7 +432,6 @@ 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 @@ -459,9 +452,7 @@ Cinese tradizionale Inglese Spagnolo - Web View Activity - (%1$s) Schedulato (intervallo di tempo) Connesso a %1$s. @@ -471,7 +462,6 @@ Apri nel dispositivo Android Muto Rispondi - Firmware Data non valida Carattere @@ -480,7 +470,6 @@ Errore Connessione GPS Risorse Watchface - Device sconosciuto Testa il Device Pebble @@ -495,16 +484,12 @@ Exrizu K8 No.1 F1 Teclast H30 - Seleziona percorso di esportazione Notifiche Gadgetbridge -XWatch - + XWatch Acceso Blocca le notifiche da tutte le applicazioni Consenti le notifiche da tutte le applicazioni - - Si sta per installare il firmware %s sul Mi Band 3. \n \nSi prega di installare prima il file .fw e successivamente il file .res. Il tuo Miband si riavvierà dopo l\'installazione del file .fw. @@ -516,7 +501,6 @@ Sperimentale, compatibile solo con Pebble 2, attivare solo in caso di problemi di connettività "Recupero automatico dati delle attività" Il recupero avviene quando lo schermo viene sbloccato. Funziona solo se è attivata una modalità di blocco! - Traccia delle tua attività Non misurato Attività @@ -533,7 +517,6 @@ Seleziona tutto Condividi Reset data di recupero - Mi Band 3 Q8 Alipay (Scorciatoia) @@ -546,20 +529,16 @@ Bussola Impostazioni Alipay -Cambio colore LED + Cambio colore LED Cambia frequenza FM Calibra Dispositivo - - Tempo minimo tra le notifiche Da destra a sinistra Abilita questo se il tuo dispositivo non mostra le lingue lette da destra a sinistra Lunghezza massima delle linee Aumenta o diminuisci il numero di righe con cui separare il testo da destra a sinistra - "Impostazioni per ID115 " Orientamento dello schermo - Tempo minimo tra le sincronizzazioni Impostazioni per Mi Band 2 Impostazioni per Mi Band 3 @@ -567,10 +546,8 @@ Orizzontale Verticale Quando il tuo orologio vibra, scuotilo o premi il tasto. - %1$s batteria scarica Sincronizza ogni %d minuti - Nessun limite 5 secondi 10 secondi @@ -580,7 +557,6 @@ 5 minuti 10 minuti 30 minuti - Hai dormito dalle %1$s alle %2$s Non hai dormito Swipe up per sbloccare lo schermo della band @@ -593,17 +569,13 @@ Polacco Coreano Giapponese - Frequenza cardiaca massima Frequenza cardiaca minima - OK - Al tramonto MyKronoz ZeTime ID115 Roidmi 3 - Notifiche Musica Minuti: @@ -617,30 +589,26 @@ %1$s batteria scarica: %2$s Debito di sonno: %1$s Riduci automaticamente la luminosità dello schermo della band di notte - Impostazioni grafici Watch 9 Roidmi Altro - Arabo Contestuale Attenzione! Nessun dato - Colore LED - Frequenze FM Frequenza non valida Per favore introdurre una frequenza compresa tra 87.5 e 108.0 Impostazioni lingua e regione -Attuale / Massima frequenza cardiaca: %1$d / %2$d + Attuale / Massima frequenza cardiaca: %1$d / %2$d Sblocca lo schermo della band Imposta l\'orario che il tuo dispositivo ti sta mostrando adesso. Abilita questo per supportare la lingua Araba Tieni presente che i file di log di Gadgetbridge possono contenere molte informazioni personali, inclusi, a titolo esemplificativo, dati sulla salute, identificatori univoci (come l\'indirizzo MAC del dispositivo), preferenze musicali, ecc. Modifica il file per rimuovere queste informazioni prima di inviare il file in una segnalazione di errore visibile pubblicamente. Sonno extra: %1$s - Mancanza di passi: %1$d - Passo extra: %1$d + Passi mancanti: %1$d + Passi eccedenti: %1$d Proseguire davvero con il reset totale\? Effettuando un reset totale si perderanno tutti i dati relativi ai dispositivi connessi (se supportati). I dispositivi Xiaomi/Huami potrebbero cambiare il proprio indirizzo MAC Bluetooth e Gadgetbridge potrebbe riconoscerli come dispositivi completamente nuovi. Casio GB-6900 @@ -658,4 +626,5 @@ Modalità Configurazione Salva Configurazione Non connesso, sveglia non impostata. + Esercizio \ No newline at end of file diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 0452422e5..e375a98bf 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -1,5 +1,6 @@ -Innstillinger + + Innstillinger Feilretting Avslutt Doner @@ -15,12 +16,9 @@ Lukk navigasjonsskuf Trykk lenge på kortet for å koble fra Kobler fra - Kobler til + Kobler til… Utfører skjermavbildning av enheten - - Feilretting - Programbehandler Programmer i hurtiglager Installerte programmer @@ -38,15 +36,11 @@ Installer værmeldingsprogrammet Sett opp Flytt til toppen - Merknadssvarteliste - Svartelistede kalendere - Fastvare-/program-installerer Du er i ferd med å installere %s-fastvaren i stedet for den som er installert på ditt Mi Band nå. Gadgetbru - Gadgetbru Dette vil slette enheten og all tilknyttet data! Du er i ferd med å installere %s-fastvaren på din Amazfit Bip. @@ -69,9 +63,7 @@ \n \nDu FRARÅDES fra å skrive den til ditt Mi Band! Hvis du fremdeles ønsker å fortsette og ting fungerer etterpå, fortell Gadgetbru-utviklerne at de skal hvitliste %s-fastvareversjonen. - Innstillinger - Hovedinnstillinger Koble til Gadgetbridge-enhet når Blåtann slås på Start automatisk @@ -81,17 +73,13 @@ Dato og tid Synkroniser tid Synkroniser tid til Gadgetbridge-enhet ved tilkobling, og når tid eller tidssone endres på Android-enheten - Drakt Lys Mørk - Språk - Skjul Gadgetbro-merknaden Ikonet i statusfeltet og merknaden på låseskjermen vises Ikonet i statusfeltet og merknaden på låseskjermen er skjult - Merknader Gjentakelser Telefonsamtaler @@ -104,66 +92,50 @@ Modus der uønskede merkander stoppes Translitterasjon Skru på hvis din enhet ikke har noen støtte for ditt språks skrift - Alltid Når skjermen er av Aldri - Personvern Ringepersonvernsmodus Vis navn og nummer Skjul navn, men vis nummer Skjul nummer, men vis navn Skjul navn og nummer - - Svartelist programmer Svartelist kalendre - Svar Oppdater på Pebble - Utviklervalg Mi Band-adresse - Pebble-innstillinger - Aktivitetssporere Foretrukket aktivitetssporer Synkroniser Pebble-helse Misfit-synkronisering Morpheuz-synkronisering - Støtte for utgående anrop Å skru av dette vil også forhindre Pebble 2/LE fra å vibrere under utgående anrop - Tillat tredjepartstilgang fra Android-programmer Skru på eksperimentell støte for Androidprogrammer som bruker PebbleKit - Pebble-tidslinje Soloppgang og solnedgang Send soloppgang og solnedgangstider basert på plasseringen til Pebble-tidslinjen Synkroniser kalender Send kalenderhendelser til tidslinjen - Fjern forkastede merknader automatisk Merknader blir automatisk fjernet fra Pebble-enheten når de forkastes fra Android-enheten - Personvernsmodus Normale merknader Vis merknadsteksten utenfor skjermen Kun vis merknadsikoner - Plassering Hent plassering Breddegrad Lengdegrad Hold plasseringen oppdatert Prøv å hent gjeldende plassering ved kjøring, bruk lagret plassering som andrevalg - Skru på nettverksplassering plassering innhentet - Tving gjennom merknadsprotokoll Dette valget tvinger bruk av siste merknadskotroll avhengig av fastvareversjon. TA REDE PÅ HVA DU DRIVER PÅ MED! Skru på utestede funksjoner @@ -174,14 +146,11 @@ Hvis din Pebble 2/Pebble LE ikke fungerer som forventet, prøv å sette denne grensen for å begrense MTU (gyldig rekkevidde 20-512) Skru på bakgrunns-JS Tillater når påskrudd, værvarsel på urskive, batteriinfo, osv. - Forsøk på tilkoblingsgjenopprettelse - Enheter Tidsformat Heldagspulsmåling HPlus/Makibes-innstillinger - Ikke tilkoblet Kobler til Tilkoblet @@ -212,7 +181,6 @@ igangsatt %1$s av %2$s Enhetsoppdaging - Stopp skanning Start oppdagning Koble til ny enhet @@ -242,7 +210,6 @@ Enhetsavbildning Navn/alias Vibrasjonsantall - Søvnmonitor Skriv loggfiler Igangsetter @@ -250,7 +217,6 @@ Fra %1$s til %2$s Venstre- eller høyre-hånd? Vibrasjonsprofil - Stakkato Kort Middels @@ -259,7 +225,6 @@ Ring Alarmklokke Vibrasjon - Prøv SMS-merknad Vibrasjonsinnstillinger @@ -269,18 +234,15 @@ Sludre Navigasjon Sosialt nettverk - Heldagspulsmåling én gang i minuttet hvert femte minutt hvert tiende minutt hver halvtime én gang i timen - Fartssoner Totalt antall minutter Steg per minutt - Finn tapt enhet Avbryt for å stoppe vibrasjon. Din aktivitet @@ -347,7 +309,6 @@ Beholder aktivitetsdata på Mi Band-et, selv etter synkronisering. Nyttig hvis Gb brukes sammen med andre programmer. Bruk lav-latens-modus for fastvareoppgraderinger Dette kan hjelpe på enheter der fastvareoppgraderinger mislykkes. - Steghistorikk Gjeldende steg/min Totalt antall steg @@ -364,7 +325,7 @@ Fastvaren er ikke kompatibel med enheten Alarmer å holde av for kommende hendelser Bruk pulsmåler for å forbedre bestemmelse av søvnmønster - Datoformat + Datoformat Tid Tid og dato Knappevalg @@ -385,25 +346,19 @@ Skru av inaktivitetsadvarsler for en tidsperiode Starttid Sluttid - Automatisk Forenklet kinesisk Tradisjonell kinesisk Engelsk - I ferd med å overføre data siden %1$s - Venter på ny tilkobling - Om deg Fødselsår Kjønn Høyde i cm Vekt i kg - Autentiserer Autentisering kreves - Zzz Legg til miniprogram Foretrukket søvn i timer @@ -416,7 +371,6 @@ Fastvare ikke sendt Puls Puls - Lagre rådata i databasen Hvis valgt blir dataen lagret \"som den er\", noe som øker databasebruk for senere fortolkning. Databasebehandling @@ -440,23 +394,16 @@ Overskriv Avbryt Slett - Vibrasjon - Pebble-parring En parringslogg vil sprette opp på din Android-enhet. Hvis ikke, se i navigasjonsskuffen, og godta parringsforespørselen. Godta den også på din Pebble etterpå. - Skru på Blåtannsparring Skru dette av hvis du har problemer med å koble til - Metrisk Imperial - 24t AM/PM - Ringeklokke - (%1$s) Du fant den! Mi2: Tidsformat @@ -476,27 +423,23 @@ Velg \"Parr\" for å parre enhetene dine. Hvis dette mislykkes, prøv igjen uten å parre. Parr Ikke parr - Åpne på Android-enhet Forstum Svar -Vær + Vær Fastvare Ugyldig data Skrift GPS-fastvare Ressurser Urskive - Ukjent enhet Test enhet Pebble Mi Band Mi Band 2 Skru på - Vær-plassering (CM/LOS) - Forhåndsutfylte meldinger Vanlig endelse Legg på røret @@ -529,7 +472,6 @@ \n \nStøttede urskiver vil vise vær automatisk. Web View-aktivitet - GPS-almanakk GPS-korrigering Amazfit Bip @@ -541,19 +483,16 @@ Exrizu K8 No.1 F1 Teclast H30 -Automatisk eksport + Automatisk eksport Automatisk eksport mislyktes Eksporteringsplassering Eksporteringsintervall Eksporter hver %d time - Eksport av database mislyktes. Sjekk innstillingene dine. Velg eksportplassering -Spansk - + Spansk Gadgetbridge-merknader -XWatch - + XWatch På Dine aktivitetsspor Ikke målt @@ -571,7 +510,6 @@ Velg alle Del Tilbakestill innhentingsdato - Status Aktivitet Vær @@ -580,7 +518,7 @@ Kompass Innstillinger Alipay -Kun GATT-klient + Kun GATT-klient Dette er kun for Pebble 2 og eksperimentelt, prøv dette hvis du har tilkoblingsproblemer Alipay (snarvei) Vær (snarvei) @@ -595,29 +533,20 @@ Q8 Svartelist merknader fra alle disse Hvitlist merknader fra alle disse - - Hent aktivitetsdata automatisk - Henting skjer ved skjermopplåsing, og fungerer kun hvis en låsemekanisme er valgt! - Minimumstid mellom innhentinger Henter hvert %d minutt - Kalibrer enhet - - Minimumstid mellom merknad ID115-innstillinger Skjermretning - Mi Band 2-innstillinger Mi Band 3-innstillinger Amazfit Cor-inntillingers Vannrett Loddrett Når din klokke vibrerer, rist enheten eller på dens knapp. - Ingen grense 5 sekunder 10 sekunder @@ -627,14 +556,12 @@ 5 minutter 10 minutter 30 minutter - Du sov fra %1$s til %2$s Du sov ikke Band-skjermopplåsing Dra oppover for å låse opp band-ens skjerm Nattmodus Senk band-lysstyrke automatisk om natten - Norsk bokmål Russisk Tysk @@ -643,16 +570,13 @@ Polsk Koreansk Japansk - Ved solnedgang MyKronoz ZeTime ID115 Watch 9 - Merknader Musikk Mer - Minutter: Timer: Sekunder: @@ -660,26 +584,22 @@ Kalibrer Watch 9-parring Watch 9-kalibrering -OK - + OK Del logg Ha i minnet at Gadgetbridge-loggfiler kan inneholde mye personlig info, inkludert, og ikke begrenset til helsedata, unike identifikatorer (som enhetens MAC-adresse), musikkpreferanser, osv. Overvei å redigere filen for fjerning av denne info-en før du sender filen til som offentlig feilrapport. Advarsel! -Endre LED-farge + Endre LED-farge Endre FM-frekvens Roidmi Roidmi 3 - LED-farge - FM-frekvens Ugyldig frekvens Skriv inn en frekvens mellom 87.5 og 108.0 -Høyre-til-venstre + Høyre-til-venstre Skru på dette hvis din enhet ikke kan vise høyre til venstre-språk Maksimal linjelengde for høyre-til-venstre Strekker eller korter ned linjene høyre-til-venstre -tekst inndeles i - %1$s batteri snart tomt %1$s batteri snart tomt: %2$s Søvnmangel: %1$s @@ -690,12 +610,10 @@ Diagraminnstillinger Makspuls Minimumspuls - Kontekstuell arabisk Skru på dette for kontekstuell arabisk støtte Høyre-til-venstre -støtte Ingen data - Språk og stedsinnstillinger Vil du virkelig gjenopprette fabrikkinnstillinger\? Gjenoppretting til fabrikkinnstillinger vil slette all data fra den tilkoblede enheten (hvis støttet). Xiaomi/Huami-enheter endrer også MAC-adressen for Blåtann, og vil dermed framtre som nye enheter i Gadgetbridge. @@ -714,4 +632,6 @@ Modusoppsett Lagre oppsett Ikke tilkoblet, alarm ikke satt. + Trening + Frakoblingsmerknad \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 673722f35..686df43e0 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,319 +1,307 @@ - + - Gadgetbridge - Gadgetbridge - Ustawienia - Debuguj - Zakończ - Synchronizuj - Monitor snu (ALPHA) - Znajdź zgubione urządzenie - Zrób zrzut ekranu - Rozłącz - Usuń urządzenie - Usuń %1$s - Ta operacja usunie urządzenie oraz wszystkie zgromadzone dane! - Debuguj - - Zarządzanie aplikacjami - Aplikacje w pamięci - Zainstalowane aplikacje - Zainstalowane tarcze - Usuń - Odinstaluj i usuń z pamięci - Zainstaluj ponownie - Szukaj w Pebble appstore - Aktywuj - Deaktywuj - Aktywuj HRM - Deaktywuj HRM - Konfiguruj - Przejdź do góry - - Czarna lista powiadomień - - Instalator oprogramowania i aplikacji - Zamierzasz zainstalować firmware %s zamiast aktualnie zainstalowanego na Twoim Mi Band. - Ten firmware został przetestowany i jest kompatybilny z Gadgetbridge. - Ten firmware nie został przetestowany i może być nie kompatybilny z Gadgetbridge. + Gadgetbridge + Gadgetbridge + Ustawienia + Debuguj + Zakończ + Synchronizuj + Monitor snu (ALPHA) + Znajdź zgubione urządzenie + Zrób zrzut ekranu + Rozłącz + Usuń urządzenie + Usuń %1$s + Ta operacja usunie urządzenie oraz wszystkie zgromadzone dane! + Debuguj + + Zarządzanie aplikacjami + Aplikacje w pamięci + Zainstalowane aplikacje + Zainstalowane tarcze + Usuń + Odinstaluj i usuń z pamięci + Zainstaluj ponownie + Szukaj w Pebble appstore + Aktywuj + Deaktywuj + Aktywuj HRM + Deaktywuj HRM + Konfiguruj + Przenieś na górę + + Czarna lista powiadomień + + Instalator FW/App + Zamierzasz zainstalować firmware %s zamiast aktualnie zainstalowanego na Twoim Mi Band. + Te oprogramowanie zostało przetestowane i jest zgodne z Gadgetbridge. + Te oprogramowanie nie zostało przetestowane i może być niezgodne z Gadgetbridge. \n -\nNIE ZALECAMY wgrywania go na twój Mi Band! - Jeśli nadal chcesz kontynuować i po instalacji wszystko będzie działać prawidłowo, proszę powiadom programistów Gadgetbridge aby dodali wersję %s firmware do białej listy. - - Ustawienia - Ustawienia ogólne - Połącz z urządzeniem gdy Bluetooth jest zostanie włączony - Automatycznie ponawiaj połączenie - Preferowany odtwarzacz muzyki - Domyślny - Data i godzina - Synchronizuj czas - Synchronizuj czas urządzenia podczas połączenia gdy czas lub strefa czasowa zmienia się na urządzeniu Android - Motyw - Jasny - Ciemny - Język - Powiadomienia - Powtórzenia - Rozmowy telefoniczne - SMS - Wiadomości Pebble - Ogólna obsługa powiadomień - ...także gdy ekran jest włączony - Nie przeszkadzać - Zawsze - Gdy ekran jest wyłączony - Nigdy - Czarna lista aplikacji - Wiadomości zwrotne - Odpowiedzi - Uaktualnij na Pebble - Ustawienia programisty - Adres Mi Band - Ustawienia Pebble - Monitorowanie aktywności - Preferowany monitor aktywności - Synchronizuj Pebble Health - Synchronizuj Misfit - Synchronizuj Morpheuz - Zezwól zewnętrznym aplikacjom Android na dostęp - Włącz eksperymentalną obsługę aplikacji Android za pomocą PebbleKit - Wschód i zachód słońca - Wyślij na oś czasu Pebble czas wschodu i zachodu słońca bazując na lokalizacji - Lokalizacja - Uzyskaj lokalizację - Szerokość - Długość - Utrzymuj aktualną lokalizację - Włącz usługę lokalizacji sieciowej - Lokalizacja ustalona - Wymuś protokół powiadomień - Ta opcja wymusza użycie najnowszego protokołu powiadomień w zależności od wersji firmware. MUSISZ WIEDZIEĆ CO ROBISZ! - Włącz nietestowane funkcje - Włącz nie testowane funkcje. MUSISZ WIEDZIEĆ CO ROBISZ! - Zawsze preferuj BLE - Limit MTU Pebble 2/LE GATT - Jeśli Twój Pebble 2/ Pebble LE nie działa jak należy spróbuj ustawić ten limit MTU (zakres 20-512) - Włącz logi aplikacji zegarka/opaski - Próby ponownego połączenia - Nie połączony - Łączenie - Połączony - Nieznany stan - (nieznane) - Testuj - Test powiadomień - To jest testowe powiadomienie z Gadgetbridge - Bluetooth nie jest obsługiwany. - Bluetooth jest wyłączony. - Kliknij połączone urządzenie, aby uruchomić menadżer aplikacji - Dotknij urządzenie aby połączyć - Nie można połączyć. Nieprawidłowy adres Bluetooth\? - Gadgetbridge działa - Instalowanie binarki %1$d/%2$d - Instalacja nie powiodła się - Zainstalowano - PRÓBUJESZ ZAINSTALOWAĆ FIRMWARE, POSTĘPUJESZ NA WŁASNĄ ODPOWIEDZIALNOŚĆ . +\nWgranie go na Twój Mi Band jest NIEZALECANE! + Jeśli nadal chcesz kontynuować i po instalacji wszystko będzie działać prawidłowo, proszę powiadom programistów Gadgetbridge aby dodali wersję %s firmware do białej listy. + + Ustawienia + Ustawienia ogólne + Połącz z urządzeniem gdy Bluetooth jest zostanie włączony + Automatycznie ponawiaj połączenie + Preferowany odtwarzacz muzyki + Domyślny + Data i godzina + Synchronizuj czas + Synchronizuj czas urządzenia podczas połączenia gdy czas lub strefa czasowa zmienia się na urządzeniu Android + Motyw + Jasny + Ciemny + Język + Powiadomienia + Powtórzenia + Rozmowy telefoniczne + SMS + Wiadomości Pebble + Ogólna obsługa powiadomień + ...także gdy ekran jest włączony + Nie przeszkadzać + Zawsze + Gdy ekran jest wyłączony + Nigdy + Czarna lista aplikacji + Wiadomości zwrotne + Odpowiedzi + Uaktualnij na Pebble + Ustawienia programisty + Adres Mi Band + Ustawienia Pebble + Monitorowanie aktywności + Preferowany monitor aktywności + Synchronizuj Pebble Health + Synchronizuj Misfit + Synchronizuj Morpheuz + Zezwól zewnętrznym aplikacjom Android na dostęp + Włącz eksperymentalną obsługę aplikacji Android za pomocą PebbleKit + Wschód i zachód słońca + Wyślij na oś czasu Pebble czas wschodu i zachodu słońca bazując na lokalizacji + Lokalizacja + Uzyskaj lokalizację + Szerokość + Długość + Utrzymuj aktualną lokalizację + Włącz usługę lokalizacji sieciowej + Lokalizacja ustalona + Wymuś protokół powiadomień + Ta opcja wymusza użycie najnowszego protokołu powiadomień w zależności od wersji firmware. MUSISZ WIEDZIEĆ CO ROBISZ! + Włącz nietestowane funkcje + Włącz nie testowane funkcje. MUSISZ WIEDZIEĆ CO ROBISZ! + Zawsze preferuj BLE + Limit MTU Pebble 2/LE GATT + Jeśli Twój Pebble 2/ Pebble LE nie działa jak należy spróbuj ustawić ten limit MTU (zakres 20-512) + Włącz logi aplikacji zegarka/opaski + Próby ponownego połączenia + Nie połączony + Łączenie + Połączony + Nieznany stan + (nieznane) + Testuj + Test powiadomień + To jest testowe powiadomienie z Gadgetbridge + Bluetooth nie jest obsługiwany. + Bluetooth jest wyłączony. + Kliknij połączone urządzenie, aby uruchomić menadżer aplikacji + Dotknij urządzenie aby połączyć + Nie można połączyć. Nieprawidłowy adres Bluetooth\? + Gadgetbridge działa + Instalowanie binarki %1$d/%2$d + Instalacja nie powiodła się + Zainstalowano + PRÓBUJESZ ZAINSTALOWAĆ FIRMWARE, POSTĘPUJESZ NA WŁASNĄ ODPOWIEDZIALNOŚĆ . \n \n \n Ten firmware jest przeznaczony dla wersji HW: %s - Zamierzasz zainstalować poniższą aplikacje :\n\n\n%1$s wersja %2$s przez %3$s\n - Nie dostępne - rozpoczęty - %1$s przez %2$s - Wyszukiwanie urządzeń - Przerwij wyszukiwanie - Rozpocznij wyszukiwanie - Połącz nowe urządzenie - %1$s (%2$s) - Sparuj urządzenie - Użyj parowania Bluetooth na Androidzie by sparować urządzenie. - Sparuj Mi Band - Parowanie z %s… - Żaden MAC nie przeszedł, nie można sparować. - Ustawienia danego urządzenia - Ustawienia Mi Band i Amazfit - Mężczyzna - Kobieta - Inne - Lewej - Prawej - Nie podano prawidłowych danych użytkownika, zostaną użyte dane zastępcze. - Gdy twój Mi Band wibruje i błyska, dotknij jego ekran lub przycisk kilka razy pod rząd. - Instaluj - Uwaga: - Obraz urządzenia - Imię/Pseudonim - Liczba wibracji - Monitor snu - Inicjalizacja - Pobieranie danych o aktywności - Od %1$s do %2$s - Na której ręce noszone jest urządzenie\? - Profil wibracji - Słabe - Krótkie - Średnie - Długie - Kropla wody - Dzwoń - Budzik - Wibracja - Powiadomienie SMS - Ustawienia wibracji - Ogólne powiadomienia - Powiadomienia E-mail - Powiadomienia o połączeniach przychodzących - Nawigacja - Sieć społecznościowa - Odnajdź zgubione urządzenie - Anuluj by przerwać wibracje. - Twoja aktywność - Konfiguruj alarmy - Konfiguruj alarmy - Szczegóły alarmu - Nd - Pon - Wt - Śr - Czw - Pt - Sob - Inteligentna pobudka - Błąd podczas ustawiania alarmu, proszę spróbuj ponownie. - Alarmy zapisane w urządzeniu. - Brak danych. Synchronizować urządzenie? - Zamierzam przesłać %1$s danych, rozpoczynając od %2$s - Dzienny cel kroków - Błąd przetwarzania \'%1$s\' - Twoja aktywność (ALPHA) - Nie można połączyć: %1$s - Nie można znaleźć procedury by zainstalować ten plik. - Nie można zainstalować podanego pliku : %1$s - Instalacja tego firmware nie jest możliwa, ponieważ nie pasuje do wersji hardware twojego Pebble. - Proszę czekać na określanie statusu instalacji… - Bateria prawie rozładowana! - %1$s pozostało baterii: %2$s%% - Ostatnie ładowanie: %s + Zamierzasz zainstalować poniższą aplikacje :\n\n\n%1$s wersja %2$s przez %3$s\n + Nie dostępne + rozpoczęty + %1$s przez %2$s + Wyszukiwanie urządzeń + Przerwij wyszukiwanie + Rozpocznij wyszukiwanie + Połącz nowe urządzenie + %1$s (%2$s) + Sparuj urządzenie + Użyj parowania Bluetooth na Androidzie by sparować urządzenie. + Sparuj Mi Band + Parowanie z %s… + Żaden MAC nie przeszedł, nie można sparować. + Ustawienia danego urządzenia + Ustawienia Mi Band i Amazfit + Mężczyzna + Kobieta + Inne + Lewej + Prawej + Nie podano prawidłowych danych użytkownika, zostaną użyte dane zastępcze. + Gdy twój Mi Band wibruje i błyska, dotknij jego ekran lub przycisk kilka razy pod rząd. + Instaluj + Uwaga: + Obraz urządzenia + Imię/Pseudonim + Liczba wibracji + Monitor snu + Inicjalizacja + Pobieranie danych o aktywności + Od %1$s do %2$s + Na której ręce noszone jest urządzenie\? + Profil wibracji + Słabe + Krótkie + Średnie + Długie + Kropla wody + Dzwoń + Budzik + Wibracja + Powiadomienie SMS + Ustawienia wibracji + Ogólne powiadomienia + Powiadomienia E-mail + Powiadomienia o połączeniach przychodzących + Nawigacja + Sieć społecznościowa + Odnajdź zgubione urządzenie + Anuluj by przerwać wibracje. + Twoja aktywność + Konfiguruj alarmy + Konfiguruj alarmy + Szczegóły alarmu + Nd + Pon + Wt + Śr + Czw + Pt + Sob + Inteligentna pobudka + Błąd podczas ustawiania alarmu, proszę spróbuj ponownie. + Alarmy zapisane w urządzeniu. + Brak danych. Synchronizować urządzenie? + Zamierzam przesłać %1$s danych, rozpoczynając od %2$s + Dzienny cel kroków + Błąd przetwarzania \'%1$s\' + Twoja aktywność (ALPHA) + Nie można połączyć: %1$s + Nie można znaleźć procedury by zainstalować ten plik. + Nie można zainstalować podanego pliku : %1$s + Instalacja tego firmware nie jest możliwa, ponieważ nie pasuje do wersji hardware twojego Pebble. + Proszę czekać na określanie statusu instalacji… + Bateria prawie rozładowana! + %1$s pozostało baterii: %2$s%% + Ostatnie ładowanie: %s \n - Liczba ładowań: %s - Sen - Kroki (tyg.) - Twoja aktywność i sen - Aktualizacja firmware\'u… - Plik nie może być zainstalowany, urządzenie nie gotowe. - %1$s: %2$s %3$s - Zgodna wersja - Nietestowana wersja! - Połączenie z urządzeniem: %1$s - Firmware Pebble %1$s - Prawidłowa wersja hardware - Niezgodność wersji hardware! - %1$s (%2$s) - Problem podczas przesyłania firmware. NIE RESTARTUJ swojego Mi Band! - Problem z transferem metadanych firmware\'u - Instalacja firmware\'u zakończona - Instalacja firmware\'u zakończona, restartowanie urządzenia… - Instalacja firmware\'u nie powiodła się - Kroki - Ostatnia aktywność - Kroków dziś, cel: %1$s - Nie wysyłaj danych aktywności - Gdy dane aktywności nie są przesłane na opaskę, wtedy nie będą usuwane. Przydatne gdy Gadgetbridge jest używany wraz z innymi aplikacjami. - Dane aktywności będą zachowane na Mi Band nawet po synchronizacji. Przydatne gdy Gadgetbridge jest używany z innymi aplikacjami. - To może pomóc na urządzeniach gdzie uaktualnienie kończy się błędem - Historia kroków - Aktualnie kroków/min - Kroków łącznie - Historia kroków na minutę - Rozpocznij aktywność - Aktywność - Płytki sen - Głęboki sen - Niezałożona - Nie połączono. - Wszystkie alarmy wyłączono - Zachowaj dane aktywności na urządzeniu - Niekompatybilny firmware - Ten firmware nie jest kompatybilny z tym urządzeniem - Alarmy zarezerwowane dla nadchodzących zdarzeń - Użyj czujnika tętna alby poprawić detekcje snu - Mi2: Format daty - Czas - oczekiwanie na ponowne połaczenie - O tobie - Data urodzenia - Płeć - Wzrost w cm - Waga w kg - Dodaj widget - Preferowana długość snu w godzinach - Hardware: %1$s - Firmware: %1$s - Trwa aktualizacja firmware - Puls - Puls - Zarządzanie bazą danych - Zarządzanie bazą danych - Wyeksportowano do: %1$s - Błąd eksportu bazy: %1$s - Zaimportować? - Naprawdę chcesz napisać bazę? Wszystkie Twoje dane zostaną zastąpione. - Błąd importu bazy: %1$s - Nadpisz - Anuluj - Usuń - - Wibracje - -Wspomóż + Liczba ładowań: %s + Sen + Kroki (tyg.) + Twoja aktywność i sen + Aktualizacja oprogramowania… + Plik nie może być zainstalowany, urządzenie nie gotowe. + %1$s: %2$s %3$s + Zgodna wersja + Nietestowana wersja! + Połączenie z urządzeniem: %1$s + Firmware Pebble %1$s + Prawidłowa wersja hardware + Niezgodność wersji hardware! + %1$s (%2$s) + Problem podczas przesyłania firmware. NIE RESTARTUJ swojego Mi Band! + Problem z transferem metadanych firmware\'u + Instalacja firmware\'u zakończona + Instalacja firmware\'u zakończona, restartowanie urządzenia… + Instalacja oprogramowania nie powiodła się + Kroki + Ostatnia aktywność + Kroków dziś, cel: %1$s + Nie przesyłaj informacji o aktywności + Gdy dane aktywności nie są przesłane na opaskę, wtedy nie będą usuwane. Przydatne gdy Gadgetbridge jest używany wraz z innymi aplikacjami. + Dane aktywności będą zachowane na Mi Band nawet po synchronizacji. Przydatne gdy Gadgetbridge jest używany z innymi aplikacjami. + Może pomóc na urządzeniach gdzie aktualizacja kończy się błędem. + Historia kroków + Aktualnie kroków/min + Kroków łącznie + Historia kroków na minutę + Rozpocznij aktywność + Aktywność + Płytki sen + Głęboki sen + Niezałożona + Nie połączono. + Wszystkie alarmy wyłączono + Zachowaj dane aktywności na urządzeniu + Niekompatybilny firmware + Ten firmware nie jest kompatybilny z tym urządzeniem + Alarmy zarezerwowane dla nadchodzących zdarzeń + Użyj czujnika tętna alby poprawić detekcje snu + Mi2: Format daty + Czas + Oczekiwanie na ponowne połączenie + O Tobie + Rok urodzenia + Płeć + Wzrost w cm + Waga w kg + Dodaj widget + Preferowana długość snu w godzinach + Wersja sprzętu: %1$s + Wersja oprogramowania: %1$s + Aktualizowanie oprogramowania + Puls + Puls + Zarządzanie bazą danych + Zarządzanie bazą danych + Wyeksportowano do: %1$s + Błąd eksportu bazy: %1$s + Zaimportować? + Naprawdę chcesz napisać bazę? Wszystkie Twoje dane zostaną zastąpione. + Błąd importu bazy: %1$s + Nadpisz + Anuluj + Usuń + + Wibracje + + Wspomóż Przytrzymaj aby rozłączyć Rozłączanie - Łączenie + Łączenie… Wykonaj zrzut ekranu urządzenia - - Aktywuj Systemową Aplikację Pogody Dezaktywuj Systemową Aplikację Pogody Zainstaluj aplikację Powiadomienia o pogodzie Czarna lista kalendarzy - Uruchom automatycznie Ukryj powiadomienia z Gadgetbridge "Ikona na pasku stanu i powiadomienia pokazują się na zablokowanym ekranie " Ikona na pasku stanu i powiadomienia jest ukryta na zablokowanym ekranie - Niechciane powiadomienia są wyłączone w tym trybie Transliteracja Włącz tę opcję, jeśli twoje urządzenie nie obsługuje czcionki twojego języka - Prywatność Wyświetl nazwę i numer Ukryj nazwę, ale wyświetl numer Ukryj numer, ale wyświetl nazwę Ukryj nazwę i numer - - Czarna lista kalendarzy - Wspólny sufiks Wspieraj rozmowy wychodzące Oś czasu Pebble Synchronizuj kalendarz Wyślij zdarzenie z kalendarza do osi czasu - Automatycznie usuń odrzucone powiadomienia Tryb prywatny Normalne powiadomienia Pokaż samą ikonę powiadomień - Włącz JS w tle Jeśli włączone, pozwala zegarkowi na wyświetlanie informacji o pogodzie, baterii itp. - Jednostki Format czasu Ustawienia HPlus/Makibes - Kliknij połączone urządzenie aby wyświetlić jego aktywność Kliknij połączone urządzenie, aby zawibrowało Tworzenie powiązania z %1$s (%2$s) @@ -325,7 +313,6 @@ Czat Strefy prędkości Kroków na minutę - Firmware Amazfit Bip %1s Kalorie Dystans @@ -334,7 +321,7 @@ Bateria Data i czas Akcje przycisku - Ustaw akcję na przyciśniecie przycisku na Mi Band 2 + Wybierz akcję po przyciśnięciu przycisku na Mi Band 2 Licznik wciśnięć przycisku Ilość przyciśnięć w celu uruchomienia rozsyłania wiadomości Uruchom przycisk akcji @@ -342,7 +329,7 @@ Maksymalny opóźnienie pomiędzy wciśnięciami Maksymalny opóźnienie pomiędzy wciśnięciami w milisekundach Opóźnienie po wciśnięciu przycisku akcji - Opaska zawibruje gdy zostanie osiągnięty dzienny cel korków + Opaska zawibruje po osiągnięciu dziennego celu kroków Nie przeszkadzać Obsługa aplikacji wysyłających powiadomienia do Pebble za pośrednictwem PebbleKit. Pogoda @@ -350,7 +337,6 @@ Całodobowy pomiar tętna Automatyczny eksport Eksportowanie co %d godzin - Ustawienia Amazfit Bip Całodobowy pomiar tętna raz na minutę @@ -358,7 +344,6 @@ raz na 10 minut raz na 30 minut raz na godzinę - Sen płytki Sen głęboki Bieganie @@ -368,12 +353,8 @@ Otwórz okno nawigacji Zamknij okno nawigacji Kalibracja urządzenia - - Zablokuj wszystkie powiadomienia Zezwól na wszystkie powiadomienia - - Zamierzasz zainstalować firmware %s na Twoim Amazfit Bip. \n \nPamiętaj, aby instalować pliki w kolejności: .fw, potem .res i na końcu .gps. Twój zegarek zresetuje się po instalacji pliku .fw. @@ -396,26 +377,20 @@ \n \nROBISZ TO NA WŁASNE RYZYKO! Zamierzasz zainstalować oprogramowanie %1$s oraz %2$s, na miejsce obecnie zainstalowanego na Twoim Mi Band. - Włącz gesty przesuwania lewo/prawo na wykresach aktywności - + Włącz gest przesuwania w lewo/prawo na wykresach aktywności Minimalny czas pomiędzy powiadomieniami Tryb prywatności połączeń telefonicznych Lokalizacja pogody (CM/LOS) - Wyłączenie tej opcji spowoduje również, że Pebble 2/LE przestanie wibrować przy połączeniach wychodzących - Powiadomienia są automatycznie usuwane z Pebble po usunięciu ich z urządzenia Android - Przesuń tekst powiadomienia poza ekran - Spróbuj uzyskać obecną lokalizację podczas biegu, używaj zapisanej lokalizacji jako rezerwowej - + Spróbuj pobrać obecną lokalizację po uruchomieniu, awaryjnie użyj zapisanej lokalizacji Zmień kolor diody LED Zmień częstotliwość FM Od prawej do lewej Włącz tę opcję, jeśli Twoje urządzenie nie może wyświetlać języków z pisownią od prawej do lewej Maks. długość linii od prawej do lewej - Wydłuża lub skraca linie separatora tekstu pisanego od prawej do lewej - + Wydłuża lub skraca długość tekstu pisanego od prawej do lewej Użyj eksperymentalnego wsparcia Pebble LE (Low Energy), zamiast Bluetooth Classic, dla wszystkich typów Pebble. Wymaga sparowania poprzez BT Classic, a następnie LE Tylko klient GATT Ta eksperymentalna opcja przeznaczona jest wyłącznie dla Pebble 2. Wypróbuj ją jeżeli masz problemy z połączeniem @@ -425,14 +400,12 @@ Czas włączenia ekranu Ustawienia ID115 Orientacja ekranu - Auto eksport włączony Ścieżka eksportu Automatycznie pobieraj dane o aktywności - Pobranie danych nastąpi przy odblokowaniu urządzenia. Działa tylko jeśli blokowanie jest włączone! + Pobranie danych nastąpi po odblokowaniu ekranu. Działa tylko jeśli blokada jest włączona! Minimalny odstęp czasu pomiędzy pobraniami Pobieranie co %d minut(y) - Ustawienia Mi Band 2 Ustawienia Mi Band 3 Ustawienia Amazfit Cors @@ -440,7 +413,6 @@ Pionowo Upewnij się, że urządzenie (opaska/smartwatch) jest wykrywalne. Aktualnie połączone urządzenia prawdopodobnie nie będą wykrywalne. Na Androidzie 6+ włącz dostęp do lokalizacji (GPS). Wyłącz Privacy Guard dla Gadgetbridge, ponieważ mogą ze sobą kolidować. Jeżeli urządzenie nie zostanie wykryte w przeciągu paru minut, spróbuj ponownie po ponownym uruchomieniu telefonu. Jeśli Twój zegarek (opaska) wibruje, potrząśnij nim lub wciśnij na nim przycisk. - Całkowicie minut %1$s rozładowana bateria %1$s rozładowana bateria: %2$s @@ -457,7 +429,6 @@ 5 minut 10 minut 30 minut - Pozostało kroków: %1$d Użyj trybu o niskiej latencji przy aktualizacji firmware "Aktualny / Maks. puls: %1$d / %2$d" @@ -476,7 +447,6 @@ Wyłącz ostrzeżenie o nieaktywności dla zadanego przedziału czasu Tryb nocny Automatycznie zmniejsz jasność wyświetlacza w nocy - Automatycznie Chiński (uproszczony) Chiński (tradycyjny) @@ -489,15 +459,12 @@ Polski Koreański Japoński - Ustawienia wykresów Puls maksymalny Puls minimalny - Uwierzytelnianie Wymagane uwierzytelnienie - - + Zzz Firmware nie zostało wysłane Przechowuj \"surowe\" rekordy w bazie danych Zapisuje dane bez przetwarzania, zwiększając użycie bazy danych i umożliwiając ich późniejszą interpretację. @@ -513,10 +480,8 @@ Usuwanie starej bazy danych aktywności nie powiodło się. Parowanie Pebble Komunikat o parowaniu pojawi się na Twoim urządzeniu z Androidem. W przeciwnym wypadku sprawdź powiadomienia i zaakceptuj żądanie parowania. Następnie zaakceptuj parowanie również na Twoim Pebble. - Włącz parowanie Bluetooth Wyłącz to jeżeli masz problemy z połączeniem - Metryczne Znalezione! Zanim wgrasz to firmware, musisz wgrać wersję %1$s! @@ -534,11 +499,9 @@ Sparować z %1$s\? Paruj Nie paruj - Otwórz na urządzeniu z Androidem Wycisz Odpowiedz - Nie zmierzono Aktywność Urządzenie nie noszone @@ -555,15 +518,12 @@ Korekcja błędów GPS Zasoby Tarcza zegarka - Nieznane urządzenie Wybierz ścieżkę do eksportu Powiadomienia Gadgetbridge - Alipay (Skrót) Pogoda (Skrót) Więcej - Minuty: Godziny: Sekundy: @@ -571,14 +531,30 @@ Prosimy pamiętać, że logi Gadgetbridge mogą zawierać wiele informacji osobistych, w tym dane dotyczące zdrowia, unikalne identyfikatory (takie jak adresy MAC urządzeń), preferencje muzyczne itd. Rozważ edycję logów i usunięcie takich informacji zanim wyślesz je przy zgłaszaniu problemu. Ostrzeżenie! Brak danych - Kolor LED - Częstotliwość FM Niewłaściwa częstotliwość Podaj częstotliwość z zakresu od 87.5 do 108.0 Mhz Ustawienia językowe i regionalne -Częstość eksportowania + Częstość eksportowania imperialne - - + Czy na pewno zresetować\? + Po zresetowaniu wszelkie dane na urządzeniu zostaną usunięte (jeśli jest to wspierane). Urządzenia Xiaomi/Huami zmieniają także adres MAC Bluetooth, w ten sposób pojawiają się jako nowe urządzenia w Gadgetbridge. + Zaspałem: %1$s + Przekroczenie: %1$d + Nie spałeś + Wiadomość do wysłania + Wysyłanie wiadomości na określonej liczbie naciśnięć przycisków + Opóźnienie po wciśnięciu przycisku (liczba jest w button_id) lub 0 dla bez opóźnienia + Opaska nie będzie otrzymywać powiadomień gdy jest aktywne + Początek + Koniec + Odblokowanie ekranu opaską + Przesuń w górę aby odblokować ekran opaski + Norwegian Bokmål + Przeniesienie danych z okresu %1$s + Ustawienie alarmu na %1$02d:%2$02d + Błąd tworzenia folderu na pliki log: %1$s + "Puls: " + Pokazuj gdy zawiera słowa + \ No newline at end of file diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f6ca6cc9a..c66a8ec8e 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,361 +1,358 @@ - Gadgetbridge - Gadgetbridge - Configurações - Depurar - Sair - Sincronizar - Monitor de sono (ALPHA) - Buscar dispositivo desconectado - Print da tela - Desconectar - Apagar dispositivo - Apagar %1$s - Isto irá apagar o dispositivo e todos os dados associados! - Depurar - - Gerenciador de App - Apps em cache - Apps instalados - Mostradores instalados - Apagar - Apagar e remover do cache - Reinstalar - Buscar na loja Pebble - Ativar - Desativar - Ativar HRM - Desativar HRM - Ativar app de clima do sistema - Desativar app de clima do sistema - Instalar notificações do app de clima - Configurar - Mover para o topo - - Lista Negra de Notificações - - - Instalador FW/App - Você está prestes a instalar o firmware %s no lugar do atual em sua Mi Band. - Você está prestes a instalar os firmwares %1$s e %2$s no lugar dos que estão atualmente na sua Mi Band. - O firmware foi testado e é compatível com Gadgetbridge. - Este firmware não foi testado e pode não ser compatível com o Gadgetbridge. + Gadgetbridge + Gadgetbridge + Configurações + Depurar + Sair + Sincronizar + Monitor de sono (ALPHA) + Buscar dispositivo desconectado + Print da tela + Desconectar + Apagar dispositivo + Apagar %1$s + Isto irá apagar o dispositivo e todos os dados associados! + Depurar + + Gerenciador de App + Apps em cache + Apps instalados + Mostradores instalados + Apagar + Apagar e remover do cache + Reinstalar + Buscar na loja Pebble + Ativar + Desativar + Ativar HRM + Desativar HRM + Ativar app de clima do sistema + Desativar app de clima do sistema + Instalar notificações do app de clima + Configurar + Mover para o topo + + Lista Negra de Notificações + + + Instalador FW/App + Você está prestes a instalar o firmware %s no lugar do atual em sua Mi Band. + Você está prestes a instalar os firmwares %1$s e %2$s no lugar dos que estão atualmente na sua Mi Band. + O firmware foi testado e é compatível com Gadgetbridge. + Este firmware não foi testado e pode não ser compatível com o Gadgetbridge. \n \nNÃO recomendamos que instale em sua Mi Band! - Se você ainda desejar continuar e tudo funcionar corretamente, por favor, diga aos desenvolvedores do Gadgetbridge para incluírem essa versão de firmware na lista: %s - - Configurações - Configurações Gerais - Conecta o dispositivo quando o Bluetooth estiver ligado - Iniciar automaticamente - Reconectar automaticamente - Player de música preferencial - Padrão - Data e Hora - Sincronizar hora - Sincronizar horário quando o dispositivo estiver conectando ou quando o fuso horário mudar no Android - Tema - Claro - Escuro - Idioma - Ocultar notificações do Gadgetbridge - Exibir ícone na barra de status e nas notificações na tela inicial - Ocultar ícone na barra de status e nas notificações na tela inicial - Notificações - Repetições - Chamadas de telefone - SMS - Mensagens do Pebble - Suportar notificações de aplicações que enviam notificações pelo PebbleKit. - Suporte a notificações genéricas - ...quando a tela estiver ligada - Não perturbe - Parar com notificações indesejadas enquanto estiver no modo Não Perturbe. - Representação - Ativar isso se o dispositivo não tiver suporte para seu idioma - sempre - quando a tela estiver desligada - Nunca - Privacidade - Modo de chamada privada - Exibir nome e número - Ocultar nome e exibir número - Ocultar nome e número - Apps em Blacklist - Histórico de mensagens - Respostas - Sufixo comum - Chamadas recusadas - Atualizar no Pebble - Opções do desenvolvedor - Endereço do Mi Band - Configurações Pebble - Ativar monitores - Monitor de atividades preferido - Sincronizar com Pebble Health - Sincronizar com Misfit - Sincronizar com Morpheuz - Suporta originar chamadas - Desabilitar isso também irá impedir o Pebble 2/LE vibrar ao originar chamadas - Permitir acesso a App Android de terceiros - Habilitar suporte experimental ao App Android que use PebbleKit - Despertar e pôr do sol - Enviar despertar e pôr do sol baseado na localização do Pebble - Auto remover notificações rejeitadas - Notificações são automaticamente removidas quando rejeitadas no Android - Modo de privacidade - Notificações - Deslocar texto de notificações que extrapolar a tela - Apenas mostrar ícone de notificações - Localização - Obter localização - Latitude - Longitude - Mantenha a localização atualizada - Tente obter a localização online, use dados armazenados como fallback - Por favor, habilite localização de rede - localização obtida - Forçar o protocolo de notificação - Esta opção força o uso do protocolo de notificação mais recente. HABILITE APENAS SE SABE O QUE ESTÁ FAZENDO! - Habilitar recursos não certificados - Habilitar recursos não certificados. FAÇA ISSO SE SOUBER O QUE REALMENTE ESTÁ FAZENDO! - Sempre preferir BLE - Use suporte experimental do Pebble LE em vez do Bluetooth clássico, requer parear um \"Pebble LE\" depois de que nenhum LE tenha sido conectado - Pebble 2/LE GATT MTU limite - Se seu Pebble 2/Pebble LE não funciona como esperado, tente esta configuração para limitar o MTU (faixa válida 20–512) - Ativas registro de Log do App do Relógio - Faz com que os logs de aplicativos de monitoramento sejam registrados por Gadgetbridge (exige reconectar) - Prematuramente ACK PebbleKit - Isso fará com que as mensagens enviadas para aplicativos de terceiros sejam reconhecidas sempre e imediatamente - Tentativas de Reconexão - Unidades - Formato da hora - Duração de tela - Medição da frequência cardíaca durante todo o dia - Configurações do HPlus/Makibes - desconectado - conectando - conectado - estado desconhecido - (desconhecido) - Teste - Teste de notificação - Esta é uma Notificação de Teste de Gadgetbridge - Bluetooth não suportado. - Bluetooth desabilitado. - Toque no dispositivo conectado - Toque no dispositivo conectado - Toque no dispositivo conectado para Vibração - Toque num dispositivo para ligar - Não pode conectar. Endereço BT inválido? - Gadgetbridge em execução - Instalação binária %1$d/%2$d - falha na instalação! - instalação bem sucedida - VOCÊ ESTÁ TENTANDO INSTALAR UM FIRMWARE, A SEU PRÓPRIO RISCO. \n\n\nEste firmware é para HW Revisão: %s - Você está prestes a instalar o seguinte aplicativo: \n\n\n %1$s Versão %2$s por %3$s\n - N/A - inicializado - %1$s de %2$s - Dispositivo encontrado - Parar com a busca - Iniciar busca - Conecte novo dispositivo - %1$s (%2$s) - Parear dispositivo - Use a caixa de diálogo Android Bluetooth para emparelhar o dispositivo. - Parear sua Mi Band - 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… - Nenhum endereço do mac passou, não pode emparelhar. - Configurações Específicas do Dispositivo - Configurações da Mi Band - masculino - feminino - outro - esquerda - direita - Nenhum dado válido informado, usando dados fictícios por enquanto. - Quando a sua Mi Band vibra e pisca, toque nele algumas vezes seguidas. - Instalar - Nota: - Imagem do Dispositivo - Nome/Apelido - Quantidade de vibrações - Monitor de sono - Escrever arquivos de Log - Inicializando - Adquirindo Dados de Atividades - De %1$s a %2$s - Dispositivo na esquerda ou direita? - Prefil de Vibração - Destacado - Pequeno - Médio - Longo - Pingo D\'água - Anel - Alarme - Vibração - Tente - Notificações SMS - Configurações de vibrações - Notificação genérica - Notificação de email - Notificações de chamadas - Bate papo - Navegação - Rede social - Busca Dispositivo Perdido - Cancele para parar a vibração. - Sua atividade - Configurar Alarmes - Configurar alarmes - Detalhes do alarme - Dom - Seg - Ter - Qua - Qui - Sex - Sab - despertar inteligente - Tem algum erro ao definir o alarme, tente novamente! - Alarme enviado para o dispositivo! - Sem data. Sincronizar com dispositivo? - Transferir %1$s dados a partir de %2$s - Objetivo de passos por dia - Erro executando \'%1$s\' - Sua Atividade (ALPHA) - Impossível conectar: %1$s - 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… - Gadget com bateria baixa! - %1$s bateria a: %2$s%% - Última carga: %s \n - Número de cargas: %s - Seu Sono - Passos na semana - Sua Atividade e Sono - Atualizando Firmware... - Arquivo não pode ser instalado, o dispositivo não está pronto. - %1$s: %2$s %3$s - Versão compatível - Versão não testada! - Conexão com o dispositivo: %1$s - Pebble Firmware %1$s - Corrigir a revisão do hardware - Incompatibilidade de revisão de hardware! - %1$s (%2$s) - 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… - Falha ao instalar o Firmware - Passos - Atividade ao vivo - Etapas de hoje, meta: %1$s - Não transferir dados da atividade ack - Se os dados da atividade não forem chamados para a pulseira, eles não serão apagados. Útil se GB for usado em conjunto com outros aplicativos. - Manterão os dados da atividade no Mi Band mesmo após a sincronização. Útil se GB for usado em conjunto com outros aplicativos. - Use o modo de baixa latência para atualizações FW - Isso pode ajudar em dispositivos nos quais as atualizações de firmware falham - Histórico de passos - Passos/min atuais - Total de passos - Histórico de passos por minuto - Iniciar sua atividade - Atividade - Sono leve - Sono pesado - Não utilizado - Desconectado. - Todos os alarmes desabilitados - Manter dados de atividade no dispositivo - Firmware incompatível - Este firmware não é compatível com seu dispositivo - Alarmes reservados para eventos próximos - Use o sensor de freqüência cardíaca para melhorar a detecção do sono - Desvio do tempo do dispositivo em horas (para detectar o sono dos trabalhadores por turnos) - Mi2: Formato de data - Hora - - Ativar exibição ao levantar - Sobre para transferir dados desde %1$s - aguarde para reconectar - Sobre você - Ano de anoversário - Gênero - Altura em cm - Peso em kg - autenticando - autenticação requerida - Zzz - Adicionar widget - Preferir duração de sono em horas - Um alarme foi definido para %1$02d:%2$02d - HW: %1$s - FW: %1$s - Erro ao criar o diretório para arquivos de log: %1$s - "FC: " - Atualização de Firmware em progresso - Firmware não enviado - Frequência cardíaca - Frequência cardíaca - Armazenar registro bruto no banco de dados - Se marcado, os dados são armazenados \"como\" e estão disponíveis para interpretação posterior. NB: a base de dados será maior neste caso! - Gerenciamento de banco de dados - Gerenciamento de banco de dados - As operações do banco de dados usam o seguinte caminho no dispositivo.\nEste caminho está acessível a outras aplicações Android e ao seu computador.\nApós encontrar o banco de dados exportado (ou colocar o banco de dados que você deseja importar): - Não é possível acessar o caminho de exportação. Entre em contato com os desenvolvedores. - Exportado para: %1$s - Erro ao exportar BD: %1$s - Importar dados? - Realmente sobrescrever o banco de dados atual? Todos os seus dados atuais de atividade (se houver) serão perdidos. - Sucesso ao importar. - Erro ao importar BD: %1$s - Excluir Dados de Atividade? - Excluir realmente o banco de dados inteiro? Todos os seus dados de atividade e informações sobre seus dispositivos serão perdidos. - Dados eliminados com êxito. - Falha na eliminação do banco de dados. - Excluir antigo banco de dados de atividades? - Excluir realmente o banco de dados de atividade antigo? Os dados da atividade que não foram importados serão perdidos. - Dados de atividade antiga excluídos com êxito. - Falha na eliminação da base de dados da Actividade Antiga. - Sobrepor - Cancelar - Apagar - - Vibração - - Pareando Pebble - Espera-se que um diálogo de emparelhamento apareça no seu dispositivo Android. Se isso não acontecer, procure na gaveta de notificação e aceite o pedido de emparelhamento. Depois que aceitar o pedido de emparelhamento em seu Pebble - Certifique-se de que esta capa está ativada no aplicativo Notificação de Tempo para obter informações sobre o tempo em seu Pebble.\n\nNão é necessário configurar aqui.\n\nVocê pode ativar o aplicativo de tempo do sistema de seu Pebble do gerenciamento de aplicativos.\n\nOs relógios assistidos mostrarão o tempo automaticamente. - Ativar o emparelhamento Bluetooth - Desactive esta opção se tiver problemas para - Métrico - Imperial - 24H - AM/PM - Alarme -Doar + Se você ainda desejar continuar e tudo funcionar corretamente, por favor, diga aos desenvolvedores do Gadgetbridge para incluírem essa versão de firmware na lista: %s + + Configurações + Configurações Gerais + Conecta o dispositivo quando o Bluetooth estiver ligado + Iniciar automaticamente + Reconectar automaticamente + Player de música preferencial + Padrão + Data e Hora + Sincronizar hora + Sincronizar horário quando o dispositivo estiver conectando ou quando o fuso horário mudar no Android + Tema + Claro + Escuro + Idioma + Ocultar notificações do Gadgetbridge + Exibir ícone na barra de status e nas notificações na tela inicial + Ocultar ícone na barra de status e nas notificações na tela inicial + Notificações + Repetições + Chamadas de telefone + SMS + Mensagens do Pebble + Suportar notificações de aplicações que enviam notificações pelo PebbleKit. + Suporte a notificações genéricas + ...quando a tela estiver ligada + Não perturbe + Parar com notificações indesejadas enquanto estiver no modo Não Perturbe. + Representação + Ativar isso se o dispositivo não tiver suporte para seu idioma + sempre + quando a tela estiver desligada + Nunca + Privacidade + Modo de chamada privada + Exibir nome e número + Ocultar nome e exibir número + Ocultar nome e número + Apps em Blacklist + Histórico de mensagens + Respostas + Sufixo comum + Chamadas recusadas + Atualizar no Pebble + Opções do desenvolvedor + Endereço do Mi Band + Configurações Pebble + Ativar monitores + Monitor de atividades preferido + Sincronizar com Pebble Health + Sincronizar com Misfit + Sincronizar com Morpheuz + Suporta originar chamadas + Desabilitar isso também irá impedir o Pebble 2/LE vibrar ao originar chamadas + Permitir acesso a App Android de terceiros + Habilitar suporte experimental ao App Android que use PebbleKit + Despertar e pôr do sol + Enviar despertar e pôr do sol baseado na localização do Pebble + Auto remover notificações rejeitadas + Notificações são automaticamente removidas quando rejeitadas no Android + Modo de privacidade + Notificações + Deslocar texto de notificações que extrapolar a tela + Apenas mostrar ícone de notificações + Localização + Obter localização + Latitude + Longitude + Mantenha a localização atualizada + Tente obter a localização online, use dados armazenados como fallback + Por favor, habilite localização de rede + localização obtida + Forçar o protocolo de notificação + Esta opção força o uso do protocolo de notificação mais recente. HABILITE APENAS SE SABE O QUE ESTÁ FAZENDO! + Habilitar recursos não certificados + Habilitar recursos não certificados. FAÇA ISSO SE SOUBER O QUE REALMENTE ESTÁ FAZENDO! + Sempre preferir BLE + Use suporte experimental do Pebble LE em vez do Bluetooth clássico, requer parear um \"Pebble LE\" depois de que nenhum LE tenha sido conectado + Pebble 2/LE GATT MTU limite + Se seu Pebble 2/Pebble LE não funciona como esperado, tente esta configuração para limitar o MTU (faixa válida 20–512) + Ativas registro de Log do App do Relógio + Faz com que os logs de aplicativos de monitoramento sejam registrados por Gadgetbridge (exige reconectar) + Prematuramente ACK PebbleKit + Isso fará com que as mensagens enviadas para aplicativos de terceiros sejam reconhecidas sempre e imediatamente + Tentativas de Reconexão + Unidades + Formato da hora + Duração de tela + Medição da frequência cardíaca durante todo o dia + Configurações do HPlus/Makibes + desconectado + conectando + conectado + estado desconhecido + (desconhecido) + Teste + Teste de notificação + Esta é uma Notificação de Teste de Gadgetbridge + Bluetooth não suportado. + Bluetooth desabilitado. + Toque no dispositivo conectado + Toque no dispositivo conectado + Toque no dispositivo conectado para Vibração + Toque num dispositivo para ligar + Não pode conectar. Endereço BT inválido? + Gadgetbridge em execução + Instalação binária %1$d/%2$d + falha na instalação! + instalação bem sucedida + VOCÊ ESTÁ TENTANDO INSTALAR UM FIRMWARE, A SEU PRÓPRIO RISCO. \n\n\nEste firmware é para HW Revisão: %s + Você está prestes a instalar o seguinte aplicativo: \n\n\n %1$s Versão %2$s por %3$s\n + N/A + inicializado + %1$s de %2$s + Dispositivo encontrado + Parar com a busca + Iniciar busca + Conecte novo dispositivo + %1$s (%2$s) + Parear dispositivo + Use a caixa de diálogo Android Bluetooth para emparelhar o dispositivo. + Parear sua Mi Band + 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… + Nenhum endereço do mac passou, não pode emparelhar. + Configurações Específicas do Dispositivo + Configurações da Mi Band + masculino + feminino + outro + esquerda + direita + Nenhum dado válido informado, usando dados fictícios por enquanto. + Quando a sua Mi Band vibra e pisca, toque nele algumas vezes seguidas. + Instalar + Nota: + Imagem do Dispositivo + Nome/Apelido + Quantidade de vibrações + Monitor de sono + Escrever arquivos de Log + Inicializando + Adquirindo Dados de Atividades + De %1$s a %2$s + Dispositivo na esquerda ou direita? + Prefil de Vibração + Destacado + Pequeno + Médio + Longo + Pingo D\'água + Anel + Alarme + Vibração + Tente + Notificações SMS + Configurações de vibrações + Notificação genérica + Notificação de email + Notificações de chamadas + Bate papo + Navegação + Rede social + Busca Dispositivo Perdido + Cancele para parar a vibração. + Sua atividade + Configurar Alarmes + Configurar alarmes + Detalhes do alarme + Dom + Seg + Ter + Qua + Qui + Sex + Sab + despertar inteligente + Tem algum erro ao definir o alarme, tente novamente! + Alarme enviado para o dispositivo! + Sem data. Sincronizar com dispositivo? + Transferir %1$s dados a partir de %2$s + Objetivo de passos por dia + Erro executando \'%1$s\' + Sua Atividade (ALPHA) + Impossível conectar: %1$s + 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… + Gadget com bateria baixa! + %1$s bateria a: %2$s%% + Última carga: %s \n + Número de cargas: %s + Seu Sono + Passos na semana + Sua Atividade e Sono + Atualizando Firmware... + Arquivo não pode ser instalado, o dispositivo não está pronto. + %1$s: %2$s %3$s + Versão compatível + Versão não testada! + Conexão com o dispositivo: %1$s + Pebble Firmware %1$s + Corrigir a revisão do hardware + Incompatibilidade de revisão de hardware! + %1$s (%2$s) + 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… + Falha ao instalar o Firmware + Passos + Atividade ao vivo + Etapas de hoje, meta: %1$s + Não transferir dados da atividade ack + Se os dados da atividade não forem chamados para a pulseira, eles não serão apagados. Útil se GB for usado em conjunto com outros aplicativos. + Manterão os dados da atividade no Mi Band mesmo após a sincronização. Útil se GB for usado em conjunto com outros aplicativos. + Use o modo de baixa latência para atualizações FW + Isso pode ajudar em dispositivos nos quais as atualizações de firmware falham + Histórico de passos + Passos/min atuais + Total de passos + Histórico de passos por minuto + Iniciar sua atividade + Atividade + Sono leve + Sono pesado + Não utilizado + Desconectado. + Todos os alarmes desabilitados + Manter dados de atividade no dispositivo + Firmware incompatível + Este firmware não é compatível com seu dispositivo + Alarmes reservados para eventos próximos + Use o sensor de freqüência cardíaca para melhorar a detecção do sono + Desvio do tempo do dispositivo em horas (para detectar o sono dos trabalhadores por turnos) + Mi2: Formato de data + Hora + + Ativar exibição ao levantar + Sobre para transferir dados desde %1$s + aguarde para reconectar + Sobre você + Ano de anoversário + Gênero + Altura em cm + Peso em kg + autenticando + autenticação requerida + Zzz + Adicionar widget + Preferir duração de sono em horas + Um alarme foi definido para %1$02d:%2$02d + HW: %1$s + FW: %1$s + Erro ao criar o diretório para arquivos de log: %1$s + "FC: " + Atualização de Firmware em progresso + Firmware não enviado + Frequência cardíaca + Frequência cardíaca + Armazenar registro bruto no banco de dados + Se marcado, os dados são armazenados \"como\" e estão disponíveis para interpretação posterior. NB: a base de dados será maior neste caso! + Gerenciamento de banco de dados + Gerenciamento de banco de dados + As operações do banco de dados usam o seguinte caminho no dispositivo.\nEste caminho está acessível a outras aplicações Android e ao seu computador.\nApós encontrar o banco de dados exportado (ou colocar o banco de dados que você deseja importar): + Não é possível acessar o caminho de exportação. Entre em contato com os desenvolvedores. + Exportado para: %1$s + Erro ao exportar BD: %1$s + Importar dados? + Realmente sobrescrever o banco de dados atual? Todos os seus dados atuais de atividade (se houver) serão perdidos. + Sucesso ao importar. + Erro ao importar BD: %1$s + Excluir Dados de Atividade? + Excluir realmente o banco de dados inteiro? Todos os seus dados de atividade e informações sobre seus dispositivos serão perdidos. + Dados eliminados com êxito. + Falha na eliminação do banco de dados. + Excluir antigo banco de dados de atividades? + Excluir realmente o banco de dados de atividade antigo? Os dados da atividade que não foram importados serão perdidos. + Dados de atividade antiga excluídos com êxito. + Falha na eliminação da base de dados da Actividade Antiga. + Sobrepor + Cancelar + Apagar + + Vibração + + Pareando Pebble + Espera-se que um diálogo de emparelhamento apareça no seu dispositivo Android. Se isso não acontecer, procure na gaveta de notificação e aceite o pedido de emparelhamento. Depois que aceitar o pedido de emparelhamento em seu Pebble + Certifique-se de que esta capa está ativada no aplicativo Notificação de Tempo para obter informações sobre o tempo em seu Pebble.\n\nNão é necessário configurar aqui.\n\nVocê pode ativar o aplicativo de tempo do sistema de seu Pebble do gerenciamento de aplicativos.\n\nOs relógios assistidos mostrarão o tempo automaticamente. + Ativar o emparelhamento Bluetooth + Desactive esta opção se tiver problemas para + Métrico + Imperial + 24H + AM/PM + Alarme + Doar Conectar Abrir gaveta de navegação Fechar gaveta de navegação Pressione prolongadamente o cartão para desconectar Desconectando - Conectando + Conectando... Tirar captura de tela do dispositivo - - Blacklist do Calendário - Você está prestes a instalar o firmware %s no seu 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. @@ -371,23 +368,18 @@ \n \nNÃO TESTADO, PODE DANIFICAR SEU DISPOSITIVO, PROSSIGA AO SEU PRÓPRIO RISCO! Ativar deslizar para a esquerda/direita no gráfico de atividades - Ocultar número e exibir nome Calendários na Blacklist - Clima Localização climática (CM/LOS) - Sincronizar calendário Habilitar JS em segundo plano Quando habilitado, permite que as Watchfaces mostrem o clima, informações da bateria, etc. - Exportar preferências automaticamente Exportação automática habilitada Exportar localização Intervalo de exportação Exportar a cada %d hora(s) - Ajustes do Amazfit Bip Permita que seu dispositivo seja detectado. Os dispositivos já pareados não serão detectados. Para o Android 6 ou superior, é necessário habilitar a localização de GPS. Desative o Privacy Guard para o Gadgetbridge, pois o telefone poderá travar ou reiniciar caso esteja ativo. Se nenhum dispositivo for encontrado após alguns minutos, tente novamente após reiniciar seu aparelho telefônico. Medição diária dos batimentos cardíacos @@ -396,11 +388,9 @@ A cada 10 minutos A cada 30 minutos A cada hora - Áreas de velocidade Minutos totais Passos por minuto - A exportação do banco de dados falhou! Por favor, verifique suas configurações. Sono por semana Sono hoje, meta: %1$s @@ -416,19 +406,14 @@ 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 -Alterar cor do LED + Alterar cor do LED Alterar frequência FM Calibrar Dispositivo - - Bloquear todas as Notificações Desbloquear todas as Notificações - - Você está prestes a instalar o firmware %s na sua Mi Band 3. \n \nCertifique-se de instalar o arquivo .fw, e depois o arquivo .res. Seu relógio será reiniciado após a instalação do arquivo .fw. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 5dba73e15..4354f1dec 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1,4 +1,4 @@ - + Gadgetbridge Gadgetbridge @@ -7,7 +7,7 @@ Iesire Doneaza Sincronizeaza - Gaseste bratara + Găsește brățara Conecteaza Deconecteaza Sterge bratara @@ -22,8 +22,8 @@ Dezactiveaza Activeaza Masurare ritm cardiac Dezactiveaza Masurare ritm cardiac - Activeaza Aplicatie meteo - Dezactiveaza Aplicatie meteo + Activare Aplicație Meteo + Dezactivare Aplicație Meteo Configureaza Notificari blocate Blocheaza toate notificarile @@ -67,7 +67,7 @@ Meteo Captura ecran Se deconecteaza - Se conecteaza + Conectare… Capturez ecranul dispozitivului @@ -77,10 +77,10 @@ Fete de ceas instalate Sterge Cauta in magazinul Pebble - Instaleaza aplicatie notificari meteo + Instalare aplicație Notificări Meteo Muta la inceput - Esti pe punctul de a instala firmware-ul %s in locul celui deja instalat pe Mi Band. + Ești pe punctul de a instala firmware-ul %s în locul celui deja instalat pe Mi Band. Esti pe punctul de a instala firmware-ul %s pe Amazfit Bip. \n \nAi grija sa instalezi fisierul .fw, apoi fisierul .res, si in final fisierul .gps. Ceasul va reporni dupa ce se instaleaza fisierul .fw. @@ -124,4 +124,23 @@ Compas Setari Alipay - + Modificare Culoare LED + Modificare Frecvență FM + Calibrare Dispozitiv + Aplicație Redare Audio Preferată + Ascunde notificarea Gadgetbridge + Icoana din bara de stare și notificarea din ecranul de blocare sunt afișate + Icoana din bara de stare și notificarea din ecranul de blocare sunt ascunse + Repetiții + Timp minim dintre notificări + Mesaje Pebble + Nu Deranja + Notificările nedorite sunt dezactivate în acest mod + Dreapta-La-Stanga + Intimitate + Răspunsuri + Cel puțin unul dintre cuvintele + Toate cuvintele + Salvare Configurație + Deconectat(ă), alarma nu este setată. + \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 44bc776a5..3975b1191 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,401 +1,400 @@ - + - Gadgetbridge - Gadgetbridge - Настройки - Отладка - Выход - Синхронизировать - Анализ сна (АЛЬФА) - Найти устройство - Сделать снимок экрана - Отключить - Удалить устройство - Удалить %1$s - Устройство и вся связанная с ним информация будут удалены! - Открыть панель навигации - Закрыть панель навигации - Чтобы разъединиться, нажмите на карточку устройства и удержите - Разъединение - Соединение - Сделать снимок устройства - Отладка - - Управление приложением - Приложения в памяти - Установленные приложения - Установленный циферблаты - Удалить - Удалить и очистить кеш - Переустановка - Искать в магазине Pebble - Активировать - Деактивировать - Включить монитор сердечного ритма - Выключить монитор сердечного ритма - Включить системное приложение прогноза погоды - Выключить системное приложение прогноза погоды - Установить уведомления для прогноза погоды - Настроить - Переместить наверх - - Заблокированные уведомления - - - Установщик прошивки/приложений - Вы собираетесь установить на Mi Band прошивку %s вместо текущей. - Вы собираетесь установить прошивки %1$s и %2$s вместо текущей на вашем Mi Band. - Эта прошивка была проверена и совместима с Gadgetbridge. - Эта прошивка не протестирована и может быть несовместима с Gadgetbridge.\n\nНе рекомендуется устанавливать её на ваш Mi Band! - Если вы установите эту прошивку и убедитесь, что всё работает без сбоев, пожалуйста, сообщите об этом разработчикам Gadgetbridge. Они пометят эту версию прошивки (%s) как совместимую. - - Настройки - Общие настройки - Подключение к зарегистрированному устройству при активации Bluetooth - Запускать автоматически - Переподключаться автоматически - Предпочтительный музыкальный плеер - По умолчанию - Дата и время - Синхронизировать время при подключении - Синхронизировать время при подключении к зарегистрированному стройству, а также при изменении времени или временной зоны в системных настройках - Тема - Светлая - Темная - Язык - Прятать уведомления от Gadgetbridge - Показывать значок в строке состояния и уведомления на экране блокировки - Не показывать значок в строке состояния и уведомления на экране блокировки - Уведомления - Повторы - Вызовы - СМС-сообщения - Сообщения Pebble - Поддержка приложений, которые отправляют уведомления на Pebble с помощью PebbleKit. - Поддержка обычных уведомлений - … даже когда экран включён - Не беспокоить - Предотвращать отправку нежелательных уведомлений в режиме \"Не беспокоить\" - Транслитерация - Всегда - Включите эту функцию, если ваше устройство не имеет поддержки шрифта на вашем языке - Когда экран выключен - Никогда - Конфиденциальность - Конфиденциальность вызовов - Отображать имя и номер - Скрывать имя, но отображать номер - Скрывать номер, но отображать имя - Скрывать имя и номер - Заблокированные приложения - Сохранённые сообщения - Ответы - Общий суффикс - Пропущенные вызовы - Обновить на Pebble - Настройки для разработчиков - Адрес Mi Band - Настройки Pebble - Отслеживание активности - Предпочитаемый трекер активности - Синхронизация с Pebble Health - Синхронизация с Misfit - Синхронизация с Morpheuz - Поддержка исходящих вызовов - При отключении данного пункта, Pebble 2/LE также не будет вибрировать при исходящих вызовах - Разрешить доступ посторонним приложениям - Добавить экспериментальную поддержку приложений, использующих PebbleKit - Восход и закат солнца - Показывать время восхода и захода солнца в зависимости от местоположения на временной шкале Pebble - Синхронизация календаря - Отображать события календаря на временной шкале pebble - Автоматическое удаление отклонённых уведомлений - Уведомления автоматически будут удалены из Pebble, при удалении с устройства Android - Режим конфиденциальности - Обычные уведомления - Перенос текста уведомления, выходящим за границы экрана - Показать только значок уведомления - Местоположение - Получить данные о местоположении - Широта - Долгота - Обновлять местоположение - Попробуйте получить текущее местоположение во время выполнения, используйте сохраненное местоположение в качестве резервного - Пожалуйста, включите сетевое расположение - Месторасположение определено - Принудительный протокол уведомлений - Эта настройка принудительно использует самый новый протокол уведомлений (зависит от версии прошивки). ВКЛЮЧАЙТЕ, ЕСЛИ ТОЧНО ЗНАЕТЕ, ЗАЧЕМ ВЫ ЭТО ДЕЛАЕТЕ! - Включить непроверенные функции - Включить функции, не проходившие проверку. ВКЛЮЧАЙТЕ НА СВОЙ СТРАХ И РИСК! - Всегда отдавать предпочтение BLE - Использовать экспериментальную поддержку Pebble LE для всех Pebble вместо BT classic, требует сопряжения «Pebble LE» после того, как был подключен не LE - Ограничение GATT MTU для Pebble 2/LE - Если ваш Pebble 2/Pebble LE работает некорректно, попробуйте при помощи данной настройки ограничить MTU (допустимый диапазон от 20 до 512) - Включить ведение логов приложений - Логи приложений будут вестись в Gadgetbridge (требуется переподключение) - Преждевременное ACK PebbleKit - Сообщения, отправляемые внешним сторонним приложениям, будут всегда и немедленно разрешены - Попытки переподключения - Единицы - Формат времени - Продолжительность работы экрана - Измерение сердечного ритма в течение всего дня - Настройки HPlus/Makibes - Нет соединения - Соединение - Соединено - Непонятное состояние - (неизвестно) - Тест - Тестовое уведомлений - Это тестовое уведомление от Gadgetbridge - Bluetooth не поддерживается. - Bluetooth отключён. - Коснитесь подключённого устройства для вызова Управления приложениями - Коснитесь подключённого устройства для показа Активностей - Коснитесь подключённого устройства для Вибрации - Коснитесь устройства для соединения - Не удалось соединиться. Невереный адрес Bluetooth? - Gadgetbridge запущен - установка бинарного файла %1$d/%2$d - Установка не удалась - Установлено - ВЫ ПЫТАЕТЕСЬ УСТАНОВИТЬ ПРОШИВКУ, ПРОДОЛЖАЙТЕ НА СВОЙ СТРАХ И РИСК.\n\n\n Эта прошивка для ревизии устройства: %s - Вы собираетесь установить приложение:\n\n\n%1$s версия %2$s от %3$s\n - Недоступно - Инициализировано - %1$s от %2$s - Поиск устройства - Остановить поиск устройств - Умный поиск - Подключиться к новому устройству - %1$s (%2$s) - Сопряжение устройств - Для сопряжения устройств используйте диалог Android. - Сопряжение вашего Mi Band - Сопряжение с %s… - Привязываюсь к %1$s (%2$s) - Невозможно выполнить сопряжение с %1$s (%2$s) - Выполняется привязка: %1$s (%2$s) - Уже привязан к %1$s (%2$s), выполняется соединение… - MAC-адреса нет, сопряжение не удалось. - Настройки устройства - Настройки Mi Band и Amazfit - Мужчина - Женщина - Другой - слева - справа - Не предоставлено действительных данных пользователя. Используются данные по-умолчанию. - Когда ваш Mi Band вибрирует и мигает, постучите по нему несколько раз. - Установить - Сделайте свое устройство видимым. В настоящее время подключенные устройства, скорее всего, не будут обнаружены. Активируйте местоположение (например, GPS) на Android 6+. Отключите Privacy Guard для Gadgetbridge, так как это может привести к сбою и перезагрузке вашего телефона. Если через несколько минут устройство не обнаружено, повторите попытку после перезагрузки мобильного устройства. - Заметка: - Изображение устройства - Имя/псевдоним - Количество вибраций - Анализ фаз сна - Сохранять файлы журнала - Запускается - Получение данных активности - От %1$s до %2$s - Носите на левой или правой руке? - Профиль настроек вибрации - Стаккато - Короткий - Средний - Длинный - Капля воды - Звонок - Будильник - Вибро - Попробовать - SMS-уведомление - Настройки вибрации - Общие уведомления - Уведомления электронной почты - Уведомления о входящих звонках - Чат - Навигация - Социальные сети - Поиск потерянного устройства - Отмените, чтобы прекратить вибрацию. - Ваша активность - Завести Будильник - Настроить будильники - Настройки будильника - Вс - Пн - Вт - Ср - Чт - Пт - Сб - умное пробуждение - При настройке будильника произошла ошибка, попробуйте ещё раз. - Будильник был добавлен на устройстве. - Нет данных. Синхронизировать устройство? - Будет передано %1$s данных, начиная с %2$s - Ежедневная цель шагов - Произошла ошибка при выполнении \'%1$s\' - Ваша активность (АЛЬФА) - Подключиться не удалось: %1$s - Не удалось найти обработчик для установки этого файла. - Не удалось установить данный файл: %1$s - Не удалось установить прошивку: она не совпадает с версией вашего устройства Pebble. - Пожалуйста подождите, проверяется статус установки… - Низкий заряд устройства! - %1$s осталось заряда: %2$s%% - Последний раз устройство заряжалось: %s \n - Количество циклов перезарядки: %s - Ваш сон - Сон за неделю - Сон сегодня, цель: %1$s - Шагов в неделю - Ваши активность и сон - Недосып: %1$s - Пересып: %1$s - Обновление прошивки… - Файл не может быть установлен, устройство не готово. - %1$s: %2$s %3$s - Совместимая версия - Не протестированная версия! - Подключение к устройству: %1$s - Версия прошивки Pebble: %1$s - Корректная ревизия устройства - Ревизия устройства не совпадает! - %1$s (%2$s) - Проблема с передачей прошивки. НЕ ПЕРЕЗАГРУЖАЙТЕ ваш Mi Band! - Проблема с передачей метаданных прошивки - Установка прошивки завершена - Установка прошивки завершена, устройство перезагружается… - Запись прошивки завершилась неудачей - Шаги - Калории - Расстояние - Жизненная активность - Шагов сегодня, цель: %1$s - Не хватает: %1$d шагов - Пройдено на %1$d шагов больше - Не подтверждать передачу данных об активности - Если данные об активности не будут переданы на устройство, оно не будет очищено. Полезно, если GB используется с другими приложениями. - Хранить данные о деятельности на Mi Band, даже после синхронизации. Полезно, если Mi Band используется совместно с другими приложениями. - Использовать режим с низкими задержками для обновления прошивки - Это может пригодиться в случае неудачного обновления прошивки. - История шагов - Текущие шаги в минуту - Всего шагов - История шагов за минуту - Начните вашу активность - Текущая / максимальная ЧСС: %1$d / %2$d - Активность - Быстрый сон - Глубокий сон - Не носилось - Вы спали с %1$s до %2$s - Вы не спали - Не подключен. - Все будильники отключены - Хранить данные об активности на устройстве - Несовместимая прошивка - Эта прошивка не совместима с устройством - Резервные сигналы для предстоящих событий - Использовать датчик сердцебиения для улучшения мониторинга сна - Смещение времени в часах (для тех, кто работает по ночам) - Формат даты - Время - Время и дата - Активировать экран при подъёме - Готов к передаче данных с %1$s - Ожидание переподключения - Ваши данные - Год рождения - Пол - Рост в см - Вес в кг - Авторизация - Требуется авторизация - Хрр - Добавить виджет - Желаемая продолжительность сна - Будильник был установлен на %1$02d:%2$02d - Версия устройства: %1$s - Версия прошивки: %1$s - Ошибка создания каталога для лог-файлов: %1$s - "Версия устройства: " - Обновление прошивки - Прошивка не отправлена - Пульс - Пульс - Хранить необработанные записи в базе данных - Если флажок установлен, данные сохраняются как есть. В дальнейшем их можно будет обрабатывать. Обратите внимание: в этом случае база данных будет занимать больше места. - Управление базой данных - Управление базой данных - "Операции с базой данных используют этот путь на устройстве. + Gadgetbridge + Gadgetbridge + Настройки + Отладка + Выход + Синхронизировать + Анализ сна (АЛЬФА) + Найти устройство + Сделать снимок экрана + Отключить + Удалить устройство + Удалить %1$s + Устройство и вся связанная с ним информация будут удалены! + Открыть панель навигации + Закрыть панель навигации + Чтобы разъединиться, нажмите на карточку устройства и удержите + Разъединение + Соединение… + Сделать снимок устройства + Отладка + + Управление приложением + Приложения в памяти + Установленные приложения + Установленный циферблаты + Удалить + Удалить и очистить кеш + Переустановка + Искать в магазине Pebble + Активировать + Деактивировать + Включить монитор сердечного ритма + Выключить монитор сердечного ритма + Включить системное приложение прогноза погоды + Выключить системное приложение прогноза погоды + Установить уведомления для прогноза погоды + Настроить + Переместить наверх + + Заблокированные уведомления + + + Установщик прошивки/приложений + Вы собираетесь установить на Mi Band прошивку %s вместо текущей. + Вы собираетесь установить прошивки %1$s и %2$s вместо текущей на вашем Mi Band. + Эта прошивка была проверена и совместима с Gadgetbridge. + Эта прошивка не протестирована и может быть несовместима с Gadgetbridge.\n\nНе рекомендуется устанавливать её на ваш Mi Band! + Если вы установите эту прошивку и убедитесь, что всё работает без сбоев, пожалуйста, сообщите об этом разработчикам Gadgetbridge. Они пометят эту версию прошивки (%s) как совместимую. + + Настройки + Общие настройки + Подключение к зарегистрированному устройству при активации Bluetooth + Запускать автоматически + Переподключаться автоматически + Предпочтительный музыкальный плеер + По умолчанию + Дата и время + Синхронизировать время при подключении + Синхронизировать время при подключении к зарегистрированному стройству, а также при изменении времени или временной зоны в системных настройках + Тема + Светлая + Темная + Язык + Прятать уведомления от Gadgetbridge + Показывать значок в строке состояния и уведомления на экране блокировки + Не показывать значок в строке состояния и уведомления на экране блокировки + Уведомления + Повторы + Вызовы + СМС-сообщения + Сообщения Pebble + Поддержка приложений, которые отправляют уведомления на Pebble с помощью PebbleKit. + Поддержка обычных уведомлений + … даже когда экран включён + Не беспокоить + Предотвращать отправку нежелательных уведомлений в режиме \"Не беспокоить\" + Транслитерация + Всегда + Включите эту функцию, если ваше устройство не имеет поддержки шрифта на вашем языке + Когда экран выключен + Никогда + Конфиденциальность + Конфиденциальность вызовов + Отображать имя и номер + Скрывать имя, но отображать номер + Скрывать номер, но отображать имя + Скрывать имя и номер + Заблокированные приложения + Сохранённые сообщения + Ответы + Общий суффикс + Пропущенные вызовы + Обновить на Pebble + Настройки для разработчиков + Адрес Mi Band + Настройки Pebble + Отслеживание активности + Предпочитаемый трекер активности + Синхронизация с Pebble Health + Синхронизация с Misfit + Синхронизация с Morpheuz + Поддержка исходящих вызовов + При отключении данного пункта, Pebble 2/LE также не будет вибрировать при исходящих вызовах + Разрешить доступ посторонним приложениям + Добавить экспериментальную поддержку приложений, использующих PebbleKit + Восход и закат солнца + Показывать время восхода и захода солнца в зависимости от местоположения на временной шкале Pebble + Синхронизация календаря + Отображать события календаря на временной шкале pebble + Автоматическое удаление отклонённых уведомлений + Уведомления автоматически будут удалены из Pebble, при удалении с устройства Android + Режим конфиденциальности + Обычные уведомления + Перенос текста уведомления, выходящим за границы экрана + Показать только значок уведомления + Местоположение + Получить данные о местоположении + Широта + Долгота + Обновлять местоположение + Попробуйте получить текущее местоположение во время выполнения, используйте сохраненное местоположение в качестве резервного + Пожалуйста, включите сетевое расположение + Месторасположение определено + Принудительный протокол уведомлений + Эта настройка принудительно использует самый новый протокол уведомлений (зависит от версии прошивки). ВКЛЮЧАЙТЕ, ЕСЛИ ТОЧНО ЗНАЕТЕ, ЗАЧЕМ ВЫ ЭТО ДЕЛАЕТЕ! + Включить непроверенные функции + Включить функции, не проходившие проверку. ВКЛЮЧАЙТЕ НА СВОЙ СТРАХ И РИСК! + Всегда отдавать предпочтение BLE + Использовать экспериментальную поддержку Pebble LE для всех Pebble вместо BT classic, требует сопряжения «Pebble LE» после того, как был подключен не LE + Ограничение GATT MTU для Pebble 2/LE + Если ваш Pebble 2/Pebble LE работает некорректно, попробуйте при помощи данной настройки ограничить MTU (допустимый диапазон от 20 до 512) + Включить ведение логов приложений + Логи приложений будут вестись в Gadgetbridge (требуется переподключение) + Преждевременное ACK PebbleKit + Сообщения, отправляемые внешним сторонним приложениям, будут всегда и немедленно разрешены + Попытки переподключения + Единицы + Формат времени + Продолжительность работы экрана + Измерение сердечного ритма в течение всего дня + Настройки HPlus/Makibes + Нет соединения + Соединение + Соединено + Непонятное состояние + (неизвестно) + Тест + Тестовое уведомлений + Это тестовое уведомление от Gadgetbridge + Bluetooth не поддерживается. + Bluetooth отключён. + Коснитесь подключённого устройства для вызова Управления приложениями + Коснитесь подключённого устройства для показа Активностей + Коснитесь подключённого устройства для Вибрации + Коснитесь устройства для соединения + Не удалось соединиться. Невереный адрес Bluetooth? + Gadgetbridge запущен + установка бинарного файла %1$d/%2$d + Установка не удалась + Установлено + ВЫ ПЫТАЕТЕСЬ УСТАНОВИТЬ ПРОШИВКУ, ПРОДОЛЖАЙТЕ НА СВОЙ СТРАХ И РИСК.\n\n\n Эта прошивка для ревизии устройства: %s + Вы собираетесь установить приложение:\n\n\n%1$s версия %2$s от %3$s\n + Недоступно + Инициализировано + %1$s от %2$s + Поиск устройства + Остановить поиск устройств + Умный поиск + Подключиться к новому устройству + %1$s (%2$s) + Сопряжение устройств + Для сопряжения устройств используйте диалог Android. + Сопряжение вашего Mi Band + Сопряжение с %s… + Привязываюсь к %1$s (%2$s) + Невозможно выполнить сопряжение с %1$s (%2$s) + Выполняется привязка: %1$s (%2$s) + Уже привязан к %1$s (%2$s), выполняется соединение… + MAC-адреса нет, сопряжение не удалось. + Настройки устройства + Настройки Mi Band и Amazfit + Мужчина + Женщина + Другой + слева + справа + Не предоставлено действительных данных пользователя. Используются данные по-умолчанию. + Когда ваш Mi Band вибрирует и мигает, постучите по нему несколько раз. + Установить + Сделайте свое устройство видимым. В настоящее время подключенные устройства, скорее всего, не будут обнаружены. Активируйте местоположение (например, GPS) на Android 6+. Отключите Privacy Guard для Gadgetbridge, так как это может привести к сбою и перезагрузке вашего телефона. Если через несколько минут устройство не обнаружено, повторите попытку после перезагрузки мобильного устройства. + Заметка: + Изображение устройства + Имя/псевдоним + Количество вибраций + Анализ фаз сна + Сохранять файлы журнала + Запускается + Получение данных активности + От %1$s до %2$s + Носите на левой или правой руке? + Профиль настроек вибрации + Стаккато + Короткий + Средний + Длинный + Капля воды + Звонок + Будильник + Вибро + Попробовать + SMS-уведомление + Настройки вибрации + Общие уведомления + Уведомления электронной почты + Уведомления о входящих звонках + Чат + Навигация + Социальные сети + Поиск потерянного устройства + Отмените, чтобы прекратить вибрацию. + Ваша активность + Завести Будильник + Настроить будильники + Настройки будильника + Вс + Пн + Вт + Ср + Чт + Пт + Сб + умное пробуждение + При настройке будильника произошла ошибка, попробуйте ещё раз. + Будильник был добавлен на устройстве. + Нет данных. Синхронизировать устройство? + Будет передано %1$s данных, начиная с %2$s + Ежедневная цель шагов + Произошла ошибка при выполнении \'%1$s\' + Ваша активность (АЛЬФА) + Подключиться не удалось: %1$s + Не удалось найти обработчик для установки этого файла. + Не удалось установить данный файл: %1$s + Не удалось установить прошивку: она не совпадает с версией вашего устройства Pebble. + Пожалуйста подождите, проверяется статус установки… + Низкий заряд устройства! + %1$s осталось заряда: %2$s%% + Последний раз устройство заряжалось: %s \n + Количество циклов перезарядки: %s + Ваш сон + Сон за неделю + Сон сегодня, цель: %1$s + Шагов в неделю + Ваши активность и сон + Недосып: %1$s + Пересып: %1$s + Обновление прошивки… + Файл не может быть установлен, устройство не готово. + %1$s: %2$s %3$s + Совместимая версия + Не протестированная версия! + Подключение к устройству: %1$s + Версия прошивки Pebble: %1$s + Корректная ревизия устройства + Ревизия устройства не совпадает! + %1$s (%2$s) + Проблема с передачей прошивки. НЕ ПЕРЕЗАГРУЖАЙТЕ ваш Mi Band! + Проблема с передачей метаданных прошивки + Установка прошивки завершена + Установка прошивки завершена, устройство перезагружается… + Запись прошивки завершилась неудачей + Шаги + Калории + Расстояние + Жизненная активность + Шагов сегодня, цель: %1$s + Не хватает: %1$d шагов + Пройдено на %1$d шагов больше + Не подтверждать передачу данных об активности + Если данные об активности не будут переданы на устройство, оно не будет очищено. Полезно, если GB используется с другими приложениями. + Хранить данные о деятельности на Mi Band, даже после синхронизации. Полезно, если Mi Band используется совместно с другими приложениями. + Использовать режим с низкими задержками для обновления прошивки + Это может пригодиться в случае неудачного обновления прошивки. + История шагов + Текущие шаги в минуту + Всего шагов + История шагов за минуту + Начните вашу активность + Текущая / максимальная ЧСС: %1$d / %2$d + Активность + Быстрый сон + Глубокий сон + Не носилось + Вы спали с %1$s до %2$s + Вы не спали + Не подключен. + Все будильники отключены + Хранить данные об активности на устройстве + Несовместимая прошивка + Эта прошивка не совместима с устройством + Резервные сигналы для предстоящих событий + Использовать датчик сердцебиения для улучшения мониторинга сна + Смещение времени в часах (для тех, кто работает по ночам) + Формат даты + Время + Время и дата + Активировать экран при подъёме + Готов к передаче данных с %1$s + Ожидание переподключения + Ваши данные + Год рождения + Пол + Рост в см + Вес в кг + Авторизация + Требуется авторизация + Хрр + Добавить виджет + Желаемая продолжительность сна + Будильник был установлен на %1$02d:%2$02d + Версия устройства: %1$s + Версия прошивки: %1$s + Ошибка создания каталога для лог-файлов: %1$s + "Версия устройства: " + Обновление прошивки + Прошивка не отправлена + Пульс + Пульс + Хранить необработанные записи в базе данных + Если флажок установлен, данные сохраняются как есть. В дальнейшем их можно будет обрабатывать. Обратите внимание: в этом случае база данных будет занимать больше места. + Управление базой данных + Управление базой данных + "Операции с базой данных используют этот путь на устройстве. \n \nОн доступен для других приложений Android и. компьютера. \n \nВы можете найти экспортированную базу данных (или разместить базу данных, которую вы хотите импортировать) здесь:" - Удаление устаревшей базы данных - Нет доступа к пути экспорта. Обратитесь, пожалуйста, к разработчикам. - Экспортировано в: %1$s - Ошибка экспорта базы данных: %1$s - Ошибка экспорта настроек: %1$s - Импортировать данные? - Точно перезаписать текущую базу данных? Все текущие данные вашей активности (если они есть) будут утеряны. - Импортировано. - Ошибка импорта базы данных: %1$s - Ошибка импорта настроек: %1$s - Удалить данные по вашей активности? - Действительно удалить всю базу данных? Все данные о вашей активности и информация о ваших устройствах будут утеряны. - Данные удалены. - Удалить базу данных не получилось. - Удалить данные по предыдущей активности? - Точно удалить старые данные об активности? Все не импортированные данные об активности будут утеряны. - Устаревшие данные активности удалены. - Удалить устаревшие данные по вашей активности не получилось. - Перезаписать - Отмена - Удалить - - Вибрация - - Сопряжение с Pebble - На вашем Android устройстве должно появиться всплывающее окно с запросом на сопряжение устройств. Если этого не произошло, загляните в ящик уведомлений и примите запрос на сопряжение. После этого примите запрос сопряжения на вашем устройстве Pebble. - Чтобы получать информацию о погоде на вашем Pebble, убедитесь, что выбрали эту тему в приложении «Уведомление о погоде». + Удаление устаревшей базы данных + Нет доступа к пути экспорта. Обратитесь, пожалуйста, к разработчикам. + Экспортировано в: %1$s + Ошибка экспорта базы данных: %1$s + Ошибка экспорта настроек: %1$s + Импортировать данные? + Точно перезаписать текущую базу данных? Все текущие данные вашей активности (если они есть) будут утеряны. + Импортировано. + Ошибка импорта базы данных: %1$s + Ошибка импорта настроек: %1$s + Удалить данные по вашей активности? + Действительно удалить всю базу данных? Все данные о вашей активности и информация о ваших устройствах будут утеряны. + Данные удалены. + Удалить базу данных не получилось. + Удалить данные по предыдущей активности? + Точно удалить старые данные об активности? Все не импортированные данные об активности будут утеряны. + Устаревшие данные активности удалены. + Удалить устаревшие данные по вашей активности не получилось. + Перезаписать + Отмена + Удалить + + Вибрация + + Сопряжение с Pebble + На вашем Android устройстве должно появиться всплывающее окно с запросом на сопряжение устройств. Если этого не произошло, загляните в ящик уведомлений и примите запрос на сопряжение. После этого примите запрос сопряжения на вашем устройстве Pebble. + Чтобы получать информацию о погоде на вашем Pebble, убедитесь, что выбрали эту тему в приложении «Уведомление о погоде». \n \nДополнительная настройка не нужна. \n \nВключить приложение погоды на вашем Pebble можно из \"Управления приложениями\". \n \nПоддерживаемые циферблаты покажут погоду автоматически. - Включить сопряжение по Bluetooth - Отключите, если вам не удалось подключиться - Метрическая система мер - Английская система мер - 24 ч - 12 ч - Будильник - (%1$s) - Нашёлся! - Mi2: Формат времени - До того как установить эту прошивку, нужно установить предыдущую версию %1$s! - Текстовые уведомления - = 1.0.1.28 и установленный Mili_pro.ft* .]]> - Выкл. - Попытка сопряжения с %1$s - Не удалось выполнить привязку к %1$s. - Попытка соединения с: %1$s - Включить Bluetooth для обнаружения устройств. - Связано с %1$s. - Выполнить сопряжение с %1$s ? - Выберите \"Сопряжение\" для сопряжения ваших устройств. Если не получилось, попробуйте снова без сопряжения. - Сопряжение - Не выполнять сопряжение -Пожертвовать - Подключить + Включить сопряжение по Bluetooth + Отключите, если вам не удалось подключиться + Метрическая система мер + Английская система мер + 24 ч + 12 ч + Будильник + (%1$s) + Нашёлся! + Mi2: Формат времени + До того как установить эту прошивку, нужно установить предыдущую версию %1$s! + Текстовые уведомления + = 1.0.1.28 и установленный Mili_pro.ft* .]]> + Выкл. + Попытка сопряжения с %1$s + Не удалось выполнить привязку к %1$s. + Попытка соединения с: %1$s + Включить Bluetooth для обнаружения устройств. + Связано с %1$s. + Выполнить сопряжение с %1$s ? + Выберите \"Сопряжение\" для сопряжения ваших устройств. Если не получилось, попробуйте снова без сопряжения. + Сопряжение + Не выполнять сопряжение + Пожертвовать + Подключить… Заблокированные календари - Вы собираетесь установить прошивку %s на ваш Amazfit Bip. \n \nСоблюдайте последовательность: вначале установите файл .fw, затем .res, и затем .gps. После установки файла .fw часы перезагрузятся. @@ -411,26 +410,21 @@ \n \nВЫ ДЕЙСТВУЕТЕ НА СВОЙ СТРАХ И РИСК! Включить жесты \"провести направо и налево\" в графиках активности - Заблокировать Календари - Временной график Pebble Включить JS в фоновом режиме Включают, чтобы видеть погоду, заряд батарейки и т.д. на циферблате. - Веб-отчёт активности - Выкл. Автоматически (определяет режим сна) Запланировано (промежуток времени) Открыть в устройстве Отключить звук Ответить -Настройки Amazfit Bip + Настройки Amazfit Bip Зоны скорости Всего минут Шагов в минуту - Прошивка Amazfit Bip версии %1$s Прошивка Amazfit Cor версии %1$s Часы @@ -463,19 +457,16 @@ Отключить уведомления о низкой активности во время режима \"Не беспокоить\" Начало режим \"Не беспокоить\" Окончание режима \"Не беспокоить\" - Автоматически Упрощённый китайский язык Традиционный китайский язык Английский язык - Измерение пульса в течение целого дня раз в минуту раз в 5 минут раз в 10 минут раз в полчаса раз в час - Погода Ошибка экспорта базы данных! Пожалуйста, проверьте настройки. Быстрый сон @@ -486,15 +477,12 @@ Плавание Шрифт Циферблат - Статус Погода Компас Настройки Заблокировать все уведомления Разблокировать все уведомления - - Вы собираетесь установить прошивку %s на ваш Mi Band 3. \n \nСоблюдайте последовательность: вначале установите файл .fw, затем .res. После установки файла .fw часы перезагрузятся. @@ -503,7 +491,6 @@ \n \nНЕ ПРОВЕРЯЛОСЬ, ЕСТЬ ВЕРОЯТНОСТЬ СЛОМАТЬ ВАШЕ УСТРОЙСТВО. ВЫ ДЕЙСТВУЕТЕ НА СВОЙ СТРАХ И РИСК! Местоположение для погоды (CM/LOS) - Подключаться только в режиме GATT-клиента Экспериментальные настройки только для Pebble 2. Попробуйте, если связь не очень Автоматический экспорт данных @@ -511,10 +498,8 @@ Путь экспорта Интервал экспорта Экспортировать каждые %d часов - Испанский Русский - Не измерялось Активность Неизвестная активность @@ -548,30 +533,24 @@ Teclast H30 XWatch MyKronoz ZeTime - Настройки ID115 Ориентация экрана - Загружать данные об активности автоматически Загрузка данных каждый раз, когда экран разблокируют. Это работает только если настроена блокировка экрана! Минимальный интервал между загрузками Загружать каждые %d минут(ы) - Горизонтально Вертикально Отслеживание активности Статистика активности Сбросить дату загрузки - Недопустимый формат данных Данные GPS Поправка ошибки GPS No.1 F1 ID115 - Куда сохранять данные при экспорте Уведомления Gadgetbridge - Активность Настройки Amazfit Cors Уведомления @@ -580,12 +559,8 @@ Ещё Музыка Калибровать устройство - - Когда устройство завибрирует, встряхните его или нажмите на кнопку. - Калибровать устройство - Минут: Часов: Секунд: @@ -606,7 +581,6 @@ Файлы журнала (log-файлы) Gadgetbridge могут содержать различную личную информацию, такую как уникальные идентификаторы (например, MAC-адрес устройства), информацию о музыкальных предпочтениях и т.д. Рекомендуется редактирование файла журнала и удаление личной информации перед отправкой в публичном отчете о проблеме. Внимание! Нет данных - Минимальный интервал между уведомлениями Без ограничений 5 секунд @@ -617,20 +591,15 @@ 5 минут 10 минут 30 минут - Ночной режим Автоматически снижать яркость экрана устройства по ночам - На закате Принято - Изменить цвет излучения светодиода Изменить частоту УКВ Roidmi Roidmi 3 - Цвет излучения светодиода - Частота УКВ Недопустимая частота Выберите, пожалуйста, частоту в интервале 87.5—108 @@ -640,13 +609,11 @@ Настройки статистики активности Максимальный пульс Минимальный пульс - -Справа налево + Справа налево Включите, если ваше устройство поддерживает ввод справа налево Максимальная длина строки при вводе справа налево Изменяет длину строк, на которые разбит текст при вводе справа налево - Контекстные формы для арабского языка Включает поддержку контекстных форм арабского языка Поддержка ввода справа налево - + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4e83d786d..e23269543 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,6 +1,6 @@ -Gadgetbridge - + + Gadgetbridge Gadgetbridge 设置 调试 @@ -19,12 +19,9 @@ 关闭导航菜单 长按此卡片以断开连接 断开中 - 连接中 + 连接中… 获取设备的屏幕截图 - - 调试 - 应用管理器 已安装的应用程序 已安装的表盘 @@ -41,11 +38,8 @@ 安装天气通知应用 配置 移至顶部 - 通知黑名单 - 阻止记录 - FW/App 安装器 您即将安装固件 %s ，代替当前在小米手环上的固件。 即将在您的米动手表青春版(Amazfit Bip)上安装固件 %s 。 @@ -68,9 +62,7 @@ \n \n不建议把它安装到你的小米手环！ 如果您仍想继续并且此固件在安装之后能够正常工作，请告知 Gadgetbridge 开发者将固件 %s 列入白名单。 - 设置 - 常规设置 当蓝牙打开时连接到 Gadgetbridge 设备 自动启动 @@ -78,21 +70,16 @@ 首选音频播放器 默认 启用左右滑动切换图表 - 日期和时间 同步时间 当您 Android 设备的时区改变时，且连接到 Gadgetbridge 设备时同步时间 - 主题 亮色 暗色 - 语言 - 隐藏 Gadgetbridge 通知 状态栏中的图标和锁定屏幕中的通知已被开启 状态栏中的图标和锁定屏幕中的通知已被隐藏 - 通知 重复 来电 @@ -105,67 +92,52 @@ 此模式下将停止“不想要的通知” 音译 如果您的设备不支持您语言的字体, 请启用此功能 - 总是 当屏幕关闭时 从不 - 隐私 来电隐私模式 显示姓名和号码 隐藏姓名但显示号码 隐藏号码但显示姓名 隐藏姓名和号码 - 天气位置(CM/LOS) - 黑名单应用 黑名单列表 - 保存的消息 回复 未接来电 开发者选项 小米手环地址 - Pebble 设置 - 活动跟踪器 首选活动跟踪器 同步 Pebble 健康 同步到Misfit 同步到Morpheuz - 支持呼出 禁用此功能也将停止 Pebble 2 / LE 在拨出电话时振动 - 允许第三方 Android 应用程序访问 使用 PebbleKit 为 Android 应用程序启用实验性支持 - Pebble 时间线 日出和日落 基于 Pebble 时间表的位置发送日出和日落时间 同步记录 将记录发送到时间表 - 自动删除已错过的通知 当您从 Android 设备上删除时，通知将自动从 Pebble 中删除 - 隐私模式 正常通知 将通知文本移出屏幕 只显示通知图标 - 位置 获取位置 纬度 经度 保持位置更新 尝试在运行时获取当前位置, 使用存储的位置作为后备 - 请启用网络位置 位置已确定 - 强制通知协议 此选项强制使用最新的通知协议, 具体取决于固件版本。请确保知道您自己知道您在做什么！ 启用未经测试的功能 @@ -175,15 +147,12 @@ 这将导致发送到外部第三方应用程序的消息始终立即得到确认 启用后台JS 启用后，将允许表盘显示天气，电池等信息。 - 尝试重新连接 - 单位 时间格式 亮屏时间 全天心率测量 HPlus/Makibes设置 - 未连接 连接中 已连接 @@ -215,7 +184,6 @@ 已初始化 %1$s by %2$s 搜索设备 - 停止扫描 开始搜索 连接新设备 @@ -245,7 +213,6 @@ 设备图像 名称/别名 振动计数 - 睡眠检测 写入日志文件 初始化中 @@ -257,7 +224,6 @@ 长 闹钟 振动 - 测试 短信通知 振动设置 @@ -267,18 +233,15 @@ 聊天 导航 社交网络 - 全天心率检测 每分钟一次 每5分钟一次 每10分钟一次 每30分钟一次 每小时一次 - 速度 总分钟 每分钟步数 - 查找丢失的设备 取消以停止振动。 活动记录 @@ -343,7 +306,6 @@ 即使在同步之后, 也会将活动数据保留在小米手环上。如果 Gadgetbridge 与其他应用程序一起使用, 这将非常有用。 使用低延迟模式进行固件更新 这可能对固件失败的设备有帮助。 - 步数历史 当前每分钟步数 累计步数 @@ -359,7 +321,7 @@ 固件不兼容 此固件与设备不兼容 使用心率检测以提高睡眠检测精度 - 设备时间偏移 (用于检测倒班工作人员的睡眠) + 设备时间偏移 (用于检测倒班工作人员的睡眠) 日期格式 仅时间 时间和日期 @@ -389,25 +351,19 @@ 在一段时间内禁用久坐提醒 开始时间 结束时间 - 自动 简体中文 繁体中文 英语 - 准备从 %1$s 开始传输数据 - 正在等待重新连接 - 关于你 出生年份 性别 身高（厘米） 体重（公斤） - 认证中 需要身份验证 - Zzz 添加小部件 睡眠时间目标 @@ -419,7 +375,6 @@ 固件未发送 心率 心率 - 在数据库中存储原始记录 以“原样”保存数据，增加数据库使用量以允许稍后翻译。 数据库管理 @@ -448,12 +403,9 @@ 覆盖 取消 删除 - 振动 - Pebble 配对中 您的 Android 设备上将会弹出一个配对对话框。如果没有出现, 请查看通知栏并接受配对请求。之后, 接受你的 Pebble 配对要求。 - 请确保在天气通知应用程序中启用此外观，以获取您的 Pebble 上的天气信息。 \n \n此处不需要配置。 @@ -463,15 +415,11 @@ \n支持的表盘将会自动显示天气。 启用蓝牙配对 如果连接有问题，请停用 - 公制 英制 - 24小时制 闹钟 - Web视图Activity - (%1$s) 找到了! 小米手环2：时间格式 @@ -491,7 +439,6 @@ 选择设备以进行配对。如果失败，请重试未能配对的设备。 配对 不配对 - 在 Android 设备上打开 静音 回复 @@ -511,12 +458,9 @@ 测试设备 总是优先使用低功耗蓝牙 表盘 - 在内存缓冲区中的应用程序 在 Pebble 上升级 - 振动配置 - 响铃 要发送的广播消息 Pebble @@ -527,27 +471,21 @@ 导出位置 导出间隔 每%d小时导出一次 - 点按为已连接的设备管理应用 数据库导出失败！ 请检查您的设置。 预警未来事件 在指定按键次数后发送消息 "心率： " AM/PM - Vibratissimo HPlus 选择导出位置 -Gadgetbridge 通知 -切换 LED 灯颜色 + Gadgetbridge 通知 + 切换 LED 灯颜色 更改 FM 频率 校准设备 - - 添加所有通知到黑名单 添加所有通知到白名单 - - 您即将安装小米手环３的固件 %s 。 \n \n请确保先安装 .fw 文件，再安装 .res 文件。您的手环将会在安装 .fw 文件后重启。 @@ -560,7 +498,6 @@ 如果您的设备无法显示从右到左的语言，请选中此选项 从右到左最长字数 延长或缩短行从右到左文本分割 - 常见后缀 Pebble 2/LE GATT MTU 限制 仅限 GATT 客户端 @@ -568,19 +505,16 @@ 提前 ACK PebbleKit ID115 设置 屏幕朝向 - 自动获取活动数据 屏幕解锁时会自动获取。仅在设置了锁定机制才会有效！ 刷新最小间隔 每隔 %d 分钟刷新 - 小米手环２ 设置 小米手环３ 设置 米动 Cor 设置s 横向 纵向 当您的手环震动时，晃动设备或者按下按钮。 - 间断 %1$s 电量低 %1$s 电量低：%2$s @@ -595,7 +529,6 @@ 5 分钟 10 分钟 30 分钟 - 缺少步数：%1$d 超过步数：%1$d 当前／最大心率：%1$d / %2$d @@ -605,7 +538,6 @@ 滑动以解锁手环屏幕 夜晚模式 到夜晚时自动降低手环屏幕亮度 - 挪威语 西班牙语 俄语 @@ -615,13 +547,10 @@ 波兰语 韩语 日语 - 图表设置 最高心率 最低心率 - 好 - 开 在日落时 您的活动跟踪 @@ -640,7 +569,6 @@ 选择全部 分享 重设刷新日期 - GPS 历史 小米手环３ 实时查看 @@ -655,7 +583,6 @@ Watch 9 睿米 睿米３ - 支付宝（快捷方式） 天气（快捷方式） 状态 @@ -669,7 +596,6 @@ 支付宝 音乐 更多 - 分： 时： 秒： @@ -684,9 +610,7 @@ 请记住，Gadgetbridge 的日志文件包含许多个人信息，包括但不限于健康信息、独有身份（包括设备的 MAC 地址），音乐首选项等等。请在将日志发送到公共列表前仔细修改和删除这些信息。 警告！ 没有数据 - LED 颜色 - FM 频率 不正确的频率 请输入一个在 87.5 至 108.0 之间的频率 @@ -708,4 +632,6 @@ 模式配置 保存配置 未连接，闹钟未设定。 + 锻炼 + \ 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 74da0bc2f..60701c557 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,6 @@ Gadgetbridge - Gadgetbridge Settings Debug @@ -12,7 +11,7 @@ Take Screenshot Change LED Color Change FM Frequency - Connect + Connect… Disconnect Delete Device Delete %1$s @@ -21,16 +20,13 @@ Close navigation drawer Long press the card to disconnect Disconnecting - Connecting + Connecting… Taking a screenshot of the device Calibrate Device - - Debug Really factory reset? Doing a factory reset will delete all data from the connected device (if supported). Xiaomi/Huami devices also change Bluetooth MAC address, so they appear as a new devices to Gadgetbrige. - App Manager Apps in cache @@ -49,16 +45,12 @@ Install the Weather Notification app Configure Move to top - Notification blacklist Blacklist all for notifications Whitelist all for notifications - - Blacklisted Calendars - FW/App installer You are about to install the %s firmware instead of the one currently on your Mi Band. @@ -69,10 +61,8 @@ This firmware has been tested and is known to be compatible with Gadgetbridge. "This firmware is untested and may not be compatible with Gadgetbridge.\n\nYou are DISCOURAGED from flashing it onto your Mi Band!" If you still want to proceed and things continue to work properly afterwards, please tell the Gadgetbridge developers to whitelist the %s firmware version. - Settings - General settings Connect to Gadgetbridge device when Bluetooth is turned on Start automatically @@ -80,21 +70,16 @@ Preferred Audioplayer Default Enable left/right swipe in the charts activity - Date and Time Sync time Sync time to Gadgetbridge device when connecting, and when time or time zone changes on Android device - Theme Light Dark - Language - Hide the Gadgetbridge notification The icon in the status bar and the notification in the lockscreen are shown The icon in the status bar and the notification in the lockscreen are hidden - Notifications Repetitions Phone Calls @@ -108,76 +93,59 @@ Unwanted notifications are stopped in this mode Transliteration Enable this if your device has no support for your language\'s font - Right-To-Left Enable this if your device can not show right-to-left languages Right-To-Left Max Line Length Lengthens or shortens the lines Right-To-Left text is separated into - Always When screen is off Never - Privacy Call privacy mode Display name and number Hide name but display number Hide number but display name Hide name and number - Weather Weather location (CM/LOS) - Blacklist Apps Blacklist Calendars - Canned messages Replies Common suffix Call Dismissal Update on Pebble - Developer options Mi Band address - Pebble settings - Activity trackers Preferred activity tracker Sync Pebble Health Sync Misfit Sync Morpheuz - Support outgoing calls Disabling this will also stop the Pebble 2/LE to vibrate on outgoing calls - Allow 3rd party Android App access Enable experimental support for Android apps using PebbleKit - Pebble timeline Sunrise and sunset Send sunrise and sunset times based on the location to the Pebble timeline Sync calendar Send calendar events to the timeline - Autoremove dismissed notifications Notifications are automatically removed from the Pebble when dismissed from the Android device - Privacy mode Normal notifications Shift the notification text off-screen Show only the notification icon - Location Acquire location Latitude Longitude Keep location updated Try to get the current location at runtime, use the stored location as fallback - Please enable network location location acquired - Force notification protocol This option forces using the latest notification protocol depending on the firmware version. KNOW WHAT YOU ARE DOING! Enable untested features @@ -194,33 +162,27 @@ Will cause messages that are sent to external 3rd party apps to be acknowledged always and immediately Enable background JS When enabled, allows watchfaces to show weather, battery info etc. - Reconnection attempts - Units Time format Screen on duration All day heart rate measurement HPlus/Makibes settings - ID115 settings Screen orientation - Auto export Auto export enabled Export location Export interval Export every %d hour - Auto fetch activity data Fetch happens upon screen unlock. Only works if a lock mechanism is set! Minimum time between fetches Fetches every %d minutes - Not connected Connecting Connected @@ -246,7 +208,6 @@ initialized %1$s by %2$s Device discovery - Stop scanning Start discovery Connect new device @@ -282,7 +243,6 @@ Name/Alias Vibration count When your watch vibrates, shake the device or press its button. - Sleep monitor Write log files Initializing @@ -290,7 +250,6 @@ From %1$s to %2$s Wearing left or right? Vibration profile - Staccato Short Medium @@ -299,7 +258,6 @@ Ring Alarm clock Vibration - Try SMS notification Vibration settings @@ -309,18 +267,15 @@ Chat Navigation Social network - Whole day HR measurement once a minute every 5 minutes every 10 minutes every 30 minutes once an hour - Speed zones Total minutes Steps per minute - Find lost device Cancel to stop vibration. Your activity @@ -382,7 +337,6 @@ Clock Heart rate Battery - No limit 5 seconds 10 seconds @@ -392,7 +346,6 @@ 5 minutes 10 minutes 30 minutes - Live activity Steps today, target: %1$s Lack of steps: %1$d @@ -402,7 +355,6 @@ Will keep activity data on the Mi Band even after synchronization. Useful if GB is used together with other apps. Use low-latency mode for firmware flashing This might help on devices where firmware flashing fails. - Steps history Current steps/min Total steps @@ -426,6 +378,7 @@ Date format Time + Disconnect notification Button actions Specify actions on Mi Band 2 button press Button press count @@ -459,7 +412,6 @@ Swipe up to unlock the band\'s screen Night mode Lower band screen brightness automatically at night - Automatic Simplified Chinese Traditional Chinese @@ -473,24 +425,18 @@ Polish Korean Japanese - About to transfer data since %1$s - Waiting for reconnect - About you Year of birth Gender Height in cm Weight in kg - Chart settings Max heart rate Min heart rate - Authenticating Authentication required - Zzz Add widget Preferred sleep duration in hours @@ -503,7 +449,6 @@ Firmware not sent Heart rate Heart rate - Store raw record in the database Stores the data \"as is\", increasing the database usage to allow for later interpretation. Database management @@ -531,28 +476,20 @@ Cancel Delete OK - Vibration - Pebble pairing A pairing dialog will pop up on your Android device. If not, look in the notification drawer and accept the pairing request. Also accept it on your Pebble afterwards. - Make sure that this skin is enabled in the Weather Notification app to get weather information on your Pebble.\n\nNo configuration is needed here.\n\nYou can enable the system weather app of your Pebble from the app management.\n\nSupported watchfaces will show the weather automatically. Enable Bluetooth pairing Deactivate this if you have trouble connecting - Metric Imperial - 24H AM/PM - Alarm clock - Web View Activity - (%1$s) You found it! Mi2: Time format @@ -574,12 +511,10 @@ Select Pair to pair your devices. If this fails, try again without pairing. Pair Don\'t Pair - Open on Android device Mute Reply - Your activity tracks Not measured Activity @@ -597,7 +532,6 @@ Select all Share Reset fetch date - Firmware Invalid data Font @@ -606,7 +540,6 @@ GPS Error Correction Resources Watchface - Unknown Device Test Device Pebble @@ -631,10 +564,8 @@ Roidmi 3 Casio GB-6900 Mi Scale 2 - Choose export location Gadgetbridge notifications - Alipay (Shortcut) Weather (Shortcut) @@ -649,7 +580,6 @@ Alipay Music More - Minutes: Hours: Seconds: @@ -664,18 +594,14 @@ Please keep in mind Gadgetbridge logs files that may contain lots of personal info, including but not limited to health data, unique identifiers (such as a device\'s MAC address), music preferences, etc. Consider editing the file and removing this info before sending the file to a public issue report. Warning! No data - LED Color - FM Frequency Invalid frequency Please enter a frequency between 87.5 and 108.0 Language and region settings - - Notification Filter App must not be blacklisted to be configured Enter desired words, new line for each diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index 6210076c0..b5b411f8f 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -1,5 +1,17 @@ + + Fix a crash in charts due to a broken German translation + Fix a crash when transliterating emoji + Amazfit Bip/Cor: Support disconnect notification (must be configured in Bip settings for Cor also for now) + + + Fix setting alarms under some circumstances + Support calls notifications for some VoIP apps + Mi Band 3: Enable fetching sports activities (currently only useful for flushing activities) + Casio: Improve stability + Casio: Add explicit support for GB-6900B, GB-X6900B and GB-5600B + Fix db deadlock on alarm migration diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 95c8cd731..2b451bf11 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -342,6 +342,33 @@ android:key="bip_display_items" android:summary="@string/mi2_prefs_display_items_summary" android:title="@string/mi2_prefs_display_items"/> + + + + + + + + + + + + +