From db4261e02bcd56e81d40245e0dec6e6d36879f24 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Mon, 3 Aug 2015 23:51:53 +0200 Subject: [PATCH] More refactoring: new service/devices package and service/bt package --- .../gadgetbridge/devices/pebble/PBWReader.java | 2 +- .../service/BluetoothCommunicationService.java | 4 ++-- .../service/{ => bt}/AbstractBTDeviceSupport.java | 3 ++- .../gadgetbridge/service/{ => bt}/GBDeviceIoThread.java | 2 +- .../gadgetbridge/service/{ => bt}/GBDeviceProtocol.java | 2 +- .../service/{ => devices}/miband/AbstractInfo.java | 2 +- .../service/{ => devices}/miband/BatteryInfo.java | 2 +- .../service/{ => devices}/miband/DeviceInfo.java | 2 +- .../service/{ => devices}/miband/MiBandSupport.java | 2 +- .../{ => devices}/pebble/GadgetbridgePblSupport.java | 2 +- .../service/{ => devices}/pebble/MorpheuzSupport.java | 2 +- .../service/{ => devices}/pebble/PebbleIoThread.java | 6 +++--- .../service/{ => devices}/pebble/PebbleProtocol.java | 4 ++-- .../service/{ => devices}/pebble/PebbleSupport.java | 8 ++++---- .../service/{ => devices}/pebble/WeatherNeatSupport.java | 2 +- 15 files changed, 23 insertions(+), 22 deletions(-) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => bt}/AbstractBTDeviceSupport.java (97%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => bt}/GBDeviceIoThread.java (92%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => bt}/GBDeviceProtocol.java (96%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => devices}/miband/AbstractInfo.java (74%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => devices}/miband/BatteryInfo.java (93%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => devices}/miband/DeviceInfo.java (92%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => devices}/miband/MiBandSupport.java (99%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => devices}/pebble/GadgetbridgePblSupport.java (98%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => devices}/pebble/MorpheuzSupport.java (99%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => devices}/pebble/PebbleIoThread.java (98%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => devices}/pebble/PebbleProtocol.java (99%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => devices}/pebble/PebbleSupport.java (77%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/{ => devices}/pebble/WeatherNeatSupport.java (96%) 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 f1329f7d..83a0e99c 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 @@ -22,7 +22,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp; -import nodomain.freeyourgadget.gadgetbridge.service.pebble.PebbleProtocol; +import nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.PebbleProtocol; public class PBWReader { private static final Logger LOG = LoggerFactory.getLogger(PBWReader.class); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/BluetoothCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/BluetoothCommunicationService.java index 2785bfb5..195819ae 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/BluetoothCommunicationService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/BluetoothCommunicationService.java @@ -31,8 +31,8 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice.State; import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.model.Alarm; -import nodomain.freeyourgadget.gadgetbridge.service.miband.MiBandSupport; -import nodomain.freeyourgadget.gadgetbridge.service.pebble.PebbleSupport; +import nodomain.freeyourgadget.gadgetbridge.service.devices.miband.MiBandSupport; +import nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.PebbleSupport; public class BluetoothCommunicationService extends Service { public static final String ACTION_START diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractBTDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/AbstractBTDeviceSupport.java similarity index 97% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractBTDeviceSupport.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/AbstractBTDeviceSupport.java index 98458db1..080781f1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractBTDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/AbstractBTDeviceSupport.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service; +package nodomain.freeyourgadget.gadgetbridge.service.bt; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,6 +9,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.EventHandler; import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes; +import nodomain.freeyourgadget.gadgetbridge.service.AbstractDeviceSupport; /** * An abstract base class for all devices connected via Bluetooth diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/GBDeviceIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceIoThread.java similarity index 92% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/GBDeviceIoThread.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceIoThread.java index 11880def..6a5666e6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/GBDeviceIoThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceIoThread.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service; +package nodomain.freeyourgadget.gadgetbridge.service.bt; import android.content.Context; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/GBDeviceProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceProtocol.java similarity index 96% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/GBDeviceProtocol.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceProtocol.java index 4de1239b..0066a914 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/GBDeviceProtocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/bt/GBDeviceProtocol.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service; +package nodomain.freeyourgadget.gadgetbridge.service.bt; import java.util.UUID; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/AbstractInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractInfo.java similarity index 74% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/AbstractInfo.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractInfo.java index 479160d6..c68d135f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/AbstractInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractInfo.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service.miband; +package nodomain.freeyourgadget.gadgetbridge.service.devices.miband; public class AbstractInfo { protected byte[] mData; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/BatteryInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java similarity index 93% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/BatteryInfo.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java index ccfec1ec..8509bc1a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/BatteryInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service.miband; +package nodomain.freeyourgadget.gadgetbridge.service.devices.miband; import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.R; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/DeviceInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java similarity index 92% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/DeviceInfo.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java index 98319946..20bd1066 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/DeviceInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service.miband; +package nodomain.freeyourgadget.gadgetbridge.service.devices.miband; import java.util.Locale; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java similarity index 99% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/MiBandSupport.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java index 3c2457a9..b4c502fe 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/MiBandSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service.miband; +package nodomain.freeyourgadget.gadgetbridge.service.devices.miband; import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGattCharacteristic; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/GadgetbridgePblSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/GadgetbridgePblSupport.java similarity index 98% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/GadgetbridgePblSupport.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/GadgetbridgePblSupport.java index 091a74e8..0c709d9e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/GadgetbridgePblSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/GadgetbridgePblSupport.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service.pebble; +package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble; import android.util.Pair; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/MorpheuzSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/MorpheuzSupport.java similarity index 99% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/MorpheuzSupport.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/MorpheuzSupport.java index 35735923..a557ed80 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/MorpheuzSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/MorpheuzSupport.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service.pebble; +package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble; import android.util.Pair; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java similarity index 98% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleIoThread.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java index 7406dcf5..0f50e69f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleIoThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service.pebble; +package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; @@ -23,12 +23,12 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PBWReader; import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PebbleInstallable; -import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceIoThread; +import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceIoThread; import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppInfo; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppManagementResult; -import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceProtocol; +import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceProtocol; public class PebbleIoThread extends GBDeviceIoThread { private static final Logger LOG = LoggerFactory.getLogger(PebbleIoThread.class); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java similarity index 99% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleProtocol.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java index 8a388544..d4203333 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleProtocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service.pebble; +package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble; import android.util.Pair; @@ -24,7 +24,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicContr import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventScreenshot; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo; -import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceProtocol; +import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceProtocol; public class PebbleProtocol extends GBDeviceProtocol { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java similarity index 77% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleSupport.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java index 05dd2f7c..518b50af 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java @@ -1,13 +1,13 @@ -package nodomain.freeyourgadget.gadgetbridge.service.pebble; +package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble; import android.net.Uri; import java.util.ArrayList; import nodomain.freeyourgadget.gadgetbridge.model.Alarm; -import nodomain.freeyourgadget.gadgetbridge.service.AbstractBTDeviceSupport; -import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceIoThread; -import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceProtocol; +import nodomain.freeyourgadget.gadgetbridge.service.bt.AbstractBTDeviceSupport; +import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceIoThread; +import nodomain.freeyourgadget.gadgetbridge.service.bt.GBDeviceProtocol; public class PebbleSupport extends AbstractBTDeviceSupport { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/WeatherNeatSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/WeatherNeatSupport.java similarity index 96% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/WeatherNeatSupport.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/WeatherNeatSupport.java index 837bcf82..0ddc190d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/WeatherNeatSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/WeatherNeatSupport.java @@ -1,4 +1,4 @@ -package nodomain.freeyourgadget.gadgetbridge.service.pebble; +package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble; import android.util.Pair;