From cb58fd357a6eb5572c188ec44991aba575831009 Mon Sep 17 00:00:00 2001 From: Daniel Gale-Rosen Date: Mon, 13 Feb 2023 15:33:49 -0500 Subject: [PATCH 1/2] remove unnecessary # --- .../chat/customairshipextender/CustomNotificationProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java index 10a25f05d7d4..aff9fae404c2 100644 --- a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java +++ b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java @@ -173,7 +173,7 @@ private void applyMessageStyle(@NonNull Context context, NotificationCompat.Buil String roomName = payload.get("roomName") == null ? "" : payload.get("roomName").getString(""); String conversationTitle = "Chat with " + name; if (!roomName.isEmpty()) { - conversationTitle = "#" + roomName; + conversationTitle = roomName; } // Retrieve or create the Person object who sent the latest report comment From 43a8bda67a3dc072b86e8a6b783b059b657e5b45 Mon Sep 17 00:00:00 2001 From: Daniel Gale-Rosen Date: Mon, 13 Feb 2023 15:39:47 -0500 Subject: [PATCH 2/2] simplify syntax --- .../customairshipextender/CustomNotificationProvider.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java index aff9fae404c2..170d082cb479 100644 --- a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java +++ b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java @@ -171,10 +171,7 @@ private void applyMessageStyle(@NonNull Context context, NotificationCompat.Buil String message = reportAction.get("message").getList().get(0).getMap().get("text").getString(); long time = Timestamp.valueOf(reportAction.get("created").getString(Instant.now().toString())).getTime(); String roomName = payload.get("roomName") == null ? "" : payload.get("roomName").getString(""); - String conversationTitle = "Chat with " + name; - if (!roomName.isEmpty()) { - conversationTitle = roomName; - } + String conversationTitle = roomName.isEmpty() ? "Chat with " + name : roomName; // Retrieve or create the Person object who sent the latest report comment Person person = notificationCache.people.get(accountID);