Skip to content

MOBILE-3039 messages: Fix mark as read not called in 3.6+ #1971

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
merged 1 commit into from
Jun 7, 2019
Merged

MOBILE-3039 messages: Fix mark as read not called in 3.6+ #1971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions src/addon/messages/pages/discussion/discussion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,11 +390,16 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
// Call resize to recalculate the dimensions.
this.content && this.content.resize();

// If we received a new message while using group messaging, force mark messages as read.
const last = this.messages[this.messages.length - 1],
forceMark = this.groupMessagingEnabled && last && last.useridfrom != this.currentUserId && this.lastMessage.text != ''
&& (last.text !== this.lastMessage.text || last.timecreated !== this.lastMessage.timecreated);

// Notify that there can be a new message.
this.notifyNewMessage();

// Mark retrieved messages as read if they are not.
this.markMessagesAsRead();
this.markMessagesAsRead(forceMark);
}

/**
Expand Down Expand Up @@ -576,15 +581,17 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
/**
* Mark messages as read.
*/
protected markMessagesAsRead(): void {
protected markMessagesAsRead(forceMark: boolean): void {
let readChanged = false;
const promises = [];

if (this.messagesProvider.isMarkAllMessagesReadEnabled()) {
let messageUnreadFound = false;

// Mark all messages at a time if there is any unread message.
if (this.groupMessagingEnabled) {
if (forceMark) {
messageUnreadFound = true;
} else if (this.groupMessagingEnabled) {
messageUnreadFound = this.conversation && this.conversation.unreadcount > 0 && this.conversationId > 0;
} else {
for (const x in this.messages) {
Expand Down Expand Up @@ -648,6 +655,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
const last = this.messages[this.messages.length - 1];

let trigger = false;

if (!last) {
this.lastMessage = {text: '', timecreated: 0};
trigger = true;
Expand Down