From 9f907b44cec2ed0fc6ac111fb0f23c05ebf23e56 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Fri, 17 Feb 2023 03:00:03 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=97=E3=83=83=E3=82=B7=E3=83=A5=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E3=81=AE=E5=8F=97=E5=8F=96=E3=83=A6=E3=83=BC=E3=82=B6?=
 =?UTF-8?q?=E3=81=AEacct=E3=81=AE=E8=A1=A8=E8=A8=98=E3=81=AB=E9=80=9A?=
 =?UTF-8?q?=E7=A7=B0=E3=81=A8=E8=89=B2=E3=82=92=E9=81=A9=E7=94=A8=E3=81=99?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/jp/juggler/subwaytooter/push/PushRepo.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/push/PushRepo.kt b/app/src/main/java/jp/juggler/subwaytooter/push/PushRepo.kt
index a7e2fe89..8a9d5e33 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/push/PushRepo.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/push/PushRepo.kt
@@ -739,6 +739,8 @@ class PushRepo(
         val density = context.resources.displayMetrics.density
         val iconAndColor = pm.iconColor()
 
+        val targetName = daoAcctColor.getNicknameWithColor(account.acct)
+
         suspend fun PushMessage.loadSmallIcon(context: Context): IconCompat {
             iconSmall?.notEmpty()
                 ?.let { context.loadIcon(pm.iconSmall, (24f * density + 0.5f).toInt()) }
@@ -794,7 +796,7 @@ class PushRepo(
                         ?: ContextCompat.getColor(context, R.color.colorOsNotificationAccent)
             setSmallIcon(iconSmall)
             iconBitmapLarge?.let { setLargeIcon(it) }
-            setContentTitle(pm.loginAcct?.pretty)
+            setContentTitle(targetName)
             setContentText(pm.text)
             setWhen(pm.timestamp)
             setContentIntent(piTap)
@@ -807,7 +809,7 @@ class PushRepo(
         }
 
         ncPushMessage.notify(context, urlDeleteSummary) {
-            setContentTitle(account.acct.pretty)
+            setContentTitle(targetName)
             setContentText("notifications")
             setWhen(pm.timestamp)
             setSmallIcon(R.drawable.ic_notification)