Skip to content
Snippets Groups Projects
Verified Commit a5671c89 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixes #102

parent 6dfdaa14
No related branches found
No related tags found
No related merge requests found
...@@ -27,6 +27,7 @@ import android.support.v7.widget.DefaultItemAnimator ...@@ -27,6 +27,7 @@ import android.support.v7.widget.DefaultItemAnimator
import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView import android.support.v7.widget.RecyclerView
import android.text.SpannableString import android.text.SpannableString
import android.text.Spanned
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
...@@ -166,7 +167,13 @@ class ChatlineFragment : ServiceBoundFragment() { ...@@ -166,7 +167,13 @@ class ChatlineFragment : ServiceBoundFragment() {
fun send() { fun send() {
if (chatline.text.isNotBlank()) { if (chatline.text.isNotBlank()) {
val lines = chatline.text.lineSequence().map { val lines = chatline.text.lineSequence().map {
it to ircFormatSerializer.toEscapeCodes(SpannableString(it)) SpannableString(it).apply {
for (span in getSpans(0, length, Any::class.java)) {
if (getSpanFlags(span) and Spanned.SPAN_COMPOSING != 0) {
removeSpan(span)
}
}
} to ircFormatSerializer.toEscapeCodes(SpannableString(it))
} }
viewModel.session { sessionOptional -> viewModel.session { sessionOptional ->
...@@ -174,8 +181,8 @@ class ChatlineFragment : ServiceBoundFragment() { ...@@ -174,8 +181,8 @@ class ChatlineFragment : ServiceBoundFragment() {
viewModel.buffer { bufferId -> viewModel.buffer { bufferId ->
session?.bufferSyncer?.bufferInfo(bufferId)?.also { bufferInfo -> session?.bufferSyncer?.bufferInfo(bufferId)?.also { bufferInfo ->
val output = mutableListOf<IAliasManager.Command>() val output = mutableListOf<IAliasManager.Command>()
for ((raw, formatted) in lines) { for ((stripped, formatted) in lines) {
viewModel.addRecentlySentMessage(raw) viewModel.addRecentlySentMessage(stripped)
session.aliasManager?.processInput(bufferInfo, formatted, output) session.aliasManager?.processInput(bufferInfo, formatted, output)
} }
for (command in output) { for (command in output) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment