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

fix byte errors flagged by intellij in Casio code

Browse Source 
since byte is signed, 0x81 and 0xff go out of range and need explicit casts for equal comparisons to work.
This commit is contained in:
Jisakiel 2024-12-20 22:24:01 +00:00
parent 960a864ea0
commit 326b01c296
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/Casio2C2DSupport.java
View File

@ -98,9 +98,9 @@ public abstract class Casio2C2DSupport extends CasioSupport {
public static final byte FEATURE_WATCH_NAME = 0x23;
public static final byte FEATURE_MODULE_ID = 0x26;
public static final byte FEATURE_WATCH_CONDITION = 0x28;
public static final byte FEATURE_DST_WATCH_STATE = 0x1d;
public static final byte FEATURE_DST_SETTING = 0x1e;
public static final byte FEATURE_WORLD_CITY = 0x1f;
public static final byte FEATURE_DST_WATCH_STATE = (byte) 0x1d;
public static final byte FEATURE_DST_SETTING = (byte) 0x1e;
public static final byte FEATURE_WORLD_CITY = (byte) 0x1f;
public static final byte FEATURE_REMINDER_TITLE = 0x30;
public static final byte FEATURE_REMINDER_TIME = 0x31;
public static final byte FEATURE_CURRENT_TIME_MANAGER = 0x39;
@ -207,7 +207,8 @@ public abstract class Casio2C2DSupport extends CasioSupport {
}
public boolean matches(byte[] response) {
if (response.length > 2 && response[0] == 0xFF && response[1] == 0x81) {
// 0xff is of type int which goes out of range etc. byte is signed.
if (response.length > 2 && response[0] == (byte) 0xFF && response[1] == (byte) 0x81) {
if (data.length < response.length - 2)
return false;
for (int i = 2; i < response.length; i++) {

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/ecbs100/CasioECBS100DeviceSupport.java
View File

@ -40,7 +40,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.casio.BasicCasio2C2D
import nodomain.freeyourgadget.gadgetbridge.service.devices.casio.Casio2C2DSupport;
import nodomain.freeyourgadget.gadgetbridge.service.devices.casio.CasioTimeZone;
// TODO abstract methods from GWB5600
// TODO abstract methods out from GWB5600
public class CasioECBS100DeviceSupport extends BasicCasio2C2DSupport {
private static final Logger LOG = LoggerFactory.getLogger(CasioECBS100DeviceSupport.class);