From 8d7f170c70ff386a5b0ff64c2a88839fb739bf83 Mon Sep 17 00:00:00 2001
From: mamutcho <mamut_killer@yahoo.com>
Date: Wed, 18 Dec 2019 23:09:26 +0200
Subject: [PATCH] Add support for Watch X Plus with same MAC as Watch 9

---
 .../gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 08d8d1d04..9a3d1de06 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
@@ -64,7 +64,8 @@ public class Watch9DeviceCoordinator extends AbstractDeviceCoordinator {
         if (candidate.supportsService(Watch9Constants.UUID_SERVICE_WATCH9)) {
             return DeviceType.WATCH9;
             // add support for Watch X non-plus (same MAC address)
-        } else if ((macAddress.startsWith("1C:87:79")) && (!deviceName.equalsIgnoreCase("WATCH X"))) {
+            // add support for Watch X Plus (same MAC address)
+        } else if ((macAddress.startsWith("1C:87:79")) && ((!deviceName.equalsIgnoreCase("WATCH X")) || (!deviceName.equalsIgnoreCase("WATCH XPLUS")))) {
             return DeviceType.WATCH9;
         } else if (deviceName.equals("WATCH 9")) {
             return DeviceType.WATCH9;