From fb9c7ab5ac28a455c383c9cabc9fdf695152a15f Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Tue, 20 Mar 2018 23:16:00 +0100 Subject: [PATCH] Fixed an off-by-one error in the new autocomplete, removed debug code --- .../de/kuschku/quasseldroid_ng/ui/chat/AutoCompleteAdapter.kt | 4 ++-- .../java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt | 1 - .../quasseldroid_ng/util/irc/format/IrcFormatSerializer.kt | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/AutoCompleteAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/AutoCompleteAdapter.kt index 6c3b8a1e3..f96a87cb4 100644 --- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/AutoCompleteAdapter.kt +++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/AutoCompleteAdapter.kt @@ -38,8 +38,8 @@ class AutoCompleteAdapter( runInBackground { val word = it?.first ?: "" val list = it?.second ?: emptyList() - val old: List<AutoCompleteItem> = if (word.length >= 3) list else emptyList() - val new: List<AutoCompleteItem> = list + val old: List<AutoCompleteItem> = data + val new: List<AutoCompleteItem> = if (word.length >= 3) list else emptyList() val result = DiffUtil.calculateDiff( object : DiffUtil.Callback() { override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) = diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt index 23c844a41..17c4644fa 100644 --- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt +++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt @@ -137,7 +137,6 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc } } - println(next ?: Pair("", IntRange.EMPTY)) lastWord.onNext(next ?: Pair("", IntRange.EMPTY)) } diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatSerializer.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatSerializer.kt index f1a7cd2ce..64d17aa50 100644 --- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatSerializer.kt +++ b/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatSerializer.kt @@ -109,7 +109,6 @@ class IrcFormatSerializer internal constructor(private val context: Context) { } fun writeReset() { - println("reset") out.append(CODE_RESET) } -- GitLab