MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-06-20 12:00:51 +02:00
Code Releases Wiki Activity

Huawei : Change method to get device name round 2

Browse Source
This commit is contained in:
Damien 'Psolyca' Gaignon 2024-01-13 17:24:36 +01:00
parent 4ce5b59e15
commit 1e1f0014c7
No known key found for this signature in database
GPG Key ID: 9E9404E5D9E11843
15 changed files with 33 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
View File

@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband3;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.regex.Pattern;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
@ -40,16 +42,8 @@ public class HonorBand3Coordinator extends HuaweiLECoordinator {
}
@Override
public boolean supports(GBDeviceCandidate candidate) {
try {
String name = candidate.getName();
if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND3_NAME)) {
return true;
}
} catch (Exception ex) {
LOG.error("unable to check device support", ex);
}
return false;
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuaweiConstants.HO_BAND3_NAME + ".*", Pattern.CASE_INSENSITIVE);
}
@Override

14
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
View File

@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband4;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.regex.Pattern;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@ -44,16 +46,8 @@ public class HonorBand4Coordinator extends HuaweiLECoordinator {
}
@Override
public boolean supports(GBDeviceCandidate candidate) {
try {
String name = candidate.getName();
if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND4_NAME)) {
return true;
}
} catch (Exception ex) {
LOG.error("unable to check device support", ex);
}
return false;
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuaweiConstants.HO_BAND4_NAME + ".*", Pattern.CASE_INSENSITIVE);
}
@Override

14
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
View File

@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband5;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.regex.Pattern;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
@ -44,16 +46,8 @@ public class HonorBand5Coordinator extends HuaweiLECoordinator {
}
@Override
public boolean supports(GBDeviceCandidate candidate) {
try {
String name = candidate.getName();
if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND5_NAME)) {
return true;
}
} catch (Exception ex) {
LOG.error("unable to check device support", ex);
}
return false;
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuaweiConstants.HO_BAND5_NAME + ".*", Pattern.CASE_INSENSITIVE);
}
@Override

14
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
View File

@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband6;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.regex.Pattern;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@ -39,16 +41,8 @@ public class HonorBand6Coordinator extends HuaweiLECoordinator {
}
@Override
public boolean supports(GBDeviceCandidate candidate) {
try {
String name = candidate.getName();
if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND6_NAME)) {
return true;
}
} catch (Exception ex) {
LOG.error("unable to check device support", ex);
}
return false;
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuaweiConstants.HO_BAND6_NAME + ".*", Pattern.CASE_INSENSITIVE);
}
@Override

14
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
View File

@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband7;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.regex.Pattern;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@ -39,16 +41,8 @@ public class HonorBand7Coordinator extends HuaweiLECoordinator {
}
@Override
public boolean supports(GBDeviceCandidate candidate) {
try {
String name = candidate.getName();
if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND7_NAME)) {
return true;
}
} catch (Exception ex) {
LOG.error("unable to check device support", ex);
}
return false;
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuaweiConstants.HO_BAND7_NAME + ".*", Pattern.CASE_INSENSITIVE);
}
@Override

17
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
View File

@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband4pro;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.regex.Pattern;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@ -39,19 +41,8 @@ public class HuaweiBand4ProCoordinator extends HuaweiLECoordinator {
}
@Override
public boolean supports(GBDeviceCandidate candidate) {
try {
String name = candidate.getName();
if (name != null && (
name.toLowerCase().startsWith(HuaweiConstants.HU_BAND4_NAME) ||
name.toLowerCase().startsWith(HuaweiConstants.HU_BAND4PRO_NAME)
)) {
return true;
}
} catch (Exception ex) {
LOG.error("unable to check device support", ex);
}
return false;
protected Pattern getSupportedDeviceName() {
return Pattern.compile("(" + HuaweiConstants.HU_BAND4_NAME + "|" + HuaweiConstants.HU_BAND4PRO_NAME + ").*", Pattern.CASE_INSENSITIVE);
}
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
View File

@ -42,7 +42,7 @@ public class HuaweiBand6Coordinator extends HuaweiLECoordinator {
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuaweiConstants.HU_BAND6_NAME + ".*");
return Pattern.compile(HuaweiConstants.HU_BAND6_NAME + ".*", Pattern.CASE_INSENSITIVE);
}
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
View File

@ -42,7 +42,7 @@ public class HuaweiBand7Coordinator extends HuaweiLECoordinator {
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuaweiConstants.HU_BAND7_NAME + ".*");
return Pattern.compile(HuaweiConstants.HU_BAND7_NAME + ".*", Pattern.CASE_INSENSITIVE);
}
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
View File

@ -42,7 +42,7 @@ public class HuaweiBand8Coordinator extends HuaweiLECoordinator {
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuaweiConstants.HU_BAND8_NAME + ".*");
return Pattern.compile(HuaweiConstants.HU_BAND8_NAME + ".*", Pattern.CASE_INSENSITIVE);
}
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
View File

@ -38,7 +38,7 @@ public class HuaweiBandAw70Coordinator extends HuaweiLECoordinator {
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("(" + HuaweiConstants.HU_BAND3E_NAME + "|" + HuaweiConstants.HU_BAND4E_NAME + ").*");
return Pattern.compile("(" + HuaweiConstants.HU_BAND3E_NAME + "|" + HuaweiConstants.HU_BAND4E_NAME + ").*", Pattern.CASE_INSENSITIVE);
}
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
View File

@ -38,7 +38,7 @@ public class HuaweiTalkBandB6Coordinator extends HuaweiBRCoordinator {
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuaweiConstants.HU_TALKBANDB6_NAME + ".*");
return Pattern.compile(HuaweiConstants.HU_TALKBANDB6_NAME + ".*", Pattern.CASE_INSENSITIVE);
}
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
View File

@ -42,7 +42,7 @@ public class HuaweiWatchGTCoordinator extends HuaweiLECoordinator {
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuaweiConstants.HU_WATCHGT_NAME + ".*");
return Pattern.compile(HuaweiConstants.HU_WATCHGT_NAME + ".*", Pattern.CASE_INSENSITIVE);
}
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
View File

@ -46,7 +46,7 @@ public class HuaweiWatchGT2Coordinator extends HuaweiBRCoordinator {
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("(" + HuaweiConstants.HU_WATCHGT2_NAME + "|" + HuaweiConstants.HU_WATCHGT2PRO_NAME + ").*");
return Pattern.compile("(" + HuaweiConstants.HU_WATCHGT2_NAME + "|" + HuaweiConstants.HU_WATCHGT2PRO_NAME + ").*", Pattern.CASE_INSENSITIVE);
}
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
View File

@ -46,7 +46,7 @@ public class HuaweiWatchGT2eCoordinator extends HuaweiLECoordinator {
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile(HuaweiConstants.HU_WATCHGT2E_NAME + ".*");
return Pattern.compile(HuaweiConstants.HU_WATCHGT2E_NAME + ".*", Pattern.CASE_INSENSITIVE);
}
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
View File

@ -42,7 +42,7 @@ public class HuaweiWatchGT3Coordinator extends HuaweiBRCoordinator {
@Override
protected Pattern getSupportedDeviceName() {
return Pattern.compile("(" + HuaweiConstants.HU_WATCHGT3_NAME + "|" + HuaweiConstants.HU_WATCHGT3PRO_NAME + ").*");
return Pattern.compile("(" + HuaweiConstants.HU_WATCHGT3_NAME + "|" + HuaweiConstants.HU_WATCHGT3PRO_NAME + ").*", Pattern.CASE_INSENSITIVE);
}
@Override