From 855392c85f4c314da55e09a2d24d305cef17d608 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Fri, 2 Sep 2016 18:08:10 +0200 Subject: [PATCH] Changed IrcFormatSerializer to fix bug #16224 SpannableString is initialized with the output of IrcFormatDeserializer::formatString. As SpannableString does not allow null inputs, we have to adapt this. --- .../de/kuschku/util/irc/format/IrcFormatDeserializer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/de/kuschku/util/irc/format/IrcFormatDeserializer.java b/app/src/main/java/de/kuschku/util/irc/format/IrcFormatDeserializer.java index 9c57fca69..89984debd 100644 --- a/app/src/main/java/de/kuschku/util/irc/format/IrcFormatDeserializer.java +++ b/app/src/main/java/de/kuschku/util/irc/format/IrcFormatDeserializer.java @@ -110,9 +110,9 @@ public class IrcFormatDeserializer { * @param str mIRC formatted String * @return a CharSequence with Android’s span format representing the input string */ - @Nullable + @NonNUll public CharSequence formatString(@Nullable String str) { - if (str == null) return null; + if (str == null) return ""; SpannableStringBuilder plainText = new SpannableStringBuilder(); FormatDescription bold = null; -- GitLab