nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix force close when weather hasn't been parsed yet, use the yahoo codes for this watchface, as required

This commit is contained in:
danielegobbetti 2016-01-05 16:05:12 +01:00
parent d7f4769f57
commit 3d389f31a3
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTimeStylePebble.java
View File

@ -89,15 +89,13 @@ public class AppMessageHandlerTimeStylePebble extends AppMessageHandler {
//TODO: use the night icons when night //TODO: use the night icons when night
pairs.add(new Pair<>(KEY_USE_NIGHT_ICON, (Object) 0)); pairs.add(new Pair<>(KEY_USE_NIGHT_ICON, (Object) 0));
pairs.add(new Pair<>(KEY_TEMPERATURE, (Object) (weather.currentTemp - 273))); pairs.add(new Pair<>(KEY_TEMPERATURE, (Object) (weather.currentTemp - 273)));
pairs.add(new Pair<>(KEY_CONDITION_CODE, (Object) weather.currentConditionCode)); pairs.add(new Pair<>(KEY_CONDITION_CODE, (Object) Weather.mapToYahooCondition(weather.currentConditionCode)));
pairs.add(new Pair<>(KEY_FORECAST_CONDITION, (Object) weather.forecastConditionCode)); pairs.add(new Pair<>(KEY_FORECAST_CONDITION, (Object) Weather.mapToYahooCondition(weather.forecastConditionCode)));
pairs.add(new Pair<>(KEY_FORECAST_TEMP_HIGH, (Object) (weather.highTemp - 273))); pairs.add(new Pair<>(KEY_FORECAST_TEMP_HIGH, (Object) (weather.highTemp - 273)));
pairs.add(new Pair<>(KEY_FORECAST_TEMP_LOW, (Object) (weather.lowTemp - 273))); pairs.add(new Pair<>(KEY_FORECAST_TEMP_LOW, (Object) (weather.lowTemp - 273)));
}
byte[] weatherMessage = mPebbleProtocol.encodeApplicationMessagePush(PebbleProtocol.ENDPOINT_APPLICATIONMESSAGE, mUUID, pairs); byte[] weatherMessage = mPebbleProtocol.encodeApplicationMessagePush(PebbleProtocol.ENDPOINT_APPLICATIONMESSAGE, mUUID, pairs);
return weatherMessage; return weatherMessage;
}
return null;
} }