From 4e543d4b3490e26ab0813ebcc0cd7296d7ed88da Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sat, 31 Dec 2016 19:04:05 +0100 Subject: [PATCH] Pebble: rename pushMessage() to onAppStart() --- .../service/devices/pebble/AppMessageHandler.java | 2 +- .../service/devices/pebble/AppMessageHandlerMarioTime.java | 4 ++-- .../service/devices/pebble/AppMessageHandlerPebStyle.java | 2 +- .../gadgetbridge/service/devices/pebble/PebbleProtocol.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java index 693bf9b1f..c0ddc21ea 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java @@ -31,7 +31,7 @@ public class AppMessageHandler { return null; } - public GBDeviceEvent[] pushMessage() { + public GBDeviceEvent[] onAppStart() { return null; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMarioTime.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMarioTime.java index 869053a18..8ef9d7625 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMarioTime.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMarioTime.java @@ -55,11 +55,11 @@ class AppMessageHandlerMarioTime extends AppMessageHandler { if (!weatherRequested) { return new GBDeviceEvent[]{null}; } - return pushMessage(); + return onAppStart(); } @Override - public GBDeviceEvent[] pushMessage() { + public GBDeviceEvent[] onAppStart() { ParcelableWeather2 weather = Weather.getInstance().getWeather2(); if (weather == null) { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerPebStyle.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerPebStyle.java index 20e6165f6..d6402a1bc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerPebStyle.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerPebStyle.java @@ -110,7 +110,7 @@ public class AppMessageHandlerPebStyle extends AppMessageHandler { } @Override - public GBDeviceEvent[] pushMessage() { + public GBDeviceEvent[] onAppStart() { return null; /* GBDeviceEventSendBytes sendBytes = new GBDeviceEventSendBytes(); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java index 6c4efc21c..342bd1dd0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java @@ -2126,7 +2126,7 @@ public class PebbleProtocol extends GBDeviceProtocol { currentRunningApp = uuid; AppMessageHandler handler = mAppMessageHandlers.get(uuid); if (handler != null) { - return handler.pushMessage(); + return handler.onAppStart(); } else { GBDeviceEventAppManagement gbDeviceEventAppManagement = new GBDeviceEventAppManagement(); @@ -2459,7 +2459,7 @@ public class PebbleProtocol extends GBDeviceProtocol { } else { currentRunningApp = uuid; - devEvts = handler.pushMessage(); + devEvts = handler.onAppStart(); } } else { devEvts = new GBDeviceEvent[]{null};