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

Bangle.js: if music state is out of range, just return '' (fix #2485)

Browse Source
This commit is contained in:
Gordon Williams 2021-12-09 16:09:49 +00:00
parent 4981aacb30
commit e82662f0bf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
View File

@ -153,7 +153,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
private void handleUartRxLine(String line) { private void handleUartRxLine(String line) {
LOG.info("UART RX LINE: " + line); LOG.info("UART RX LINE: " + line);
if (">Uncaught ReferenceError: \"gb\" is not defined".equals(line)) if (">Uncaught ReferenceError: \"GB\" is not defined".equals(line))
GB.toast(getContext(), "Gadgetbridge plugin not installed on Bangle.js", Toast.LENGTH_LONG, GB.ERROR); GB.toast(getContext(), "Gadgetbridge plugin not installed on Bangle.js", Toast.LENGTH_LONG, GB.ERROR);
else if (line.charAt(0)=='{') { else if (line.charAt(0)=='{') {
// JSON - we hope! // JSON - we hope!
@ -412,8 +412,11 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
try { try {
JSONObject o = new JSONObject(); JSONObject o = new JSONObject();
o.put("t", "musicstate"); o.put("t", "musicstate");
int musicState = stateSpec.state;
String[] musicStates = {"play", "pause", "stop", ""}; String[] musicStates = {"play", "pause", "stop", ""};
o.put("state", musicStates[stateSpec.state]); if (musicState<0) musicState=3;
if (musicState>=musicStates.length) musicState = musicStates.length-1;
o.put("state", musicStates[musicState]);
o.put("position", stateSpec.position); o.put("position", stateSpec.position);
o.put("shuffle", stateSpec.shuffle); o.put("shuffle", stateSpec.shuffle);
o.put("repeat", stateSpec.repeat); o.put("repeat", stateSpec.repeat);