MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-26 10:35:50 +01:00
Code Releases Wiki Activity

Update some manufacturers with brand names

Browse Source 
Most users will not recognize the actual manufacturers, so let's replace
with the brand names.
This commit is contained in:
José Rebelo 2024-09-08 14:17:16 +01:00
parent 1315931ff8
commit 42def1cefb
41 changed files with 196 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java
View File

@ -43,7 +43,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.unknown.UnknownDevic
public class UnknownDeviceCoordinator extends AbstractDeviceCoordinator {
private final UnknownSampleProvider sampleProvider;
private static final class UnknownSampleProvider implements SampleProvider {
private static final class UnknownSampleProvider implements SampleProvider<AbstractActivitySample> {
@Override
public ActivityKind normalizeType(int rawType) {
return ActivityKind.UNKNOWN;
@ -60,12 +60,12 @@ public class UnknownDeviceCoordinator extends AbstractDeviceCoordinator {
}
@Override
public List getAllActivitySamples(int timestamp_from, int timestamp_to) {
public List<AbstractActivitySample> getAllActivitySamples(int timestamp_from, int timestamp_to) {
return null;
}
@Override
public List getActivitySamples(int timestamp_from, int timestamp_to) {
public List<AbstractActivitySample> getActivitySamples(int timestamp_from, int timestamp_to) {
return null;
}
@ -100,7 +100,6 @@ public class UnknownDeviceCoordinator extends AbstractDeviceCoordinator {
sampleProvider = new UnknownSampleProvider();
}
@NonNull
@Override
public boolean supports(GBDeviceCandidate candidate) {
return false;
@ -125,39 +124,9 @@ public class UnknownDeviceCoordinator extends AbstractDeviceCoordinator {
return null;
}
@Override
public boolean supportsActivityDataFetching() {
return false;
}
@Override
public boolean supportsActivityTracking() {
return false;
}
@Override
public boolean supportsScreenshots(final GBDevice device) {
return false;
}
@Override
public int getAlarmSlotCount(GBDevice device) {
return 0;
}
@Override
public boolean supportsHeartRateMeasurement(GBDevice device) {
return false;
}
@Override
public String getManufacturer() {
return "unknown";
}
@Override
public boolean supportsAppsManagement(final GBDevice device) {
return false;
return "Generic";
}
@Override
@ -165,42 +134,6 @@ public class UnknownDeviceCoordinator extends AbstractDeviceCoordinator {
return null;
}
@Override
public boolean supportsCalendarEvents() {
return false;
}
@Override
public boolean supportsRealtimeData() {
return false;
}
@Override
public boolean supportsWeather() {
return false;
}
@Override
public boolean supportsFindDevice() {
return false;
}
@Override
public boolean supportsLedColor() {
return false;
}
@Override
public boolean supportsRgbLedColor() {
return false;
}
@NonNull
@Override
public int[] getColorPresets() {
return new int[0];
}
@NonNull
@Override
public Class<? extends DeviceSupport> getDeviceSupportClass() {
@ -213,7 +146,6 @@ public class UnknownDeviceCoordinator extends AbstractDeviceCoordinator {
return R.string.devicetype_unknown;
}
@Override
@DrawableRes
public int getDefaultIconResource() {

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/coordinator/BinarySensorCoordinator.java
View File

@ -125,7 +125,7 @@ public class BinarySensorCoordinator extends AbstractBLEDeviceCoordinator {
@Override
public String getManufacturer() {
return "DIY";
return "Generic";
}
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cycling_sensor/coordinator/CyclingSensorCoordinator.java
View File

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

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2DeviceCoordinator.java
View File

@ -39,7 +39,8 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.femometer.FemometerV
public class FemometerVinca2DeviceCoordinator extends AbstractDeviceCoordinator {
@Override
public String getManufacturer() {
return "Joytech Healthcare";
// Actual manufacturer is Joytech Healthcare
return "Femometer";
}
@NonNull

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/flipper/zero/FlipperZeroCoordinator.java
View File

@ -92,7 +92,7 @@ public class FlipperZeroCoordinator extends AbstractBLEDeviceCoordinator {
@Override
public String getManufacturer() {
return "Flipper devices";
return "Flipper Devices";
}
@Override

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/EXRIZUK8Coordinator.java
View File

@ -22,13 +22,9 @@ package nodomain.freeyourgadget.gadgetbridge.devices.hplus;
*/
import androidx.annotation.NonNull;
import java.util.regex.Pattern;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
/**
* Pseudo Coordinator for the EXRIZU K8, a sub type of the HPLUS devices
@ -41,7 +37,7 @@ public class EXRIZUK8Coordinator extends HPlusCoordinator {
@Override
public String getManufacturer() {
return "EXRIZU";
return "Exrizu";
}
@Override

20
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
View File

@ -26,9 +26,6 @@ import android.os.ParcelUuid;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@ -63,8 +60,6 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiVibration
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
public abstract class HuamiCoordinator extends AbstractBLEDeviceCoordinator {
private static final Logger LOG = LoggerFactory.getLogger(HuamiCoordinator.class);
@Override
public Class<? extends Activity> getPairingActivity() {
return MiBandPairingActivity.class;
@ -95,11 +90,6 @@ public abstract class HuamiCoordinator extends AbstractBLEDeviceCoordinator {
return "Huami";
}
@Override
public boolean supportsAppsManagement(final GBDevice device) {
return false;
}
@Override
public boolean supportsFlashing() {
return true;
@ -110,11 +100,6 @@ public abstract class HuamiCoordinator extends AbstractBLEDeviceCoordinator {
return null;
}
@Override
public boolean supportsCalendarEvents() {
return false;
}
@Override
public boolean supportsRealtimeData() {
return true;
@ -525,11 +510,6 @@ public abstract class HuamiCoordinator extends AbstractBLEDeviceCoordinator {
return prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_WORKOUT_SEND_GPS_TO_BAND, false);
}
@Override
public boolean supportsScreenshots(final GBDevice device) {
return false;
}
@Override
public boolean supportsFindDevice() {
return true;

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java
View File

@ -36,6 +36,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitband5.AmazfitBand5Support;
public class AmazfitBand5Coordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuamiConst.AMAZFIT_BAND5_NAME, Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip.AmazfitBipSupport;
public class AmazfitBipCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit Bip Watch", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3/AmazfitBip3Coordinator.java
View File

@ -34,6 +34,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip3.AmazfitBip3Support;
public class AmazfitBip3Coordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("^Amazfit Bip 3$", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java
View File

@ -34,6 +34,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip3pro.AmazfitBip3ProSupport;
public class AmazfitBip3ProCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit Bip 3 Pro", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbips.AmazfitBipSSupport;
public class AmazfitBipSCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit Bip S", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbipu.AmazfitBipUSupport;
public class AmazfitBipUCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit Bip U", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbipupro.AmazfitBipUProSupport;
public class AmazfitBipUProCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit Bip U Pro", Pattern.CASE_INSENSITIVE);

11
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java
View File

@ -22,9 +22,6 @@ import android.net.Uri;
import androidx.annotation.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.regex.Pattern;
@ -34,12 +31,16 @@ import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpec
import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiCoordinator;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcor.AmazfitCorSupport;
public class AmazfitCorCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit Band|Amazfit Cor", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcor2.AmazfitCor2Support;
public class AmazfitCor2Coordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit Band 2|Amazfit Cor 2", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr.AmazfitGTRSupport;
public class AmazfitGTRCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit GTR", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr.AmazfitGTRLiteSupport;
public class AmazfitGTRLiteCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit GTR L", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr2.AmazfitGTR2Support;
public class AmazfitGTR2Coordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit GTR 2", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr2.AmazfitGTR2eSupport;
public class AmazfitGTR2eCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit GTR 2e", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts.AmazfitGTSSupport;
public class AmazfitGTSCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit GTS", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts2.AmazfitGTS2Support;
public class AmazfitGTS2Coordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit GTS 2", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts2.AmazfitGTS2eSupport;
public class AmazfitGTS2eCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit GTS 2e", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java
View File

@ -38,6 +38,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitneo.AmazfitNeoSupport;
public class AmazfitNeoCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuamiConst.AMAZFIT_NEO_NAME, Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrex.AmazfitTRexSupport;
public class AmazfitTRexCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit T-Rex", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrexpro.AmazfitTRexProSupport;
public class AmazfitTRexProCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit T-Rex Pro", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java
View File

@ -34,6 +34,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitvergel.AmazfitVergeLSupport;
public class AmazfitVergeLCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Amazfit Verge L", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java
View File

@ -36,6 +36,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitx.AmazfitXSupport;
public class AmazfitXCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuamiConst.AMAZFIT_X, Pattern.CASE_INSENSITIVE);

7
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java
View File

@ -40,10 +40,17 @@ import nodomain.freeyourgadget.gadgetbridge.service.ServiceDeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband2.MiBand2Support;
public class MiBand2Coordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Xiaomi";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuamiConst.MI_BAND2_NAME, Pattern.CASE_INSENSITIVE);
}
@Override
public InstallHandler findInstallHandler(final Uri uri, final Context context) {
final MiBand2FWInstallHandler handler = new MiBand2FWInstallHandler(uri, context);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java
View File

@ -40,6 +40,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.ServiceDeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband2.MiBand2Support;
public class MiBand2HRXCoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Xiaomi";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java
View File

@ -40,6 +40,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband3.MiBand
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
public class MiBand3Coordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Xiaomi";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java
View File

@ -39,6 +39,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband4.MiBand4Support;
public class MiBand4Coordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Xiaomi";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuamiConst.MI_BAND4_NAME, Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java
View File

@ -38,6 +38,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband5.MiBand5Support;
public class MiBand5Coordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Xiaomi";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuamiConst.MI_BAND5_NAME, Pattern.CASE_INSENSITIVE);

9
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java
View File

@ -22,9 +22,6 @@ import android.net.Uri;
import androidx.annotation.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
@ -42,7 +39,11 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband6.MiBand6Support;
public class MiBand6Coordinator extends HuamiCoordinator {
private static final Logger LOG = LoggerFactory.getLogger(MiBand6Coordinator.class);
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Xiaomi";
}
@Override
protected Pattern getSupportedDeviceName() {

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7Coordinator.java
View File

@ -28,6 +28,12 @@ import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinat
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
public class MiBand7Coordinator extends ZeppOsCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Xiaomi";
}
@Override
public String getDeviceBluetoothName() {
return HuamiConst.XIAOMI_SMART_BAND7_NAME;

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java
View File

@ -35,6 +35,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppe.ZeppESupport;
public class ZeppECoordinator extends HuamiCoordinator {
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("Zepp E", Pattern.CASE_INSENSITIVE);

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java
View File

@ -84,6 +84,12 @@ public abstract class ZeppOsCoordinator extends HuamiCoordinator {
return Collections.emptyMap();
}
@Override
public String getManufacturer() {
// Actual manufacturer is Huami
return "Amazfit";
}
@Override
protected final Pattern getSupportedDeviceName() {
// Most devices use the exact bluetooth name

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale/MiCompositionScaleCoordinator.java
View File

@ -80,7 +80,8 @@ public class MiCompositionScaleCoordinator extends AbstractBLEDeviceCoordinator
@Override
public String getManufacturer() {
return "Huami";
// Actual manufacturer is Huami
return "Xiaomi";
}
@Override

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale/MiSmartScaleCoordinator.java
View File

@ -37,7 +37,8 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.miscale.MiSmartScale
public class MiSmartScaleCoordinator extends AbstractBLEDeviceCoordinator {
@Override
public String getManufacturer() {
return "Huami";
// Actual manufacturer is Huami
return "Xiaomi";
}
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/scannable/ScannableDeviceCoordinator.java
View File

@ -37,7 +37,7 @@ public class ScannableDeviceCoordinator extends AbstractBLEDeviceCoordinator {
@Override
public String getManufacturer() {
return "unknown";
return "Generic";
}
@NonNull

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soflow/SoFlowCoordinator.java
View File

@ -86,7 +86,7 @@ public class SoFlowCoordinator extends AbstractBLEDeviceCoordinator {
@Override
public String getManufacturer() {
return "SoFlow AG";
return "SoFlow";
}
@Override