MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-02-18 05:17:08 +01:00
Code Releases Wiki Activity

Pebble: Put icon into fake weather response, disable mario time native handler (since it works a bit now) :)

Browse Source
This commit is contained in:
Andreas Shimokawa 2017-02-27 22:28:42 +01:00
parent 181b33d6be
commit 593b169f00
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
View File

@ -387,7 +387,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
mAppMessageHandlers.put(UUID_MISFIT, new AppMessageHandlerMisfit(UUID_MISFIT, PebbleProtocol.this));
mAppMessageHandlers.put(UUID_PEBBLE_TIMESTYLE, new AppMessageHandlerTimeStylePebble(UUID_PEBBLE_TIMESTYLE, PebbleProtocol.this));
//mAppMessageHandlers.put(UUID_PEBSTYLE, new AppMessageHandlerPebStyle(UUID_PEBSTYLE, PebbleProtocol.this));
mAppMessageHandlers.put(UUID_MARIOTIME, new AppMessageHandlerMarioTime(UUID_MARIOTIME, PebbleProtocol.this));
//mAppMessageHandlers.put(UUID_MARIOTIME, new AppMessageHandlerMarioTime(UUID_MARIOTIME, PebbleProtocol.this));
mAppMessageHandlers.put(UUID_HELTHIFY, new AppMessageHandlerHealthify(UUID_HELTHIFY, PebbleProtocol.this));
mAppMessageHandlers.put(UUID_TREKVOLLE, new AppMessageHandlerTrekVolle(UUID_TREKVOLLE, PebbleProtocol.this));
mAppMessageHandlers.put(UUID_SQUARE, new AppMessageHandlerSquare(UUID_SQUARE, PebbleProtocol.this));

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java
View File

@ -223,6 +223,7 @@ public class WebViewSingleton {
currCond.put("id", weatherSpec.currentConditionCode);
currCond.put("main", weatherSpec.currentCondition);
currCond.put("icon", Weather.mapToOpenWeatherMapIcon(weatherSpec.currentConditionCode));
weather.put(currCond);
main.put("temp", weatherSpec.currentTemp);
@ -234,7 +235,6 @@ public class WebViewSingleton {
resp.put("sys", sys);
resp.put("weather", weather);
resp.put("main", main);
LOG.info("WEBVIEW - mimic openweather response" + resp.toString());
HashMap headers = new HashMap<>();
headers.put("Access-Control-Allow-Origin", "*");