Update device manufacturers

While it doesn't always match the actual manufacturer, this aligns more
closely with what users expect.

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds3ProDeviceCoordinator.java

@@ -20,10 +20,7 @@ import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
-import android.content.SharedPreferences;
 
-import nodomain.freeyourgadget.gadgetbridge.GBApplication;
-import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
 
@@ -58,7 +55,6 @@ public class GalaxyBuds3ProDeviceCoordinator extends GalaxyBudsGenericCoordinato
         };
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_galaxybuds_3_pro;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/gloryfit/watches/R1Coordinator.kt

@@ -6,7 +6,7 @@ import java.util.regex.Pattern
 
 class R1Coordinator : GloryFitCoordinator() {
     override fun getManufacturer(): String {
-        return "Gloryfit"
+        return "GloryFit"
     }
 
     override fun getSupportedDeviceName(): Pattern? {

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/gloryfit/watches/S52Coordinator.kt

@@ -24,7 +24,7 @@ import java.util.regex.Pattern
 /// #5063
 class S52Coordinator : GloryFitCoordinator() {
     override fun getManufacturer(): String {
-        return "Unspecified"
+        return "GloryFit"
     }
 
     override fun getSupportedDeviceName(): Pattern? {

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/gloryfit/watches/Y66Coordinator.kt

@@ -23,7 +23,7 @@ import java.util.regex.Pattern
 
 class Y66Coordinator : GloryFitCoordinator() {
     override fun getManufacturer(): String {
-        return "Unspecified"
+        return "GloryFit"
     }
 
     override fun getSupportedDeviceName(): Pattern? {

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/Q8Coordinator.java

@@ -54,9 +54,4 @@ public class Q8Coordinator extends HPlusCoordinator {
     public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
         return Q8Support.class;
     }
-
-    @Override
-    public DeviceKind getDeviceKind(@NonNull GBDevice device) {
-        return DeviceKind.FITNESS_BAND;
-    }
 }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagCoordinator.java

@@ -60,7 +60,7 @@ public class ITagCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public String getManufacturer() {
-        return "Unspecified"; //TODO: Show chip manufacturer?
+        return "Unknown"; //TODO: Show chip manufacturer?
     }
 
     @Override

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java

@@ -114,7 +114,7 @@ public class WatchXPlusDeviceCoordinator extends AbstractBLEDeviceCoordinator {
     }
 
     @Override
-    public boolean supportsActivityDataFetching(final GBDevice device) {
+    public boolean supportsActivityDataFetching(@NonNull final GBDevice device) {
         return true;
     }
 
@@ -134,7 +134,7 @@ public class WatchXPlusDeviceCoordinator extends AbstractBLEDeviceCoordinator {
     }
 
     @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
+    public boolean supportsHeartRateMeasurement(@NonNull GBDevice device) {
         return true;
     }
 
@@ -144,7 +144,7 @@ public class WatchXPlusDeviceCoordinator extends AbstractBLEDeviceCoordinator {
     }
 
     @Override
-    public boolean supportsWeather(final GBDevice device) {
+    public boolean supportsWeather(@NonNull final GBDevice device) {
         return true;
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/C20Coordinator.java

@@ -41,7 +41,7 @@ public class C20Coordinator extends AbstractMoyoungDeviceCoordinator {
 
     @Override
     public String getManufacturer() {
-        return "Unspecified";
+        return "Mo Young / Da Fit";
     }
 
     @Override

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/HC96Coordinator.java

@@ -43,7 +43,7 @@ public class HC96Coordinator extends AbstractMoyoungDeviceCoordinator {
 
     @Override
     public String getManufacturer() {
-        return "Unspecified";
+        return "Mo Young / Da Fit";
     }
 
     @Override

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/KT80Coordinator.java

@@ -43,7 +43,7 @@ public class KT80Coordinator extends AbstractMoyoungDeviceCoordinator {
 
     @Override
     public String getManufacturer() {
-        return "Unspecified";
+        return "Mo Young / Da Fit";
     }
 
     @Override

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/R50ProCoordinator.java

@@ -41,7 +41,7 @@ public class R50ProCoordinator extends AbstractMoyoungDeviceCoordinator {
 
     @Override
     public String getManufacturer() {
-        return "Unspecified";
+        return "Mo Young / Da Fit";
     }
 
     @Override

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java

@@ -88,7 +88,7 @@ public class No1F1Coordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public String getManufacturer() {
-        return "NO1";
+        return "No.1";
     }
 
     @Override

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/polar/AbstractPolarDeviceCoordinator.java

@@ -41,7 +41,7 @@ public abstract class AbstractPolarDeviceCoordinator extends AbstractBLEDeviceCo
 
     @Override
     public String getManufacturer() {
-        return "Polar Electro Oy";
+        return "Polar";
     }
 
     @Override

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java

@@ -87,7 +87,7 @@ public class TestDeviceCoordinator extends AbstractDeviceCoordinator {
 
     @Override
     public String getManufacturer() {
-        return "Gadgetbridge";
+        return "Generic";
     }
 
     @NonNull

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/thermalprinter/ThermalPrinterCoordinator.java

@@ -34,7 +34,7 @@ public class ThermalPrinterCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public String getManufacturer() {
-        return "";
+        return "Unknown";
     }
 
     @NonNull

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ultrahuman/UltrahumanDeviceCoordinator.java

@@ -144,7 +144,7 @@ public class UltrahumanDeviceCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public String getManufacturer() {
-        return "Ultrahuman Healthcare Pvt Ltd";
+        return "Ultrahuman";
     }
 
     @Override

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watches/RedmiSmartBand2Coordinator.java

@@ -36,6 +36,11 @@ public class RedmiSmartBand2Coordinator extends XiaomiCoordinator {
         return Pattern.compile("^Redmi Smart Band 2 [A-Z0-9]{4}$");
     }
 
+    @Override
+    public String getManufacturer() {
+        return "Redmi";
+    }
+
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_redmi_smart_band_2;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watches/RedmiSmartBand3Coordinator.java

@@ -37,6 +37,11 @@ public class RedmiSmartBand3Coordinator extends XiaomiCoordinator {
         return Pattern.compile("^Redmi Smart Band 3 [A-Z0-9]{4}$");
     }
 
+    @Override
+    public String getManufacturer() {
+        return "Redmi";
+    }
+
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_redmi_smart_band_3;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watches/RedmiSmartBandProCoordinator.java

@@ -37,6 +37,11 @@ public class RedmiSmartBandProCoordinator extends XiaomiCoordinator {
         return Pattern.compile("^Redmi Band Pro [A-Z0-9]{4}$");
     }
 
+    @Override
+    public String getManufacturer() {
+        return "Redmi";
+    }
+
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_redmi_smart_band_pro;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watches/RedmiWatch2Coordinator.java

@@ -35,6 +35,11 @@ public class RedmiWatch2Coordinator extends XiaomiCoordinator {
         return Pattern.compile("^Redmi Watch 2 [A-Z0-9]{4}$");
     }
 
+    @Override
+    public String getManufacturer() {
+        return "Redmi";
+    }
+
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_redmi_watch_2;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watches/RedmiWatch2LiteCoordinator.java

@@ -35,6 +35,11 @@ public class RedmiWatch2LiteCoordinator extends XiaomiCoordinator {
         return Pattern.compile("^Redmi Watch 2 Lite [A-Z0-9]{4}$");
     }
 
+    @Override
+    public String getManufacturer() {
+        return "Redmi";
+    }
+
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_redmi_watch_2_lite;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watches/RedmiWatch3ActiveCoordinator.java

@@ -40,6 +40,11 @@ public class RedmiWatch3ActiveCoordinator extends XiaomiCoordinator {
         return Pattern.compile("^Redmi Watch 3 Active [A-Z0-9]{4}$");
     }
 
+    @Override
+    public String getManufacturer() {
+        return "Redmi";
+    }
+
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_redmiwatch3active;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watches/RedmiWatch3Coordinator.java

@@ -40,6 +40,11 @@ public class RedmiWatch3Coordinator extends XiaomiCoordinator {
         return Pattern.compile("^Redmi Watch 3 [A-Z0-9]{4}$");
     }
 
+    @Override
+    public String getManufacturer() {
+        return "Redmi";
+    }
+
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_redmiwatch3;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watches/RedmiWatch4Coordinator.java

@@ -25,6 +25,11 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 
 public class RedmiWatch4Coordinator extends XiaomiCoordinator {
+    @Override
+    public String getManufacturer() {
+        return "Redmi";
+    }
+
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_redmi_watch_4;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watches/RedmiWatch5ActiveCoordinator.java

@@ -35,6 +35,11 @@ public class RedmiWatch5ActiveCoordinator extends XiaomiCoordinator {
         return true;
     }
 
+    @Override
+    public String getManufacturer() {
+        return "Redmi";
+    }
+
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_redmi_watch_5_active;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watches/RedmiWatch5Coordinator.java

@@ -30,6 +30,11 @@ public class RedmiWatch5Coordinator extends XiaomiCoordinator {
         return R.string.devicetype_redmi_watch_5;
     }
 
+    @Override
+    public String getManufacturer() {
+        return "Redmi";
+    }
+
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile("^Redmi Watch 5 [0-9A-F]{4}$");

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watches/RedmiWatch5LiteCoordinator.java

@@ -30,6 +30,11 @@ public class RedmiWatch5LiteCoordinator extends XiaomiCoordinator {
         return ConnectionType.BT_CLASSIC;
     }
 
+    @Override
+    public String getManufacturer() {
+        return "Redmi";
+    }
+
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_redmi_watch_5_lite;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java

@@ -58,7 +58,7 @@ public class XWatchCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public String getManufacturer() {
-        return "Generic";
+        return "Unknown";
     }
 
     @Override

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/yawell/ring/H59Coordinator.java

@@ -41,7 +41,7 @@ public class H59Coordinator extends AbstractYawellRingCoordinator {
 
     @Override
     public String getManufacturer() {
-        return "Brandless";
+        return "Unknown";
     }
 
     @Override

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/yawell/ring/YawellR10Coordinator.java

@@ -29,6 +29,11 @@ public class YawellR10Coordinator extends AbstractYawellRingCoordinator {
         return Pattern.compile("^R10_[0-9A-F]{4}$");
     }
 
+    @Override
+    public String getManufacturer() {
+        return "Yawell";
+    }
+
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_yawell_r10;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/yawell/ring/YawellR11Coordinator.java

@@ -29,6 +29,11 @@ public class YawellR11Coordinator extends AbstractYawellRingCoordinator {
         return Pattern.compile("^R11C?_[0-9A-F]{4}$");
     }
 
+    @Override
+    public String getManufacturer() {
+        return "Yawell";
+    }
+
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_yawell_r11;