Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-26 12:44:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure messages are marked read when entering a conversation with an active typing indicator.

Browse Source
This commit is contained in:
Alex Hart
2022-03-18 13:15:37 -03:00
committed by GitHub
parent 782a1ce301
commit 75e15c81e1
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
View File

@@ -416,7 +416,7 @@ public class ConversationAdapter
}
boolean hasNoConversationMessages() {
return getItemCount() + fastRecords.size() == 0;
return super.getItemCount() + fastRecords.size() == 0;
}
/**

22
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@@ -1279,17 +1279,19 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
return;
}
if (position >= (isTypingIndicatorShowing() ? 1 : 0)) {
ConversationMessage item = getListAdapter().getItem(position);
if (item != null) {
MessageRecord record = item.getMessageRecord();
long latestReactionReceived = Stream.of(record.getReactions())
.map(ReactionRecord::getDateReceived)
.max(Long::compareTo)
.orElse(0L);
ConversationMessage item = getListAdapter().getItem(position);
if (item == null) {
item = getListAdapter().getItem(position + 1);
}
markReadHelper.onViewsRevealed(Math.max(record.getDateReceived(), latestReactionReceived));
}
if (item != null) {
MessageRecord record = item.getMessageRecord();
long latestReactionReceived = Stream.of(record.getReactions())
.map(ReactionRecord::getDateReceived)
.max(Long::compareTo)
.orElse(0L);
markReadHelper.onViewsRevealed(Math.max(record.getDateReceived(), latestReactionReceived));
}
}