Merge branch 'feature/chat' of https://bitbucket.org/equilibriumito/gabinete-digital into feature/chat

src/app/shared/chat/messages/messages.page.ts

@@ -9,6 +9,7 @@ import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popo
 import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
 import { ProfileComponent } from '../../headers/header-no-search/profile/profile.page';
 import { ContactsPage } from '../new-group/contacts/contacts.page';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-messages',
@@ -27,8 +28,10 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
   dm:any;
   userPresence='';
   dmUsers:any;
+  checktimeOut: boolean;
 
   @Input() roomId:string;
+  @Input() showMessages:string;
 
   constructor(
     public popoverController: PopoverController,
@@ -39,6 +42,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     private animationController: AnimationController,
     private alertService: AlertService,
     private toastService: ToastService,
+    private route: Router
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
 
@@ -58,9 +62,17 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
       this.load();
     /* }, 9000); */
     console.log(this.roomId);
+    console.log("Chat route", this.route.url)
 
 
 
+  }
+
+  ngOnDestroy(){
+    this.checktimeOut = false;
+    console.log('On Destroy')
+
+
   }
 
   notImplemented(){
@@ -68,6 +80,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
   }
 
   load(){
+    this.checktimeOut = true;
     this.serverLongPull();
     this.getChatMembers();
   }
@@ -294,8 +307,14 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
       this.messages = res['messages'].reverse();
       console.log(this.messages);
       // Reconnect in one second
-      await new Promise(resolve => setTimeout(resolve, 5000));
-      await this.serverLongPull();
+      if(this.route.url != "/home/chat"){
+        console.log("Timer message stop")
+      } else {
+         await new Promise(resolve => setTimeout(resolve, 1000));
+        await this.serverLongPull();
+        console.log('Timer message running')
+      }
+
     } else {
       // Got message
       //let message = await response.text();