Skip to content

Commit a4ed2a3

Browse files
authored
Merge pull request #5910 from nextcloud/issue-5899-delete-pinned-msg
Bug fix: Clearing pinned message after conversation is cleared
2 parents cf96038 + f95f853 commit a4ed2a3

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ class ChatActivity :
691691
}
692692
}
693693
.collectLatest { message ->
694-
if (message != null) {
694+
if (message != null && message.systemMessageType != ChatMessage.SystemMessageType.CLEARED_CHAT) {
695695
binding.pinnedMessageContainer.visibility = View.VISIBLE
696696
binding.pinnedMessageComposeView.setContent {
697697
PinnedMessageView(
@@ -3569,7 +3569,7 @@ class ChatActivity :
35693569

35703570
private fun launchFileShareLink() {
35713571
val intent = Intent(Intent.ACTION_VIEW).apply {
3572-
setData((conversationUser.baseUrl + "/f/" + currentConversation?.objectId).toUri())
3572+
data = (conversationUser.baseUrl + "/f/" + currentConversation?.objectId).toUri()
35733573
}
35743574
startActivity(intent)
35753575
}

0 commit comments

Comments
 (0)