Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-21 11:38:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad notification state with in-thread reaction notifications.

Browse Source
This commit is contained in:
Cody Henthorne
2021-04-14 13:52:34 -04:00
committed by Greyson Parrelli
parent ed8edb5aee
commit c393cd655d
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,6 @@ import com.annimon.stream.Stream;
import org.signal.core.util.StreamUtil; import org.signal.core.util.StreamUtil;
import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log; import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.ApplicationPreferencesActivity; import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
import org.thoughtcrime.securesms.LoggingFragment; import org.thoughtcrime.securesms.LoggingFragment;
import org.thoughtcrime.securesms.PassphraseRequiredActivity; import org.thoughtcrime.securesms.PassphraseRequiredActivity;
@@ -96,6 +95,7 @@ import org.thoughtcrime.securesms.database.SmsDatabase;
import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord; import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord; import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
import org.thoughtcrime.securesms.database.model.ReactionRecord;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.groups.GroupId; import org.thoughtcrime.securesms.groups.GroupId;
import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange; import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange;
@@ -1157,10 +1157,13 @@ public class ConversationFragment extends LoggingFragment {
if (position >= (isTypingIndicatorShowing() ? 1 : 0)) { if (position >= (isTypingIndicatorShowing() ? 1 : 0)) {
ConversationMessage item = getListAdapter().getItem(position); ConversationMessage item = getListAdapter().getItem(position);
if (item != null) { if (item != null) {
long timestamp = item.getMessageRecord() MessageRecord record = item.getMessageRecord();
.getDateReceived(); long latestReactionReceived = Stream.of(record.getReactions())
.map(ReactionRecord::getDateReceived)
.max(Long::compareTo)
.orElse(0L);
markReadHelper.onViewsRevealed(timestamp); markReadHelper.onViewsRevealed(Math.max(record.getDateReceived(), latestReactionReceived));
} }
} }
} }
@@ -1616,6 +1619,12 @@ public class ConversationFragment extends LoggingFragment {
super.onItemRangeInserted(positionStart, itemCount); super.onItemRangeInserted(positionStart, itemCount);
} }
@Override
public void onItemRangeChanged(int positionStart, int itemCount) {
super.onItemRangeChanged(positionStart, itemCount);
list.post(ConversationFragment.this::postMarkAsReadRequest);
}
} }
private final class ConversationScrollRequestValidator implements SnapToTopDataObserver.ScrollRequestValidator { private final class ConversationScrollRequestValidator implements SnapToTopDataObserver.ScrollRequestValidator {

5
app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt
View File

@@ -56,6 +56,9 @@ object NotificationFactory {
if (Build.VERSION.SDK_INT >= 23 || state.conversations.size == 1) { if (Build.VERSION.SDK_INT >= 23 || state.conversations.size == 1) {
state.conversations.forEach { conversation -> state.conversations.forEach { conversation ->
if (conversation.threadId == visibleThreadId && conversation.hasNewNotifications()) { if (conversation.threadId == visibleThreadId && conversation.hasNewNotifications()) {
if (FeatureFlags.internalUser()) {
Log.i(TAG, "Thread is visible, notifying in thread. notificationId: ${conversation.notificationId}")
}
notifyInThread(context, conversation.recipient, lastAudibleNotification) notifyInThread(context, conversation.recipient, lastAudibleNotification)
} else if (conversation.hasNewNotifications() || alertOverrides.contains(conversation.threadId)) { } else if (conversation.hasNewNotifications() || alertOverrides.contains(conversation.threadId)) {
@@ -73,7 +76,7 @@ object NotificationFactory {
} }
} }
if (state.conversations.size > 1 || ServiceUtil.getNotificationManager(context).isDisplayingSummaryNotification()) { if ((state.conversations.size > 1 && threadsThatNewlyAlerted.isNotEmpty()) || ServiceUtil.getNotificationManager(context).isDisplayingSummaryNotification()) {
val builder: NotificationBuilder = NotificationBuilder.create(context) val builder: NotificationBuilder = NotificationBuilder.create(context)
builder.apply { builder.apply {