From 10a15d79fd2f7388fc63b76ea823b1d847f8bcb1 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sun, 15 Dec 2019 20:46:07 +0100 Subject: [PATCH 1/4] add missing file --- .../xml/devicesettings_reserve_alarms_calendar.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 app/src/main/res/xml/devicesettings_reserve_alarms_calendar.xml diff --git a/app/src/main/res/xml/devicesettings_reserve_alarms_calendar.xml b/app/src/main/res/xml/devicesettings_reserve_alarms_calendar.xml new file mode 100644 index 000000000..4b2d5b7b4 --- /dev/null +++ b/app/src/main/res/xml/devicesettings_reserve_alarms_calendar.xml @@ -0,0 +1,12 @@ + + + + + + From 85e7f3201924b953eca2441045df67fc51f62622 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sun, 15 Dec 2019 21:35:34 +0100 Subject: [PATCH 2/4] mention Gordon Williams as Bangle.js code contributor in README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index da40517f6..972d1338a 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,7 @@ Please see [FEATURES.md](https://codeberg.org/Freeyourgadget/Gadgetbridge/src/ma * Johannes Schmitt (BFH-16) * Lukas Schwichtenberg (Makibes HR3) * Daniel Dakhno (Fossil Q Hybrid) +* Gordon Williams (Bangle.js) ## Contribute From 171f283ca8e4e92325f4f7f958422c3ae1fc3353 Mon Sep 17 00:00:00 2001 From: License Bot Date: Sun, 15 Dec 2019 22:07:00 +0100 Subject: [PATCH 3/4] Update license headers --- .../devices/banglejs/BangleJSConstants.java | 16 ++++++++++++++++ .../devices/banglejs/BangleJSCoordinator.java | 17 +++++++++++++++++ .../gadgetbridge/model/DeviceType.java | 8 ++++---- .../gadgetbridge/service/btle/GattCallback.java | 16 ++++++++++++++++ .../devices/banglejs/BangleJSDeviceSupport.java | 16 ++++++++++++++++ .../gadgetbridge/util/DeviceHelper.java | 9 +++++---- 6 files changed, 74 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSConstants.java index cb1c47165..dfcb8470b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSConstants.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSConstants.java @@ -1,3 +1,19 @@ +/* Copyright (C) 2019 Gordon Williams + + 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.banglejs; import java.util.UUID; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSCoordinator.java index b6bcd466c..b6a29e229 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSCoordinator.java @@ -1,3 +1,20 @@ +/* Copyright (C) 2016-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniele + Gobbetti, Gordon Williams, 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.banglejs; import android.annotation.TargetApi; 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 f02b327bc..9625f0db8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java @@ -1,8 +1,8 @@ /* Copyright (C) 2015-2019 Andreas Böhler, Andreas Shimokawa, Carsten - Pfeiffer, Cre3per, Daniel Dakhno, Daniele Gobbetti, Jean-François Greffier, - João Paulo Barraca, José Rebelo, Kranz, ladbsoft, Manuel Ruß, maxirnilian, - protomors, Quallenauge, Sami Alaoui, Sebastian Kranz, Sophanimus, tiparega, - Vadim Kaushan + Pfeiffer, Cre3per, Daniel Dakhno, Daniele Gobbetti, Gordon Williams, + Jean-François Greffier, João Paulo Barraca, José Rebelo, Kranz, ladbsoft, + Manuel Ruß, maxirnilian, protomors, Quallenauge, Sami Alaoui, Sebastian + Kranz, Sophanimus, tiparega, Vadim Kaushan This file is part of Gadgetbridge. diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCallback.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCallback.java index 16ec0f4f8..a15f24076 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCallback.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCallback.java @@ -1,3 +1,19 @@ +/* Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniel Dakhno + + 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 . */ /* * Copyright (C) 2013 The Android Open Source Project * diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java index 638ffae11..ccb2ce3ae 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java @@ -1,3 +1,19 @@ +/* Copyright (C) 2019 Andreas Shimokawa, Gordon Williams + + This file is part of Gadgetbridge. + + Gadgetbridge is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Gadgetbridge is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.service.devices.banglejs; import android.bluetooth.BluetoothGatt; 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 ff91bdf73..4ac3037d4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java @@ -1,7 +1,8 @@ -/* Copyright (C) 2015-2019 0nse, Andreas Böhler, Andreas Shimokawa, Carsten - Pfeiffer, Cre3per, Daniel Dakhno, Daniele Gobbetti, Jean-François Greffier, - João Paulo Barraca, José Rebelo, Kranz, ladbsoft, Manuel Ruß, maxirnilian, - protomors, Quallenauge, Sami Alaoui, Sophanimus, tiparega, Vadim Kaushan +/* Copyright (C) 2015-2019 0nse, Andreas Böhler, Andreas Shimokawa, + Carsten Pfeiffer, Cre3per, Daniel Dakhno, Daniele Gobbetti, Gordon Williams, + Jean-François Greffier, João Paulo Barraca, José Rebelo, Kranz, ladbsoft, + Manuel Ruß, maxirnilian, protomors, Quallenauge, Sami Alaoui, Sophanimus, + tiparega, Vadim Kaushan This file is part of Gadgetbridge. From c04e3686310b46b17136174c27d65ff95f88c17a Mon Sep 17 00:00:00 2001 From: License Bot Date: Sun, 15 Dec 2019 22:10:00 +0100 Subject: [PATCH 4/4] Update license headers --- .../gadgetbridge/service/DeviceSupportFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 d0519fdcd..b30bf3db8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java @@ -1,8 +1,8 @@ /* Copyright (C) 2015-2019 0nse, Andreas Böhler, Andreas Shimokawa, Carsten - Pfeiffer, Cre3per, criogenic, Daniel Dakhno, Daniele Gobbetti, Jean-François - Greffier, João Paulo Barraca, José Rebelo, Kranz, ladbsoft, Manuel Ruß, - maxirnilian, protomors, Quallenauge, Sami Alaoui, Sergey Trofimov, Sophanimus, - tiparega, Vadim Kaushan + Pfeiffer, Cre3per, criogenic, Daniel Dakhno, Daniele Gobbetti, Gordon Williams, + Jean-François Greffier, João Paulo Barraca, José Rebelo, Kranz, ladbsoft, + Manuel Ruß, maxirnilian, protomors, Quallenauge, Sami Alaoui, Sergey Trofimov, + Sophanimus, tiparega, Vadim Kaushan This file is part of Gadgetbridge.