From b142add631bd685ed290a8e5c4879670658195fd Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Mon, 17 Apr 2017 23:00:16 +0200
Subject: [PATCH] Pass a GBDevice instead of GBDeviceCandidate to
 getBondingStyle() #651

---
 .../gadgetbridge/activities/DiscoveryActivity.java           | 2 +-
 .../gadgetbridge/devices/AbstractDeviceCoordinator.java      | 2 +-
 .../gadgetbridge/devices/DeviceCoordinator.java              | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

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 b0a5f04a..6c80cf76 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
@@ -584,7 +584,7 @@ public class DiscoveryActivity extends GBActivity implements AdapterView.OnItemC
             startActivity(intent);
         } else {
             GBDevice device = DeviceHelper.getInstance().toSupportedDevice(deviceCandidate);
-            int bondingStyle = coordinator.getBondingStyle(deviceCandidate);
+            int bondingStyle = coordinator.getBondingStyle(device);
             if (bondingStyle == DeviceCoordinator.BONDING_STYLE_NONE) {
                 LOG.info("No bonding needed, according to coordinator, so connecting right away");
                 connectAndFinish(device);
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 055156a4..7c4e0412 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -121,7 +121,7 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
     }
 
     @Override
-    public int getBondingStyle(GBDeviceCandidate deviceCandidate) {
+    public int getBondingStyle(GBDevice device) {
         return BONDING_STYLE_ASK;
     }
 }
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 9b74d3f7..515a6e23 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -23,7 +23,6 @@ import android.bluetooth.le.ScanFilter;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
@@ -225,7 +224,7 @@ public interface DeviceCoordinator {
 
     /**
      * Returns how/if the given device should be bonded before connecting to it.
-     * @param deviceCandidate
+     * @param device
      */
-    int getBondingStyle(GBDeviceCandidate deviceCandidate);
+    int getBondingStyle(GBDevice device);
 }