Merge branch 'develop-2.x' into chore/increment_build_beta5

app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt

@@ -68,8 +68,8 @@ class ViewModelMapper @Inject constructor(private val context: Context,
         }
 
         mapMessage(message).let {
-            if (list.size > 0) {
-                it.preview = list[0].preview
+            if (list.isNotEmpty()) {
+                it.preview = list.first().preview
             }
             list.add(it)
         }
@@ -213,7 +213,7 @@ class ViewModelMapper @Inject constructor(private val context: Context,
     private suspend fun stripMessageQuotes(message: Message): Message {
         val baseUrl = settings.baseUrl()
         return message.copy(
-                message = message.message.replace("\\[\\s\\]\\($baseUrl.*\\)".toRegex(), "").trim()
+                message = message.message.replace("\\[[^\\]]+\\]\\($baseUrl[^)]+\\)".toRegex(), "").trim()
         )
     }
 

app/src/main/java/chat/rocket/android/widget/autocompletion/ui/SuggestionsView.kt

@@ -203,11 +203,6 @@ class SuggestionsView : FrameLayout, TextWatcher {
             completionOffset.set(NO_STATE_INDEX)
         }
         collapse()
-        // Re-enable keyboard suggestions.
-        val editText = editor?.get()
-        if (editText != null) {
-            editText.inputType = editText.inputType and InputType.TYPE_TEXT_VARIATION_FILTER.inv()
-        }
     }
 
     private fun insertSuggestionOnEditor(item: SuggestionModel) {