Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Removed notification part of Android push so app had control over it

Michael Rademakere7d84dbaaf4e
diff --git a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
index e34233592..d376519ce 100644
--- a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
+++ b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
@@ -373,16 +373,13 @@ public class PushNotificationHandler extends RouteBuilder implements Notificatio
if (!dataOnly) {
// Don't set basic notification on Android if there is data so even if app is in background we can show a custom notification
- // with actions that use the actions from the data # see below TODO
+ // with actions that use the actions from the data
if (pushMessage.getData() != null || pushMessage.getAction() != null || pushMessage.getButtons() != null) {
androidConfigBuilder.putData("or-title", pushMessage.getTitle());
if (pushMessage.getBody() != null) {
androidConfigBuilder.putData("or-body", pushMessage.getBody());
}
}
- //TODO: flutter doesn't support action buttons yet, so setting a custom notification wouldn't make sense now
- // once actions buttons are supported and implemented in the app, this line can be removed
- androidConfigBuilder.setNotification(AndroidNotification.builder().setTitle(pushMessage.getTitle()).setBody(pushMessage.getBody()).build());
// Use alert dictionary for apns
// https://developer.apple.com/library/content/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/PayloadKeyReference.html
@@ -410,8 +407,6 @@ public class PushNotificationHandler extends RouteBuilder implements Notificatio
try {
if (pushMessage.getAction() != null) {
builder.putData("action", Container.JSON.writeValueAsString(pushMessage.getAction()));
- // Add so tapping the notification will cause an action
- builder.putData("click_action", "FLUTTER_NOTIFICATION_CLICK");
}
if (pushMessage.getButtons() != null) {