From 2147ab49482b4b607c9ce30e7c30d5c0f493e6bf Mon Sep 17 00:00:00 2001 From: Daniele Gobbetti Date: Fri, 27 Jul 2018 15:13:21 +0200 Subject: [PATCH] Revert "Revert "remove unused getPrimaryActivity() from coodinators, mark Mi Band HRX as non-heartrate"" This reverts commit 63231ec49aef0b71d3d25f7136dfe345c62a70ff. Please note that the comment of the reverted commit was inaccurate, as the Mi Band HRX was left untouched by it and is left untouched byt this commit. --- .../gadgetbridge/devices/DeviceCoordinator.java | 9 --------- .../gadgetbridge/devices/UnknownDeviceCoordinator.java | 5 ----- .../gadgetbridge/devices/hplus/HPlusCoordinator.java | 5 ----- .../devices/huami/miband2/MiBand2HRXCoordinator.java | 7 ------- .../gadgetbridge/devices/jyou/TeclastH30Coordinator.java | 5 ----- .../devices/liveview/LiveviewCoordinator.java | 5 ----- .../gadgetbridge/devices/miband/MiBandCoordinator.java | 5 ----- .../gadgetbridge/devices/no1f1/No1F1Coordinator.java | 6 ------ .../gadgetbridge/devices/pebble/PebbleCoordinator.java | 5 ----- .../devices/vibratissimo/VibratissimoCoordinator.java | 5 ----- 10 files changed, 57 deletions(-) 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 d02f54ccbb..45d4150ebd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java @@ -123,15 +123,6 @@ public interface DeviceCoordinator { @Nullable Class getPairingActivity(); - /** - * Returns the Activity class that will be used as the primary activity - * for the given device. - * - * @return the primary activity class, or null if none - */ - @Nullable - Class getPrimaryActivity(); - /** * Returns true if activity data fetching is supported by the device * (with this coordinator). 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 171908c1a8..e354174496 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java @@ -112,11 +112,6 @@ public class UnknownDeviceCoordinator extends AbstractDeviceCoordinator { return ControlCenterv2.class; } - @Override - public Class getPrimaryActivity() { - return null; - } - @Override public SampleProvider getSampleProvider(GBDevice device, DaoSession session) { return new UnknownSampleProvider(); 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 036db01107..44499980be 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 @@ -113,11 +113,6 @@ public class HPlusCoordinator extends AbstractDeviceCoordinator { return null; } - @Override - public Class getPrimaryActivity() { - return ChartsActivity.class; - } - @Override public InstallHandler findInstallHandler(Uri uri, Context context) { return null; 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 65ff8371b0..f45879b255 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 @@ -16,12 +16,10 @@ along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband2; -import android.app.Activity; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.net.Uri; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -76,9 +74,4 @@ public class MiBand2HRXCoordinator extends HuamiCoordinator { return false; } - @Nullable - @Override - public Class getPrimaryActivity() { - return null; - } } 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 f5f26d2ee4..4d3e98dbd0 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 @@ -99,11 +99,6 @@ public class TeclastH30Coordinator extends AbstractDeviceCoordinator { return null; } - @Override - public Class getPrimaryActivity() { - return ChartsActivity.class; - } - @Override public InstallHandler findInstallHandler(Uri uri, Context context) { return null; 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 41ccdbae66..7b93b6913a 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 @@ -54,11 +54,6 @@ public class LiveviewCoordinator extends AbstractDeviceCoordinator { return null; } - @Override - public Class getPrimaryActivity() { - return null; - } - @Override public InstallHandler findInstallHandler(Uri uri, Context context) { return null; 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 0682f722ee..f9a2063c4e 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 @@ -110,11 +110,6 @@ public class MiBandCoordinator extends AbstractDeviceCoordinator { return MiBandPairingActivity.class; } - @Override - public Class getPrimaryActivity() { - return ChartsActivity.class; - } - @Override public SampleProvider getSampleProvider(GBDevice device, DaoSession session) { return new MiBandSampleProvider(device, session); 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 7f9bfeb3fa..373f59aac5 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 @@ -82,12 +82,6 @@ public class No1F1Coordinator extends AbstractDeviceCoordinator { return null; } - @Nullable - @Override - public Class getPrimaryActivity() { - return ChartsActivity.class; - } - @Override public boolean supportsActivityDataFetching() { return true; 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 322dccc7ba..d94a490f7a 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 @@ -66,11 +66,6 @@ public class PebbleCoordinator extends AbstractDeviceCoordinator { return PebblePairingActivity.class; } - @Override - public Class getPrimaryActivity() { - return AppManagerActivity.class; - } - @Override protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException { Long deviceId = device.getId(); 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 e99fc48d51..55ca064bd7 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 @@ -55,11 +55,6 @@ public class VibratissimoCoordinator extends AbstractDeviceCoordinator { return null; } - @Override - public Class getPrimaryActivity() { - return VibrationActivity.class; - } - @Override public InstallHandler findInstallHandler(Uri uri, Context context) { return null;