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

Xiaomi: Prevent NPE when not yet connected

Browse Source
This commit is contained in:
José Rebelo 2023-10-22 10:06:32 +01:00
parent ce1d095074
commit 81ca617601
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
View File

@ -428,6 +428,12 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
} }
public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) { public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) {
if (this.characteristicCommandWrite == null) {
// Can sometimes happen in race conditions when connecting + receiving calendar event or weather updates
LOG.warn("characteristicCommandWrite is null!");
return;
}
// FIXME builder is ignored // FIXME builder is ignored
final byte[] commandBytes = command.toByteArray(); final byte[] commandBytes = command.toByteArray();
LOG.debug("Sending command {}", GB.hexdump(commandBytes)); LOG.debug("Sending command {}", GB.hexdump(commandBytes));
@ -435,6 +441,12 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
} }
public void sendCommand(final TransactionBuilder builder, final byte[] commandBytes) { public void sendCommand(final TransactionBuilder builder, final byte[] commandBytes) {
if (this.characteristicCommandWrite == null) {
// Can sometimes happen in race conditions when connecting + receiving calendar event or weather updates
LOG.warn("characteristicCommandWrite is null!");
return;
}
// FIXME builder is ignored // FIXME builder is ignored
this.characteristicCommandWrite.write(commandBytes); this.characteristicCommandWrite.write(commandBytes);
} }