From e9982ccd5631fc2aeae6954e9fc16845742db359 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 11 Jan 2019 23:26:00 +0100
Subject: [PATCH] remove supportsAlarmConfiguration() in favor of
 getAlarmSlotCount()

Coordinator that do not support alarms return 0 anyway.
---
 .../gadgetbridge/adapter/GBDeviceAdapterv2.java        |  2 +-
 .../gadgetbridge/devices/DeviceCoordinator.java        |  9 ++-------
 .../gadgetbridge/devices/UnknownDeviceCoordinator.java |  5 -----
 .../casiogb6900/CasioGB6900DeviceCoordinator.java      |  7 +------
 .../gadgetbridge/devices/hplus/HPlusCoordinator.java   |  6 ------
 .../gadgetbridge/devices/huami/HuamiCoordinator.java   |  5 -----
 .../gadgetbridge/devices/id115/ID115Coordinator.java   |  5 -----
 .../devices/jyou/TeclastH30Coordinator.java            | 10 +---------
 .../devices/liveview/LiveviewCoordinator.java          |  5 -----
 .../gadgetbridge/devices/miband/MiBandCoordinator.java |  7 -------
 .../gadgetbridge/devices/no1f1/No1F1Coordinator.java   |  8 +-------
 .../gadgetbridge/devices/pebble/PebbleCoordinator.java |  5 -----
 .../gadgetbridge/devices/roidmi/RoidmiCoordinator.java |  6 ------
 .../devices/vibratissimo/VibratissimoCoordinator.java  |  7 -------
 .../devices/watch9/Watch9DeviceCoordinator.java        |  5 -----
 .../gadgetbridge/devices/xwatch/XWatchCoordinator.java |  7 +------
 .../gadgetbridge/devices/zetime/ZeTimeCoordinator.java |  5 -----
 17 files changed, 7 insertions(+), 97 deletions(-)

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 9c38d606e..95a25d345 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
@@ -196,7 +196,7 @@ public class GBDeviceAdapterv2 extends RecyclerView.Adapter<GBDeviceAdapterv2.Vi
         );
 
         //set alarms
-        holder.setAlarmsView.setVisibility(coordinator.supportsAlarmConfiguration() ? View.VISIBLE : View.GONE);
+        holder.setAlarmsView.setVisibility(coordinator.getAlarmSlotCount() > 0 ? View.VISIBLE : View.GONE);
         holder.setAlarmsView.setOnClickListener(new View.OnClickListener()
 
                                                 {
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 f353b76c1..cbfd06f92 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -181,15 +181,10 @@ public interface DeviceCoordinator {
      */
     boolean supportsScreenshots();
 
-    /**
-     * Returns true if this device/coordinator supports setting alarms.
-     *
-     * @return
-     */
-    boolean supportsAlarmConfiguration();
-
     /**
      * Returns the number of alarms this device/coordinator supports
+     * Shall return 0 also if it is not possible to set alarms via
+     * protocol, but only on the smart device itself.
      *
      * @return
      */
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 adcdbcbf1..fa5842a0e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java
@@ -137,11 +137,6 @@ public class UnknownDeviceCoordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount() {
         return 0;
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 f5d5cec04..812b3d682 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
@@ -116,14 +116,9 @@ public class CasioGB6900DeviceCoordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount() {
-        return 5; // 4 regular and one snooze but not yet implemented
+        return 0; // 4 regular and one snooze but not yet implemented
     }
 
     @Override
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 bb6ede5a1..ea1fb22cf 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
@@ -36,7 +36,6 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
-import nodomain.freeyourgadget.gadgetbridge.activities.charts.ChartsActivity;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
@@ -143,11 +142,6 @@ public class HPlusCoordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return true;
-    }
-
     @Override
     public int getAlarmSlotCount() {
         return 3; // FIXME - check the real value
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 4f57e5d50..7dfd1397b 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
@@ -103,11 +103,6 @@ public abstract class HuamiCoordinator extends AbstractDeviceCoordinator {
         return true;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return true;
-    }
-
     @Override
     public int getAlarmSlotCount() {
         return 10;
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 150517013..0ced223a9 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
@@ -105,11 +105,6 @@ public class ID115Coordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount() {
         return 0;
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 78e0b8b81..c290b1a4a 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
@@ -26,9 +26,7 @@ import android.os.Build;
 import android.os.ParcelUuid;
 import android.support.annotation.NonNull;
 
-import de.greenrobot.dao.query.QueryBuilder;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
-import nodomain.freeyourgadget.gadgetbridge.activities.charts.ChartsActivity;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
@@ -37,7 +35,6 @@ import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
-import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 
 import org.slf4j.Logger;
@@ -144,14 +141,9 @@ public class TeclastH30Coordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return true;
-    }
-
     @Override
     public int getAlarmSlotCount() {
-        return 3; // FIXME - check the real value
+        return 3;
     }
 
     @Override
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 27c36ff82..03e2ce0e8 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
@@ -79,11 +79,6 @@ public class LiveviewCoordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount() {
         return 0;
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 493607b56..290e07868 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
@@ -36,8 +36,6 @@ import java.util.Collections;
 import de.greenrobot.dao.query.QueryBuilder;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
-import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.activities.charts.ChartsActivity;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
@@ -131,11 +129,6 @@ public class MiBandCoordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return true;
-    }
-
     @Override
     public int getAlarmSlotCount() {
         return 3;
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 a6fa79586..eaec8236a 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
@@ -32,7 +32,6 @@ import java.util.Collections;
 
 import de.greenrobot.dao.query.QueryBuilder;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
-import nodomain.freeyourgadget.gadgetbridge.activities.charts.ChartsActivity;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
@@ -107,14 +106,9 @@ public class No1F1Coordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return true;
-    }
-
     @Override
     public int getAlarmSlotCount() {
-        return 3; // FIXME - check the real value
+        return 3;
     }
 
     @Override
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 fe0f35ba2..1d0dba464 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
@@ -116,11 +116,6 @@ public class PebbleCoordinator extends AbstractDeviceCoordinator {
         return true;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount() {
         return 0;
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 9bbf91f37..4f5aee659 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
@@ -17,7 +17,6 @@
 package nodomain.freeyourgadget.gadgetbridge.devices.roidmi;
 
 import android.app.Activity;
-import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.net.Uri;
 import android.support.annotation.NonNull;
@@ -83,11 +82,6 @@ public abstract class RoidmiCoordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount() {
         return 0;
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 d6a81e7d1..2c01713dd 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
@@ -23,8 +23,6 @@ import android.net.Uri;
 import android.support.annotation.NonNull;
 
 import nodomain.freeyourgadget.gadgetbridge.GBException;
-import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.activities.VibrationActivity;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
@@ -80,11 +78,6 @@ public class VibratissimoCoordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return false;
-    }
-
     @Override
     public int getAlarmSlotCount() {
         return 0;
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 efe83c810..cdb40e23f 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
@@ -112,11 +112,6 @@ public class Watch9DeviceCoordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return true;
-    }
-
     @Override
     public int getAlarmSlotCount() {
         return 3; // FIXME - check the real value
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 a4ffe7a10..41e955179 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
@@ -86,14 +86,9 @@ public class XWatchCoordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return true;
-    }
-
     @Override
     public int getAlarmSlotCount() {
-        return 3; // FIXME - check the real value
+        return 0;
     }
 
     @Override
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 1093c9e45..3f290374f 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
@@ -74,11 +74,6 @@ public class ZeTimeCoordinator extends AbstractDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmConfiguration() {
-        return true;
-    }
-
     @Override
     public int getAlarmSlotCount() {
         return 3; // FIXME - check the real value