From ccd3583ddeedcb5fba0d24204a5ff0bde92537cc Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 3 Jan 2019 13:36:07 +0100
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20show=20hostmasks=20in=20kicks?=
=?UTF-8?q?=20and=20kills?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../chat/messages/QuasselMessageRenderer.kt | 40 ++++++++-----------
1 file changed, 16 insertions(+), 24 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
index 2d482931a..2f4f20b7e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
@@ -502,24 +502,20 @@ class QuasselMessageRenderer @Inject constructor(
context.getString(R.string.message_format_kick_1),
contentFormatter.formatNick(user, false, monochromeForeground, false),
contentFormatter.formatPrefix(message.content.senderPrefixes),
- contentFormatter.formatNick(
- message.content.sender,
- self,
- monochromeForeground,
- messageSettings.showHostmaskActions
- )
+ contentFormatter.formatNick(message.content.sender,
+ self,
+ monochromeForeground,
+ false)
)
} else {
SpanFormatter.format(
context.getString(R.string.message_format_kick_2),
contentFormatter.formatNick(user, false, monochromeForeground, false),
contentFormatter.formatPrefix(message.content.senderPrefixes),
- contentFormatter.formatNick(
- message.content.sender,
- self,
- monochromeForeground,
- messageSettings.showHostmaskActions
- ),
+ contentFormatter.formatNick(message.content.sender,
+ self,
+ monochromeForeground,
+ false),
contentFormatter.formatContent(reason,
monochromeForeground,
message.content.networkId)
@@ -542,24 +538,20 @@ class QuasselMessageRenderer @Inject constructor(
context.getString(R.string.message_format_kill_1),
contentFormatter.formatNick(user, false, monochromeForeground, false),
contentFormatter.formatPrefix(message.content.senderPrefixes),
- contentFormatter.formatNick(
- message.content.sender,
- self,
- monochromeForeground,
- messageSettings.showHostmaskActions
- )
+ contentFormatter.formatNick(message.content.sender,
+ self,
+ monochromeForeground,
+ false)
)
} else {
SpanFormatter.format(
context.getString(R.string.message_format_kill_2),
contentFormatter.formatNick(user, false, monochromeForeground, false),
contentFormatter.formatPrefix(message.content.senderPrefixes),
- contentFormatter.formatNick(
- message.content.sender,
- self,
- monochromeForeground,
- messageSettings.showHostmaskActions
- ),
+ contentFormatter.formatNick(message.content.sender,
+ self,
+ monochromeForeground,
+ false),
contentFormatter.formatContent(reason,
monochromeForeground,
message.content.networkId)
--
GitLab