From 4f808440161a95c83176a051aa75f33189b9d094 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sun, 13 Sep 2015 13:38:11 +0200 Subject: [PATCH] noficicaion_kind -> notificationKind --- .../gadgetbridge/devices/EventHandler.java | 2 +- .../externalevents/NotificationListener.java | 12 ++++++------ .../gadgetbridge/impl/GBDeviceService.java | 4 ++-- .../gadgetbridge/model/DeviceService.java | 2 +- .../service/DeviceCommunicationService.java | 4 ++-- .../gadgetbridge/service/ServiceDeviceSupport.java | 4 ++-- .../service/devices/miband/MiBandSupport.java | 2 +- .../service/serial/AbstractSerialDeviceSupport.java | 4 ++-- .../service/serial/GBDeviceProtocol.java | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java index 88cdaea23..2b61352c4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java @@ -20,7 +20,7 @@ public interface EventHandler { void onEmail(String from, String subject, String body); - void onGenericNotification(String title, String details, int handle, NotificationKind notification_kind); + void onGenericNotification(String title, String details, int handle, NotificationKind notificationKind); void onSetTime(); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java index 891626d74..e5f08b33b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java @@ -155,17 +155,17 @@ public class NotificationListener extends NotificationListenerService { } // Set application icons for generic notifications - NotificationKind notification_kind; + NotificationKind notificationKind; if (source.equals("org.mariotaku.twidere") || source.equals("com.twitter.android") || source.equals("org.andstatus.app")) { - notification_kind = NotificationKind.TWITTER; + notificationKind = NotificationKind.TWITTER; } else if (source.equals("com.fsck.k9")) { - notification_kind = NotificationKind.EMAIL; + notificationKind = NotificationKind.EMAIL; } else if (source.equals("eu.siacs.conversations")) { - notification_kind = NotificationKind.CHAT; + notificationKind = NotificationKind.CHAT; } else { - notification_kind = NotificationKind.UNDEFINED; + notificationKind = NotificationKind.UNDEFINED; } LOG.info("Processing notification from source " + source); @@ -181,7 +181,7 @@ public class NotificationListener extends NotificationListenerService { } if (content != null) { - GBApplication.deviceService().onGenericNotification(title, content, (int) sbn.getPostTime(), notification_kind); //FIMXE: a truly unique id would be better + GBApplication.deviceService().onGenericNotification(title, content, (int) sbn.getPostTime(), notificationKind); //FIMXE: a truly unique id would be better } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java index 1fc228476..b86bdf8ce 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java @@ -97,12 +97,12 @@ public class GBDeviceService implements DeviceService { } @Override - public void onGenericNotification(String title, String details, int handle, NotificationKind notification_kind) { + public void onGenericNotification(String title, String details, int handle, NotificationKind notificationKind) { Intent intent = createIntent().setAction(ACTION_NOTIFICATION_GENERIC) .putExtra(EXTRA_NOTIFICATION_TITLE, title) .putExtra(EXTRA_NOTIFICATION_BODY, details) .putExtra(EXTRA_NOTIFICATION_HANDLE, handle) - .putExtra(EXTRA_NOTIFICATION_KIND, notification_kind); + .putExtra(EXTRA_NOTIFICATION_KIND, notificationKind); invokeService(intent); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java index a46146db7..02c9d1ddd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java @@ -37,7 +37,7 @@ public interface DeviceService extends EventHandler { static final String EXTRA_NOTIFICATION_SENDER = "notification_sender"; static final String EXTRA_NOTIFICATION_SUBJECT = "notification_subject"; static final String EXTRA_NOTIFICATION_HANDLE = "notification_handle"; - static final String EXTRA_NOTIFICATION_KIND = "notification_kind"; + static final String EXTRA_NOTIFICATION_KIND = "notificationKind"; static final String EXTRA_FIND_START = "find_start"; static final String EXTRA_CALL_COMMAND = "call_command"; static final String EXTRA_CALL_PHONENUMBER = "call_phonenumber"; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java index af6b9f506..dd1ccbea2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java @@ -184,8 +184,8 @@ public class DeviceCommunicationService extends Service { String title = intent.getStringExtra(EXTRA_NOTIFICATION_TITLE); String body = intent.getStringExtra(EXTRA_NOTIFICATION_BODY); int handle = intent.getIntExtra(EXTRA_NOTIFICATION_HANDLE,-1); - NotificationKind notification_kind = (NotificationKind) intent.getSerializableExtra(EXTRA_NOTIFICATION_KIND); - mDeviceSupport.onGenericNotification(title, body, handle, notification_kind); + NotificationKind notificationKind = (NotificationKind) intent.getSerializableExtra(EXTRA_NOTIFICATION_KIND); + mDeviceSupport.onGenericNotification(title, body, handle, notificationKind); break; } case ACTION_NOTIFICATION_SMS: { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java index 6e4d71749..b950eaf19 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java @@ -128,11 +128,11 @@ public class ServiceDeviceSupport implements DeviceSupport { } @Override - public void onGenericNotification(String title, String details, int handle, NotificationKind notification_kind) { + public void onGenericNotification(String title, String details, int handle, NotificationKind notificationKind) { if (checkBusy("generic notification") || checkThrottle("generic notification")) { return; } - delegate.onGenericNotification(title, details, handle, notification_kind); + delegate.onGenericNotification(title, details, handle, notificationKind); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java index 58477bab9..6d73a1a65 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java @@ -412,7 +412,7 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport { } @Override - public void onGenericNotification(String title, String details, int handle, NotificationKind notification_kind) { + public void onGenericNotification(String title, String details, int handle, NotificationKind notificationKind) { performPreferredNotification("generic notification received", ORIGIN_GENERIC, null); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java index d608f3263..fbceaa399 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java @@ -119,8 +119,8 @@ public abstract class AbstractSerialDeviceSupport extends AbstractDeviceSupport } @Override - public void onGenericNotification(String title, String details, int handle, NotificationKind notification_kind) { - byte[] bytes = gbDeviceProtocol.encodeGenericNotification(title, details, handle, notification_kind); + public void onGenericNotification(String title, String details, int handle, NotificationKind notificationKind) { + byte[] bytes = gbDeviceProtocol.encodeGenericNotification(title, details, handle, notificationKind); sendToDevice(bytes); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java index 13bfb1cb1..69e195ded 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java @@ -16,7 +16,7 @@ public abstract class GBDeviceProtocol { return null; } - public byte[] encodeGenericNotification(String title, String details, int handle, NotificationKind notification_kind) { + public byte[] encodeGenericNotification(String title, String details, int handle, NotificationKind notificationKind) { return null; }