From b52c3b0386ce8b8b1eec948f4b1e84b4efddf056 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 24 Apr 2020 17:43:10 +0200
Subject: [PATCH] Fixed cancelling notifications

---
 app/src/main/java/eu/faircode/email/Core.java      | 3 ++-
 app/src/main/java/eu/faircode/email/ServiceUI.java | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 43b00d19a9..28930c454e 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3310,7 +3310,8 @@ class Core {
                         .setAllowGeneratedReplies(false);
                 RemoteInput.Builder input = new RemoteInput.Builder("text")
                         .setLabel(context.getString(R.string.title_advanced_notify_action_reply));
-                actionReply.addRemoteInput(input.build()).setAllowGeneratedReplies(false);
+                actionReply.addRemoteInput(input.build())
+                        .setAllowGeneratedReplies(false);
                 mbuilder.addAction(actionReply.build());
             }
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java
index bd21d11218..66a39f8447 100644
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@@ -100,7 +100,7 @@ public class ServiceUI extends IntentService {
         try {
             String[] parts = action.split(":");
             long id = (parts.length > 1 ? Long.parseLong(parts[1]) : -1);
-            String group = intent.getStringExtra("group");
+            long group = intent.getLongExtra("group", -1);
 
             switch (parts[0]) {
                 case "clear":
@@ -184,7 +184,7 @@ public class ServiceUI extends IntentService {
         Log.i("Cleared=" + cleared);
     }
 
-    private void cancel(String group, long id) {
+    private void cancel(long group, long id) {
         String tag = "unseen." + group + ":" + id;
 
         NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);