From 55153bf95b5950f80ebe2c7bbc6caaa8c5610841 Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Fri, 23 Aug 2019 14:55:33 +0800 Subject: [PATCH 01/31] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2d0b1d7d..1851f4e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kahla", - "version": "3.7.0", + "version": "3.7.1", "description": "Kahla is a cross-platform business messaging app.", "author": "Aiursoft (https://www.aiursoft.com/)", "build": { From d2a27d21117295c17e23b05a079da64f2809bd9c Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Fri, 23 Aug 2019 21:01:33 +0800 Subject: [PATCH 02/31] fix: check conversation before updating messages and conversation --- src/app/Controllers/talking.component.ts | 19 ++++++++++--------- src/app/Services/MessageService.ts | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/app/Controllers/talking.component.ts b/src/app/Controllers/talking.component.ts index 3b3b1e8f..46048a05 100644 --- a/src/app/Controllers/talking.component.ts +++ b/src/app/Controllers/talking.component.ts @@ -181,16 +181,17 @@ export class TalkingComponent implements OnDestroy, AfterViewInit { map(t => t.value) ) .subscribe(conversation => { - if (!this.uploadService.talkingDestroyed) { - this.updateConversation(conversation); - if (!this.cacheService.cachedData.conversationDetail[this.conversationID]) { - this.messageService.initMessage(this.conversationID); - this.messageService.getMessages(this.unread, this.conversationID, -1, this.load); - } - this.messageService.cleanMessageByTimer(); - this.cacheService.cachedData.conversationDetail[this.conversationID] = conversation; - this.cacheService.saveCache(); + if (this.conversationID !== conversation.id || this.uploadService.talkingDestroyed) { + return; + } + this.updateConversation(conversation); + if (!this.cacheService.cachedData.conversationDetail[this.conversationID]) { + this.messageService.initMessage(this.conversationID); + this.messageService.getMessages(this.unread, this.conversationID, -1, this.load); } + this.messageService.cleanMessageByTimer(); + this.cacheService.cachedData.conversationDetail[this.conversationID] = conversation; + this.cacheService.saveCache(); }); this.windowInnerHeight = window.innerHeight; } diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts index 776c2611..12f5b470 100644 --- a/src/app/Services/MessageService.ts +++ b/src/app/Services/MessageService.ts @@ -205,7 +205,7 @@ export class MessageService { map(t => t.items) ) .subscribe(messages => { - if (!this.conversation) { + if (!this.conversation || this.conversation.id !== id) { return; } const modifiedMsg = messages.map(t => this.modifyMessage(Object.assign({}, t))); From fe4854673eaf6ab58e1deeafaeeaf3ad2bd698a4 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Fri, 23 Aug 2019 21:03:35 +0800 Subject: [PATCH 03/31] feat: move share menu button to the top of group component --- src/app/Views/group.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/Views/group.html b/src/app/Views/group.html index d3107458..91c65822 100644 --- a/src/app/Views/group.html +++ b/src/app/Views/group.html @@ -18,6 +18,12 @@
Message
+ - +
Message
- +