mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-10-19 01:39:39 +02:00
Pebble: fix wrong uuid being passed from protocol to js
This commit is contained in:
parent
9cca16cb00
commit
6916beabed
@ -2608,7 +2608,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
|
|||||||
LOG.info("got APPLICATIONMESSAGE/LAUNCHER (EP " + endpoint + ") NACK");
|
LOG.info("got APPLICATIONMESSAGE/LAUNCHER (EP " + endpoint + ") NACK");
|
||||||
}
|
}
|
||||||
GBDeviceEventAppMessage evtAppMessage = null;
|
GBDeviceEventAppMessage evtAppMessage = null;
|
||||||
if (idLookup[last_id] != null) {
|
if (endpoint == ENDPOINT_APPLICATIONMESSAGE && idLookup[last_id] != null) {
|
||||||
evtAppMessage = new GBDeviceEventAppMessage();
|
evtAppMessage = new GBDeviceEventAppMessage();
|
||||||
if (pebbleCmd == APPLICATIONMESSAGE_ACK) {
|
if (pebbleCmd == APPLICATIONMESSAGE_ACK) {
|
||||||
evtAppMessage.type = GBDeviceEventAppMessage.TYPE_ACK;
|
evtAppMessage.type = GBDeviceEventAppMessage.TYPE_ACK;
|
||||||
@ -2616,7 +2616,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
|
|||||||
evtAppMessage.type = GBDeviceEventAppMessage.TYPE_NACK;
|
evtAppMessage.type = GBDeviceEventAppMessage.TYPE_NACK;
|
||||||
}
|
}
|
||||||
evtAppMessage.id = idLookup[last_id];
|
evtAppMessage.id = idLookup[last_id];
|
||||||
evtAppMessage.appUUID = uuid;
|
evtAppMessage.appUUID = currentRunningApp;
|
||||||
}
|
}
|
||||||
devEvts = new GBDeviceEvent[]{evtAppMessage};
|
devEvts = new GBDeviceEvent[]{evtAppMessage};
|
||||||
break;
|
break;
|
||||||
|
@ -131,7 +131,7 @@ public class WebViewSingleton {
|
|||||||
|
|
||||||
if (!message.appUUID.equals(currentRunningUUID)) {
|
if (!message.appUUID.equals(currentRunningUUID)) {
|
||||||
LOG.info("WEBVIEW ignoring message for app that is not currently running: " + message.appUUID + " message: " + message.message + " type: " + message.type);
|
LOG.info("WEBVIEW ignoring message for app that is not currently running: " + message.appUUID + " message: " + message.message + " type: " + message.type);
|
||||||
// return; //TODO: ignoring would be the right thing to do here, but sometimes appUUID is apparently wrong
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: handle ACK and NACK types with ids
|
// TODO: handle ACK and NACK types with ids
|
||||||
|
Loading…
Reference in New Issue
Block a user