mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-09 13:59:48 +01:00
Merge pull request #4925 from nextcloud/make_snackbar_clickable
make snackbar clickable
This commit is contained in:
commit
ba4df351ba
@ -3582,7 +3582,7 @@ class ChatActivity :
|
|||||||
when (type) {
|
when (type) {
|
||||||
ChatMessage.MessageType.VOICE_MESSAGE -> {
|
ChatMessage.MessageType.VOICE_MESSAGE -> {
|
||||||
uploadFile(shareUri.toString(), true, token = roomToken)
|
uploadFile(shareUri.toString(), true, token = roomToken)
|
||||||
Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT).show()
|
showSnackBar(roomToken)
|
||||||
}
|
}
|
||||||
|
|
||||||
ChatMessage.MessageType.SINGLE_NC_ATTACHMENT_MESSAGE -> {
|
ChatMessage.MessageType.SINGLE_NC_ATTACHMENT_MESSAGE -> {
|
||||||
@ -3591,16 +3591,12 @@ class ChatActivity :
|
|||||||
try {
|
try {
|
||||||
context.contentResolver.openInputStream(shareUri)?.close()
|
context.contentResolver.openInputStream(shareUri)?.close()
|
||||||
uploadFile(shareUri.toString(), false, caption!!, roomToken)
|
uploadFile(shareUri.toString(), false, caption!!, roomToken)
|
||||||
Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT).show()
|
showSnackBar(roomToken)
|
||||||
} catch (e: java.lang.Exception) {
|
} catch (e: java.lang.Exception) {
|
||||||
Log.w(TAG, "File corresponding to the uri does not exist $shareUri")
|
Log.w(TAG, "File corresponding to the uri does not exist $shareUri")
|
||||||
downloadFileToCache(message, false) {
|
downloadFileToCache(message, false) {
|
||||||
uploadFile(shareUri.toString(), false, caption!!, roomToken)
|
uploadFile(shareUri.toString(), false, caption!!, roomToken)
|
||||||
Snackbar.make(
|
showSnackBar(roomToken)
|
||||||
binding.root,
|
|
||||||
R.string.nc_message_added_to_notes,
|
|
||||||
Snackbar.LENGTH_SHORT
|
|
||||||
).show()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3615,7 +3611,7 @@ class ChatActivity :
|
|||||||
objectId,
|
objectId,
|
||||||
metaData
|
metaData
|
||||||
)
|
)
|
||||||
Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT).show()
|
showSnackBar(roomToken)
|
||||||
}
|
}
|
||||||
|
|
||||||
ChatMessage.MessageType.REGULAR_TEXT_MESSAGE -> {
|
ChatMessage.MessageType.REGULAR_TEXT_MESSAGE -> {
|
||||||
@ -3626,13 +3622,28 @@ class ChatActivity :
|
|||||||
message.message!!,
|
message.message!!,
|
||||||
conversationUser!!.displayName!!
|
conversationUser!!.displayName!!
|
||||||
)
|
)
|
||||||
Snackbar.make(binding.root, R.string.nc_message_added_to_notes, Snackbar.LENGTH_SHORT).show()
|
showSnackBar(roomToken)
|
||||||
}
|
}
|
||||||
|
|
||||||
else -> {}
|
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)
|
||||||
|
val chatIntent = Intent(context, ChatActivity::class.java)
|
||||||
|
chatIntent.putExtras(bundle)
|
||||||
|
chatIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
|
||||||
|
startActivity(chatIntent)
|
||||||
|
}
|
||||||
fun openInFilesApp(message: ChatMessage) {
|
fun openInFilesApp(message: ChatMessage) {
|
||||||
val keyID = message.selectedIndividualHashMap!![PreviewMessageViewHolder.KEY_ID]
|
val keyID = message.selectedIndividualHashMap!![PreviewMessageViewHolder.KEY_ID]
|
||||||
val link = message.selectedIndividualHashMap!!["link"]
|
val link = message.selectedIndividualHashMap!!["link"]
|
||||||
|
Loading…
Reference in New Issue
Block a user