From d64658f1f8baabb5618dd021b30083cda1de0aa7 Mon Sep 17 00:00:00 2001 From: eleete0712 Date: Mon, 13 Aug 2018 22:59:30 +0200 Subject: [PATCH] show CW in system notification for CW'd statuses (#754) * show CW in system notification for CW'd statuses * show spoiler text instead of generic CW message --- .../com/keylesspalace/tusky/util/NotificationHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java b/app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java index 7bedce37..7bf7010a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java @@ -549,7 +549,11 @@ public class NotificationHelper { case MENTION: case FAVOURITE: case REBLOG: - return notification.getStatus().getContent().toString(); + if (notification.getStatus().getSensitive()) { + return notification.getStatus().getSpoilerText(); + } else { + return notification.getStatus().getContent().toString(); + } } return null; }