From 4ec2cb8e7a0772fce9493ed74beb5169def21df0 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 28 Apr 2025 16:17:15 +0200 Subject: [PATCH 1/4] make snackbar clickable Signed-off-by: sowjanyakch --- .../com/nextcloud/talk/chat/ChatActivity.kt | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 20382f661..c51a4720c 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -2906,6 +2906,12 @@ class ChatActivity : searchItem.isVisible = CapabilitiesUtil.isUnifiedSearchAvailable(spreedCapabilities) && currentConversation!!.remoteServer.isNullOrEmpty() + if (currentConversation!!.remoteServer != null || + !CapabilitiesUtil.isSharedItemsAvailable(spreedCapabilities) + ) { + menu.removeItem(R.id.shared_items) + } + if (CapabilitiesUtil.isAbleToCall(spreedCapabilities)) { conversationVoiceCallMenuItem = menu.findItem(R.id.conversation_voice_call) conversationVideoMenuItem = menu.findItem(R.id.conversation_video_call) @@ -3583,6 +3589,11 @@ class ChatActivity : ChatMessage.MessageType.VOICE_MESSAGE -> { uploadFile(shareUri.toString(), true, token = roomToken) Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT).show() + val snackBar = Snackbar.make(binding.root, R.string.nc_message_sent, Snackbar.LENGTH_LONG) + snackBar.view.setOnClickListener { + openNoteToSelfConversation(roomToken) + } + snackBar.show() } ChatMessage.MessageType.SINGLE_NC_ATTACHMENT_MESSAGE -> { @@ -3592,6 +3603,11 @@ class ChatActivity : context.contentResolver.openInputStream(shareUri)?.close() uploadFile(shareUri.toString(), false, caption!!, roomToken) Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT).show() + val snackBar = Snackbar.make(binding.root, R.string.nc_message_sent, Snackbar.LENGTH_LONG) + snackBar.view.setOnClickListener { + openNoteToSelfConversation(roomToken) + } + snackBar.show() } catch (e: java.lang.Exception) { Log.w(TAG, "File corresponding to the uri does not exist $shareUri") downloadFileToCache(message, false) { @@ -3601,6 +3617,11 @@ class ChatActivity : R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT ).show() + val snackBar = Snackbar.make(binding.root, R.string.nc_message_sent, Snackbar.LENGTH_LONG) + snackBar.view.setOnClickListener { + openNoteToSelfConversation(roomToken) + } + snackBar.show() } } } @@ -3616,6 +3637,11 @@ class ChatActivity : metaData ) Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT).show() + val snackBar = Snackbar.make(binding.root, R.string.nc_message_sent, Snackbar.LENGTH_LONG) + snackBar.view.setOnClickListener { + openNoteToSelfConversation(roomToken) + } + snackBar.show() } ChatMessage.MessageType.REGULAR_TEXT_MESSAGE -> { @@ -3627,12 +3653,24 @@ class ChatActivity : conversationUser!!.displayName!! ) Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT).show() + val snackBar = Snackbar.make(binding.root, R.string.nc_message_sent, Snackbar.LENGTH_LONG) + snackBar.view.setOnClickListener { + openNoteToSelfConversation(roomToken) + } + snackBar.show() } - else -> {} } } + fun openNoteToSelfConversation(noteToSelfRoomToken:String){ + val bundle = Bundle() + bundle.putString(KEY_ROOM_TOKEN, noteToSelfRoomToken) + val chatIntent = Intent(context, ChatActivity::class.java) + chatIntent.putExtras(bundle) + chatIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) + startActivity(chatIntent) + } fun openInFilesApp(message: ChatMessage) { val keyID = message.selectedIndividualHashMap!![PreviewMessageViewHolder.KEY_ID] val link = message.selectedIndividualHashMap!!["link"] From 3dc390a8cddb895c108fb9ffbab701de601c9751 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 28 Apr 2025 16:25:10 +0200 Subject: [PATCH 2/4] ktlintFormat Signed-off-by: sowjanyakch --- .../com/nextcloud/talk/chat/ChatActivity.kt | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index c51a4720c..94fcc82ad 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -3588,10 +3588,9 @@ class ChatActivity : when (type) { ChatMessage.MessageType.VOICE_MESSAGE -> { uploadFile(shareUri.toString(), true, token = roomToken) - Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT).show() - val snackBar = Snackbar.make(binding.root, R.string.nc_message_sent, Snackbar.LENGTH_LONG) + val snackBar = Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_LONG) snackBar.view.setOnClickListener { - openNoteToSelfConversation(roomToken) + openNoteToSelfConversation(roomToken) } snackBar.show() } @@ -3602,8 +3601,7 @@ class ChatActivity : try { context.contentResolver.openInputStream(shareUri)?.close() uploadFile(shareUri.toString(), false, caption!!, roomToken) - Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT).show() - val snackBar = Snackbar.make(binding.root, R.string.nc_message_sent, Snackbar.LENGTH_LONG) + val snackBar = Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_LONG) snackBar.view.setOnClickListener { openNoteToSelfConversation(roomToken) } @@ -3612,12 +3610,7 @@ class ChatActivity : Log.w(TAG, "File corresponding to the uri does not exist $shareUri") downloadFileToCache(message, false) { uploadFile(shareUri.toString(), false, caption!!, roomToken) - Snackbar.make( - binding.root, - R.string.nc_message_added_to_notes, - Snackbar.LENGTH_SHORT - ).show() - val snackBar = Snackbar.make(binding.root, R.string.nc_message_sent, Snackbar.LENGTH_LONG) + val snackBar = Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_LONG) snackBar.view.setOnClickListener { openNoteToSelfConversation(roomToken) } @@ -3636,8 +3629,7 @@ class ChatActivity : objectId, metaData ) - Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT).show() - val snackBar = Snackbar.make(binding.root, R.string.nc_message_sent, Snackbar.LENGTH_LONG) + val snackBar = Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_LONG) snackBar.view.setOnClickListener { openNoteToSelfConversation(roomToken) } @@ -3652,8 +3644,7 @@ class ChatActivity : message.message!!, conversationUser!!.displayName!! ) - Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT).show() - val snackBar = Snackbar.make(binding.root, R.string.nc_message_sent, Snackbar.LENGTH_LONG) + val snackBar = Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_LONG) snackBar.view.setOnClickListener { openNoteToSelfConversation(roomToken) } @@ -3663,7 +3654,7 @@ class ChatActivity : } } - fun openNoteToSelfConversation(noteToSelfRoomToken:String){ + fun openNoteToSelfConversation(noteToSelfRoomToken: String) { val bundle = Bundle() bundle.putString(KEY_ROOM_TOKEN, noteToSelfRoomToken) val chatIntent = Intent(context, ChatActivity::class.java) From 70bfbb321097767ba810c056a0cefafb0e2ceb45 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 28 Apr 2025 16:41:56 +0200 Subject: [PATCH 3/4] refactor Signed-off-by: sowjanyakch --- .../com/nextcloud/talk/chat/ChatActivity.kt | 38 +++++++------------ 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 94fcc82ad..69525125a 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -3588,11 +3588,7 @@ class ChatActivity : when (type) { ChatMessage.MessageType.VOICE_MESSAGE -> { uploadFile(shareUri.toString(), true, token = roomToken) - val snackBar = Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_LONG) - snackBar.view.setOnClickListener { - openNoteToSelfConversation(roomToken) - } - snackBar.show() + showSnackBar(roomToken) } ChatMessage.MessageType.SINGLE_NC_ATTACHMENT_MESSAGE -> { @@ -3601,20 +3597,12 @@ class ChatActivity : try { context.contentResolver.openInputStream(shareUri)?.close() uploadFile(shareUri.toString(), false, caption!!, roomToken) - val snackBar = Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_LONG) - snackBar.view.setOnClickListener { - openNoteToSelfConversation(roomToken) - } - snackBar.show() + showSnackBar(roomToken) } catch (e: java.lang.Exception) { Log.w(TAG, "File corresponding to the uri does not exist $shareUri") downloadFileToCache(message, false) { uploadFile(shareUri.toString(), false, caption!!, roomToken) - val snackBar = Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_LONG) - snackBar.view.setOnClickListener { - openNoteToSelfConversation(roomToken) - } - snackBar.show() + showSnackBar(roomToken) } } } @@ -3629,11 +3617,7 @@ class ChatActivity : objectId, metaData ) - val snackBar = Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_LONG) - snackBar.view.setOnClickListener { - openNoteToSelfConversation(roomToken) - } - snackBar.show() + showSnackBar(roomToken) } ChatMessage.MessageType.REGULAR_TEXT_MESSAGE -> { @@ -3644,16 +3628,20 @@ class ChatActivity : message.message!!, conversationUser!!.displayName!! ) - val snackBar = Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_LONG) - snackBar.view.setOnClickListener { - openNoteToSelfConversation(roomToken) - } - snackBar.show() + showSnackBar(roomToken) } else -> {} } } + fun showSnackBar(roomToken: String) { + val snackBar = Snackbar.make(binding.root, R.string.nc_message_sent, Snackbar.LENGTH_LONG) + snackBar.view.setOnClickListener { + openNoteToSelfConversation(roomToken) + } + snackBar.show() + } + fun openNoteToSelfConversation(noteToSelfRoomToken: String) { val bundle = Bundle() bundle.putString(KEY_ROOM_TOKEN, noteToSelfRoomToken) From 582eda8480dd6f57c3c02c2b614d9da2e25576df Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Wed, 14 May 2025 19:03:08 +0200 Subject: [PATCH 4/4] merge conflicts Signed-off-by: sowjanyakch --- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 69525125a..6a5c26314 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -2906,12 +2906,6 @@ class ChatActivity : searchItem.isVisible = CapabilitiesUtil.isUnifiedSearchAvailable(spreedCapabilities) && currentConversation!!.remoteServer.isNullOrEmpty() - if (currentConversation!!.remoteServer != null || - !CapabilitiesUtil.isSharedItemsAvailable(spreedCapabilities) - ) { - menu.removeItem(R.id.shared_items) - } - if (CapabilitiesUtil.isAbleToCall(spreedCapabilities)) { conversationVoiceCallMenuItem = menu.findItem(R.id.conversation_voice_call) conversationVideoMenuItem = menu.findItem(R.id.conversation_video_call)