Skip to content

Fixes "Typing indicators obscure last message content" #2082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SessionHero01 merged 2 commits into from
Mar 26, 2026
Merged

Fixes "Typing indicators obscure last message content" #2082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6da206
Fixes "Typing indicators obscure last message content"
SessionHero01 Mar 26, 2026
4e74735
Merge branch 'dev' into notif-qa-fixes
SessionHero01 Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,11 +1155,19 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
liveData.observe(this@ConversationActivityV2) { state ->
val recipients = state?.typists ?: emptyList()

// Quick-fix behavior kept as-is
val viewContainer = binding.typingIndicatorViewContainer
viewContainer.isVisible =
recipients.isNotEmpty() && isScrolledToBottom
viewContainer.setTypists(recipients)
val shouldShowTypingIndicator = recipients.isNotEmpty() &&
isScrolledToBottom

if (shouldShowTypingIndicator) {
binding.typingIndicatorViewContainer.isVisible = true
binding.typingIndicatorViewContainer.startAnimation()

// Make sure we are actually at the end
gotoConversationEnd(smoothScroll = false)
} else {
binding.typingIndicatorViewContainer.stopAnimation()
binding.typingIndicatorViewContainer.isVisible = false
}
}
}
}
Expand Down
6 changes: 0 additions & 6 deletions ...ava/org/thoughtcrime/securesms/conversation/v2/components/TypingIndicatorViewContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.LinearLayout
import network.loki.messenger.databinding.ViewConversationTypingContainerBinding
import org.session.libsession.utilities.Address

class TypingIndicatorViewContainer : LinearLayout {
private lateinit var binding: ViewConversationTypingContainerBinding
Expand All @@ -18,11 +17,6 @@ class TypingIndicatorViewContainer : LinearLayout {
binding = ViewConversationTypingContainerBinding.inflate(LayoutInflater.from(context), this, true)
}

fun setTypists(typists: List<Address>) {
if (typists.isEmpty()) { stopAnimation(); return }
startAnimation()
}

fun startAnimation() = binding.typingIndicator.root.startAnimation()
fun stopAnimation() = binding.typingIndicator.root.stopAnimation()
}