From fbbd46ef20a820a036f8a5a0dba1ed83afc1385e Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Fri, 13 Dec 2019 13:29:59 +0100
Subject: [PATCH] Further fixes

---
 .../messages/MagicOutcomingTextMessageViewHolder.kt       | 3 +--
 .../talk/presenters/MentionAutocompletePresenter.kt       | 8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt
index b31d01d7d..a63cba48e 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt
@@ -51,12 +51,11 @@ class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessage
     @JvmField
     @BindView(R.id.messageTime)
     var messageTimeView: TextView? = null
-    val userUtils: UserUtils by inject()
     val context: Context by inject()
     private val realView: View
     override fun onBind(message: ChatMessage) {
         super.onBind(message)
-        val messageParameters: HashMap<String, HashMap<String, String>> = message.messageParameters
+        val messageParameters: HashMap<String, HashMap<String, String>>? = message.messageParameters
         var messageString: Spannable = SpannableString(message.text)
         realView.isSelected = false
         messageTimeView!!.setTextColor(context.resources.getColor(R.color.white60))
diff --git a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.kt b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.kt
index dc5f386c8..5d2d9f395 100644
--- a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.kt
+++ b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.kt
@@ -36,6 +36,8 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import org.koin.core.KoinComponent
 import org.koin.core.inject
 import java.util.*
@@ -43,7 +45,7 @@ import java.util.*
 class MentionAutocompletePresenter : RecyclerViewPresenter<Mention?>, FlexibleAdapter.OnItemClickListener, KoinComponent {
     val ncApi: NcApi by inject()
     val usersRepository: UsersRepository by inject()
-    private var currentUser: UserNgEntity?
+    private var currentUser: UserNgEntity? = null
     private var adapter: FlexibleAdapter<AbstractFlexibleItem<*>>? = null
     private var internalContext: Context
     private var roomToken: String? = null
@@ -57,7 +59,9 @@ class MentionAutocompletePresenter : RecyclerViewPresenter<Mention?>, FlexibleAd
     constructor(context: Context, roomToken: String?) : super(context) {
         this.roomToken = roomToken
         this.internalContext = context
-        currentUser = usersRepository.getActiveUser()
+        GlobalScope.launch {
+            currentUser = usersRepository.getActiveUser()
+        }
     }
 
     override fun instantiateAdapter(): RecyclerView.Adapter<*> {