gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-19 10:45:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further fixes

Browse Source
This commit is contained in:
Mario Danic 2019-12-13 13:29:59 +01:00
parent 1053ccde64
commit fbbd46ef20
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt
View File

@ -51,12 +51,11 @@ class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessage
@JvmField @JvmField
@BindView(R.id.messageTime) @BindView(R.id.messageTime)
var messageTimeView: TextView? = null var messageTimeView: TextView? = null
val userUtils: UserUtils by inject()
val context: Context by inject() val context: Context by inject()
private val realView: View private val realView: View
override fun onBind(message: ChatMessage) { override fun onBind(message: ChatMessage) {
super.onBind(message) 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) var messageString: Spannable = SpannableString(message.text)
realView.isSelected = false realView.isSelected = false
messageTimeView!!.setTextColor(context.resources.getColor(R.color.white60)) messageTimeView!!.setTextColor(context.resources.getColor(R.color.white60))

8
app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.kt
View File

@ -36,6 +36,8 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import org.koin.core.KoinComponent import org.koin.core.KoinComponent
import org.koin.core.inject import org.koin.core.inject
import java.util.* import java.util.*
@ -43,7 +45,7 @@ import java.util.*
class MentionAutocompletePresenter : RecyclerViewPresenter<Mention?>, FlexibleAdapter.OnItemClickListener, KoinComponent { class MentionAutocompletePresenter : RecyclerViewPresenter<Mention?>, FlexibleAdapter.OnItemClickListener, KoinComponent {
val ncApi: NcApi by inject() val ncApi: NcApi by inject()
val usersRepository: UsersRepository by inject() val usersRepository: UsersRepository by inject()
private var currentUser: UserNgEntity? private var currentUser: UserNgEntity? = null
private var adapter: FlexibleAdapter<AbstractFlexibleItem<*>>? = null private var adapter: FlexibleAdapter<AbstractFlexibleItem<*>>? = null
private var internalContext: Context private var internalContext: Context
private var roomToken: String? = null private var roomToken: String? = null
@ -57,7 +59,9 @@ class MentionAutocompletePresenter : RecyclerViewPresenter<Mention?>, FlexibleAd
constructor(context: Context, roomToken: String?) : super(context) { constructor(context: Context, roomToken: String?) : super(context) {
this.roomToken = roomToken this.roomToken = roomToken
this.internalContext = context this.internalContext = context
currentUser = usersRepository.getActiveUser() GlobalScope.launch {
currentUser = usersRepository.getActiveUser()
}
} }
override fun instantiateAdapter(): RecyclerView.Adapter<*> { override fun instantiateAdapter(): RecyclerView.Adapter<*> {