diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 74f7fa641..01ac162b7 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -113,6 +113,7 @@
(showEmptyContainer)="showEmptyContainer()"
(showEmptyContainer)="showEmptyContainer()"
(openNewEventPage)="openNewEventPage($event)"
+ (getDirectMessages)="getDirectMessages($event)"
[style.display]="showMessages ? 'flex' : 'none'"
[roomId]="roomId"
[showMessages]="showMessages" #messagecontainer>
@@ -156,6 +157,7 @@
(openGroupContacts)="openGroupContactsPage($event)"
(openEditGroupPage)="openEditGroupPage($event)"
(openNewEventPage)="openNewEventPage($event)"
+ (getGroups)="getGroups($event)"
[style.display]="showGroupMessages ? 'flex' : 'none'"
class=" height-100 flex-column"
[roomId]="roomId" #messagecontainer>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 5b0b9d7fc..a9117c386 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -374,11 +374,11 @@ hideRefreshButton(){
});
}
- async getDirectMessages(){
+ async getDirectMessages(event?){
this.chatService.getAllDirectMessages().subscribe(async (res:any)=>{
- if(res.ims != 200){
+ if(res != 200){
console.log(res.ims);
this.userDirectMessages = res.ims.sort((a,b)=>{
var dateA = new Date(a._updatedAt).getTime();
@@ -391,12 +391,17 @@ hideRefreshButton(){
console.log("Timer message stop")
}
else {
+ console.log('TIMER');
//Check if modal is opened
if(this.segment == "Contactos" && this.showMessages != true){
- await new Promise(resolve => setTimeout(resolve, 5000));
+ await new Promise(resolve => setTimeout(resolve, 2000));
await this.getDirectMessages();
console.log('Timer contactos list running')
}
+ else{
+ console.log('No timer!');
+
+ }
}
}
else{
@@ -452,7 +457,7 @@ hideRefreshButton(){
});
}
- async getGroups(){
+ async getGroups(event?){
this.result = this.chatService.getAllPrivateGroups().subscribe(async (res:any)=>{
if(res.groups != 200){
@@ -474,7 +479,7 @@ hideRefreshButton(){
else {
//Check if modal is opened
if(this.segment == "Grupos" && this.showGroupMessages != true){
- await new Promise(resolve => setTimeout(resolve, 5000));
+ await new Promise(resolve => setTimeout(resolve, 2000));
await this.getGroups();
console.log('Timer groups list running')
}
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 7b388bd9e..c40abb91c 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, OnInit, ViewChild, AfterViewChecked, AfterViewInit, OnDestroy } from '@angular/core';
+import { Component, ElementRef, OnInit, ViewChild, AfterViewChecked, AfterViewInit, OnDestroy, } from '@angular/core';
import { ActionSheetController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 362468177..88f371032 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -41,6 +41,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
@Output() openGroupContacts:EventEmitter = new EventEmitter();
@Output() openEditGroupPage:EventEmitter = new EventEmitter();
@Output() openNewEventPage:EventEmitter = new EventEmitter();
+ @Output() getGroups:EventEmitter = new EventEmitter();
@ViewChild('scrollMe') private myScrollContainer: ElementRef;
@@ -457,8 +458,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
console.log("Timer message stop")
} else {
if(document.querySelector('app-group-messages')){
- await new Promise(resolve => setTimeout(resolve, 5000));
+ await new Promise(resolve => setTimeout(resolve,3000));
await this.serverLongPull();
+ this.getGroups.emit();
console.log('Timer message running')
}
else{
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index d3d9c75a3..b68c228c6 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -37,6 +37,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
@Input() showMessages:string;
@Output() openNewEventPage:EventEmitter = new EventEmitter();
+ @Output() getDirectMessages:EventEmitter = new EventEmitter();
synchro = synchro;
@@ -371,6 +372,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
if(document.querySelector('app-messages')){
await new Promise(resolve => setTimeout(resolve, 5000));
await this.serverLongPull();
+ this.getDirectMessages.emit();
console.log('Timer message running')
}
}