From 1858b6a8e06ce29d2c1ee549482115df4776d504 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 4 May 2018 03:04:37 +0200
Subject: [PATCH] Fixes #71

Signed-off-by: Janne Koschinski <janne@kuschku.de>
---
 .../quasseldroid/ui/chat/info/user/UserInfoFragment.kt   | 9 +++++++--
 app/src/main/res/values-de/strings.xml                   | 1 +
 app/src/main/res/values-lt/strings.xml                   | 1 +
 app/src/main/res/values/strings.xml                      | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt
index 38cff4514..3c699be77 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt
@@ -21,6 +21,7 @@ package de.kuschku.quasseldroid.ui.chat.info.user
 
 import android.arch.lifecycle.Observer
 import android.os.Bundle
+import android.text.SpannableString
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -33,6 +34,7 @@ import butterknife.ButterKnife
 import de.kuschku.libquassel.protocol.Buffer_Type
 import de.kuschku.libquassel.quassel.syncables.IrcUser
 import de.kuschku.libquassel.util.IrcUserUtils
+import de.kuschku.libquassel.util.helpers.nullIf
 import de.kuschku.quasseldroid.R
 import de.kuschku.quasseldroid.settings.MessageSettings
 import de.kuschku.quasseldroid.ui.chat.ChatActivity
@@ -40,6 +42,7 @@ import de.kuschku.quasseldroid.ui.chat.input.AutoCompleteHelper.Companion.IGNORE
 import de.kuschku.quasseldroid.util.avatars.AvatarHelper
 import de.kuschku.quasseldroid.util.helper.*
 import de.kuschku.quasseldroid.util.irc.format.ContentFormatter
+import de.kuschku.quasseldroid.util.irc.format.spans.IrcItalicSpan
 import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
 import de.kuschku.quasseldroid.util.ui.BetterLinkMovementMethod
 import de.kuschku.quasseldroid.util.ui.LinkLongClickMenuHelper
@@ -156,8 +159,10 @@ class UserInfoFragment : ServiceBoundFragment() {
         realName.text = contentFormatter.formatContent(user.realName())
         realName.visibleIf(user.realName().isNotBlank() && user.realName() != user.nick())
 
-        awayMessage.text = user.awayMessage()
-        awayContainer.visibleIf(user.isAway() && user.awayMessage().isNotBlank())
+        awayMessage.text = user.awayMessage().nullIf { it.isBlank() } ?: SpannableString(getString(R.string.label_no_away_message)).apply {
+          setSpan(IrcItalicSpan(), 0, length, 0)
+        }
+        awayContainer.visibleIf(user.isAway())
 
         account.text = user.account()
         accountContainer.visibleIf(user.account().isNotBlank())
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 51efc66a8..9b8915ca0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -72,6 +72,7 @@
   <string name="label_new_server">Server hinzufügen</string>
   <string name="label_nicklist">Benutzerliste</string>
   <string name="label_no">Nein</string>
+  <string name="label_no_away_message">Kein Abwesenheitsgrund angegeben</string>
   <string name="label_reply">Antworten</string>
   <string name="label_reset">Zurücksetzen</string>
   <string name="label_open">Öffnen</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 50e50bdf2..fa607cbff 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -72,6 +72,7 @@
   <string name="label_new_server">Naujas Serveris</string>
   <string name="label_nicklist">Slapyvardžių Sąrašas</string>
   <string name="label_no">Ne</string>
+  <string name="label_no_away_message">Priežastis nenurodyta</string>
   <string name="label_reply">Atsakyti</string>
   <string name="label_reset">Atstatyti</string>
   <string name="label_open">Atverti</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 25530b8c4..5f49cfdb3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -72,6 +72,7 @@
   <string name="label_new_server">New Server</string>
   <string name="label_nicklist">Nick List</string>
   <string name="label_no">No</string>
+  <string name="label_no_away_message">No Away Message Set</string>
   <string name="label_reply">Reply</string>
   <string name="label_reset">Reset</string>
   <string name="label_open">Open</string>
-- 
GitLab