EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1971 from dpalou/MOBILE-3039 

MOBILE-3039 messages: Fix mark as read not called in 3.6+
main
Juan Leyva 2019-06-07 10:05:42 +02:00 committed by GitHub
parent dd6d7e82a1 caa4d9e9b3
commit e6f982ec93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/addon/messages/pages/discussion/discussion.ts
View File

@ -391,11 +391,16 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
// Call resize to recalculate the dimensions. // Call resize to recalculate the dimensions.
this.content && this.content.resize(); 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. // Notify that there can be a new message.
this.notifyNewMessage(); this.notifyNewMessage();
// Mark retrieved messages as read if they are not. // Mark retrieved messages as read if they are not.
this.markMessagesAsRead(); this.markMessagesAsRead(forceMark);
} }
/** /**
@ -577,7 +582,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
/** /**
* Mark messages as read. * Mark messages as read.
*/ */
protected markMessagesAsRead(): void { protected markMessagesAsRead(forceMark: boolean): void {
let readChanged = false; let readChanged = false;
const promises = []; const promises = [];
@ -585,7 +590,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
let messageUnreadFound = false; let messageUnreadFound = false;
// Mark all messages at a time if there is any unread message. // 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; messageUnreadFound = this.conversation && this.conversation.unreadcount > 0 && this.conversationId > 0;
} else { } else {
for (const x in this.messages) { for (const x in this.messages) {
@ -649,6 +656,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
const last = this.messages[this.messages.length - 1]; const last = this.messages[this.messages.length - 1];
let trigger = false; let trigger = false;
if (!last) { if (!last) {
this.lastMessage = {text: '', timecreated: 0}; this.lastMessage = {text: '', timecreated: 0};
trigger = true; trigger = true;