From 0cbf904f58aedd14c99ac3d99d8f29db28e6b700 Mon Sep 17 00:00:00 2001 From: Rohan Sircar Date: Thu, 19 Mar 2020 22:04:04 +0530 Subject: [PATCH] added null checks to new messages listener --- chatto/src/main/javascript/ts/src/view/UserView.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/chatto/src/main/javascript/ts/src/view/UserView.ts b/chatto/src/main/javascript/ts/src/view/UserView.ts index d84345c..0b5995a 100644 --- a/chatto/src/main/javascript/ts/src/view/UserView.ts +++ b/chatto/src/main/javascript/ts/src/view/UserView.ts @@ -125,7 +125,7 @@ export class UserView implements Observer { // this._chatModel.getMessages(userName, vm.passphrase, null, "new"); el.className += " active"; log.debug("loop", this._newMessagesLoop) - if (vm.unlocked) { + if (vm.unlocked && vm.lastMessageTime != null) { this._newMessagesLoop = setInterval(this._chatModel.getMessages.bind(this._chatModel, vm, "update"), 10_000); } @@ -135,8 +135,10 @@ export class UserView implements Observer { // vms.filter(v => v.userName == vm.userName).map(v => v.userName = vm.userName) log.debug(vms) - this._newMessagesLoop = setInterval(this._chatModel.getMessages.bind(this._chatModel, - vm, "update"), 10_000); + if (vm.lastMessageTime != null) { + this._newMessagesLoop = setInterval(this._chatModel.getMessages.bind(this._chatModel, + vm, "update"), 10_000); + } this._model.notify(); }