Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
weblate committed Jun 9, 2024
2 parents c5801d2 + f29e3f3 commit 1cf838c
Showing 1 changed file with 1 addition and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,7 @@ class FriendFeedInfoMenu : AbstractMenu() {
if (friendFeedMenuOptions.isEmpty()) return

val messaging = context.feature(Messaging::class)
val conversationId = messaging.lastFocusedConversationId ?: run {
context.shortToast("No conversation focused!")
return
}
val conversationId = messaging.lastFocusedConversationId ?: return
val targetUser = context.database.getDMOtherParticipant(conversationId)
messaging.resetLastFocusedConversation()

Expand Down

0 comments on commit 1cf838c

Please sign in to comment.