From c72ced8b7241904ad8c80f789cc528b99239c423 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 15 May 2018 22:38:43 +0200
Subject: [PATCH] Fixes #90
---
.../ui/chat/info/user/UserInfoFragment.kt | 98 +++++++++----------
1 file changed, 49 insertions(+), 49 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt
index 204bb3bf2..c5f7f7450 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt
@@ -185,66 +185,66 @@ class UserInfoFragment : ServiceBoundFragment() {
server.text = user.server()
serverContainer.visibleIf(user.server().isNotBlank())
+ }
+ })
- actionQuery.setOnClickListener {
- viewModel.session {
- it.orNull()?.let { session ->
- val info = session.bufferSyncer?.find(
- bufferName = user.nick(),
- networkId = user.network().networkId(),
- type = Buffer_Type.of(Buffer_Type.QueryBuffer)
- )
-
- if (info != null) {
+ actionQuery.setOnClickListener {
+ viewModel.session {
+ it.orNull()?.let { session ->
+ val info = session.bufferSyncer?.find(
+ bufferName = nickName,
+ networkId = networkId,
+ type = Buffer_Type.of(Buffer_Type.QueryBuffer)
+ )
+
+ if (info != null) {
+ ChatActivity.launch(requireContext(), bufferId = info.bufferId)
+ } else {
+ viewModel.allBuffers.map {
+ listOfNotNull(it.find {
+ it.networkId == networkId && it.bufferName == nickName
+ })
+ }.filter {
+ it.isNotEmpty()
+ }.firstElement().toLiveData().observe(this, Observer {
+ it?.firstOrNull()?.let { info ->
ChatActivity.launch(requireContext(), bufferId = info.bufferId)
- } else {
- viewModel.allBuffers.map {
- listOfNotNull(it.find {
- it.networkId == user.network().networkId() && it.bufferName == user.nick()
- })
- }.filter {
- it.isNotEmpty()
- }.firstElement().toLiveData().observe(this, Observer {
- it?.firstOrNull()?.let { info ->
- ChatActivity.launch(requireContext(), bufferId = info.bufferId)
- }
- })
-
- session.bufferSyncer?.find(
- networkId = networkId,
- type = Buffer_Type.of(Buffer_Type.StatusBuffer)
- )?.let { statusInfo ->
- session.rpcHandler?.sendInput(statusInfo, "/query ${user.nick()}")
- }
}
+ })
+
+ session.bufferSyncer?.find(
+ networkId = networkId,
+ type = Buffer_Type.of(Buffer_Type.StatusBuffer)
+ )?.let { statusInfo ->
+ session.rpcHandler?.sendInput(statusInfo, "/query $nickName")
}
}
}
+ }
+ }
- actionIgnore.setOnClickListener {
- Toast.makeText(requireContext(), "Not Implemented", Toast.LENGTH_SHORT).show()
- }
+ actionIgnore.setOnClickListener {
+ Toast.makeText(requireContext(), "Not Implemented", Toast.LENGTH_SHORT).show()
+ }
- actionWhois.setOnClickListener {
- viewModel.session {
- it.orNull()?.let { session ->
- session.bufferSyncer?.find(
- networkId = networkId,
- type = Buffer_Type.of(Buffer_Type.StatusBuffer)
- )?.let { statusInfo ->
- val nick = user.nick()
- session.rpcHandler?.sendInput(statusInfo, "/whois $nick $nick")
- }
- }
- }
- }
+ actionMention.setOnClickListener {
+ ChatActivity.launch(requireContext(), sharedText = "$nickName: ")
+ }
- actionMention.setOnClickListener {
- ChatActivity.launch(requireContext(), sharedText = "${user.nick()}: ")
+ actionWhois.setOnClickListener {
+ viewModel.session {
+ it.orNull()?.let { session ->
+ session.bufferSyncer?.find(
+ networkId = networkId,
+ type = Buffer_Type.of(Buffer_Type.StatusBuffer)
+ )?.let { statusInfo ->
+ session.rpcHandler?.sendInput(statusInfo, "/whois $nickName $nickName")
+ }
}
- actionMention.visibleIf(arguments?.getBoolean("openBuffer") == false)
}
- })
+ }
+
+ actionMention.visibleIf(arguments?.getBoolean("openBuffer") == false)
val movementMethod = BetterLinkMovementMethod.newInstance()
movementMethod.setOnLinkLongClickListener(LinkLongClickMenuHelper())
--
GitLab