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

src/app/pages/chat/chat.page.ts

@@ -12,7 +12,7 @@ import {
 import { ModalController, Platform } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
-import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
+import { wsChatService as wsChatService} from 'src/app/services/chat/chat.service'
 import { GroupMessagesPage } from './group-messages/group-messages.page';
 import { ContactsPage } from './messages/contacts/contacts.page';
 import { MessagesPage } from './messages/messages.page';
@@ -127,8 +127,7 @@ export class ChatPage implements OnInit {
     private sqlservice: SqliteService,
     private platform: Platform,
     private storageservice: StorageService,
-    public ChatServiceGPR: ChatServiceGPR,
-    private wsService: WebsocketService,
+    public wsChatService: wsChatService
 
   ) {
 
@@ -144,9 +143,9 @@ export class ChatPage implements OnInit {
 
     console.log("CHAT PAGE");
 
-    wsService.messages.subscribe(msg => {
+    /* wsService.messages.subscribe(msg => {
       console.log("Response from Websocket server: "+msg);
-    });
+    }); */
 
     this.load()
   }
@@ -243,7 +242,7 @@ export class ChatPage implements OnInit {
   } */
 
 
-  loadMessage(){
+/*   loadMessage(){
     this.wsService.messages.subscribe(msg => {
       console.log("Response from websocket: " + msg);
     });
@@ -253,7 +252,7 @@ export class ChatPage implements OnInit {
     this.wsService.messages.next(this.message);
     this.message.msg = "";
     this.loadMessage();
-  }
+  } */
 
 
   /* Fim websockets functions */