Git pull with conflits

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

@@ -88,7 +88,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   LoadedDocument: any = null;
 
   recording = false;
+  allowTyping = true;
   storedFileNames = [];
+  lastAudioRecorded = '';
+  audioRecorded:any = "";
+  audioDownloaded:any = "";
   durationDisplay = '';
   duration = 0;
   @ViewChild('recordbtn', { read: ElementRef }) recordBtn: ElementRef;
@@ -101,6 +105,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   fileSelected?: Blob;
   pdfUrl?:string;
   base64File: string;
+  downloadProgess: number;
 
   constructor(
     public popoverController: PopoverController,
@@ -129,6 +134,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private multipleDocumentsPicker: MultipleDocumentsPicker,
     private sant: DomSanitizer,
     //private file: File
+    private sanitiser: DomSanitizer,
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
     this.roomId = this.navParams.get('roomId');
@@ -140,6 +146,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       }
     };
 
+    console.log(this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({}));
+
     this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({})
     this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked
     this.wsChatMethodsService.openRoom(this.roomId)
@@ -154,15 +162,14 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.wsChatMethodsService.getUserOfRoom(this.roomId).then((value) => {
       console.log('MEMBER', value)
     })
-
     //this.loadFiles();
     VoiceRecorder.requestAudioRecordingPermission();
     this.getChatMembers();
-    Filesystem.mkdir({
+    /* Filesystem.mkdir({
       path: IMAGE_DIR,
       directory: Directory.Data,
       recursive: true
-    });
+    }); */
   }
 
   ngAfterViewInit() {
@@ -176,11 +183,14 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       onStart: ev => {
         Haptics.impact({ style: ImpactStyle.Light })
         this.startRecording();
-        this.calculateDuration();
+        //this.calculateDuration();
       },
       onEnd: ev => {
         Haptics.impact({ style: ImpactStyle.Light })
         this.stopRecording();
+        /* setTimeout(() => {
+          this.loadFiles();
+        }, 500); */
       }
     }, true);
     longpress.enable();
@@ -203,61 +213,73 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   async loadFiles() {
-    Filesystem.readdir({
-      path: '',
-      directory: Directory.Data
-    }).then(result => {
-      console.log(result);
-      const temp: any[] = result.files.reverse();
-      this.storedFileNames = temp[0];
-      console.log(this.storedFileNames);
+
+    this.storage.get('fileName').then((fileName) => {
+      this.lastAudioRecorded = fileName;
     })
+
+    this.storage.get('recordData').then((recordData) => {
+      console.log(recordData);
+      if(recordData.value.recordDataBase64.includes('data:audio')){
+        this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData.value.recordDataBase64);
+      }
+      else{
+        this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`);
+      }
+    });
   }
 
   startRecording() {
+    console.log('Recording');
+
     if (this.recording) {
       return;
     }
     this.recording = true;
-    VoiceRecorder.startRecording();
+    VoiceRecorder.startRecording()
+    .then((result: GenericResponse) => console.log(result.value))
+    .catch(error => console.log(error));
+    this.calculateDuration();
   }
 
   stopRecording() {
+    this.deleteRecording();
+    this.allowTyping = false;
+    console.log('Stop');
     if (!this.recording) {
       return;
     }
     this.recording = false;
     VoiceRecorder.stopRecording().then(async (result: RecordingData) => {
+      console.log(result);
       this.recording = false;
       if (result.value && result.value.recordDataBase64) {
         const recordData = result.value.recordDataBase64;
-        console.log(recordData);
-        this.myAudio = recordData;
-        const fileName = new Date().getTime() + ".wav";
-        await Filesystem.writeFile({
-          path: fileName,
-          directory: Directory.Data,
-          data: recordData,
+        //console.log(recordData);
+        const fileName = new Date().getTime() + ".mp3";
+        //Save file
+        this.storage.set('fileName',fileName);
+        this.storage.set('recordData',result).then(() => {
+          console.log('Audio recorded saved');
         })
       }
     })
-
+    setTimeout(async () => {
+      this.loadFiles();
+    }, 1000);
   }
 
-  async playFile(fileName?: any) {
-    const audioFile = await Filesystem.readFile({
-      path: fileName,
-      directory: Directory.Data
-    })
-    console.log(audioFile);
-    const base64sound = audioFile.data;
-
-    const audioRef = new Audio(`data:audio/aac;base64,${base64sound}`)
-    audioRef.oncanplaythrough = () => audioRef.play();
-    audioRef.load();
+  async deleteRecording(){
+    this.storage.remove('fileName');
+    this.storage.remove('recordData');
 
+    this.allowTyping = true;
+    this.lastAudioRecorded = '';
+    this.loadFiles();
   }
 
+
+
   handlePress(id?: string) {
     this.selectedMsgId = id;
     this.showMessageOptions = true;
@@ -269,19 +291,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   deleteMessage(msgId: string) {
-    let body = {
-      "roomId": this.roomId,
-      "msgId": msgId,
-      "asUser": false,
-    }
-    if (msgId) {
-      //this.alertService.confirmDeleteMessage(body);
-    }
-    else {
-      this.toastService.badRequest('Não foi possível apagar');
-    }
-    this.showMessageOptions = false;
-    this.selectedMsgId = "";
+    const room = this.wsChatMethodsService.getDmRoom(this.roomId)
+    this.alertService.confirmDeleteMessage(msgId, room);
   }
 
 
@@ -291,6 +302,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
   close() {
     this.modalController.dismiss();
+    this.deleteRecording();
   }
 
   load() {
@@ -367,6 +379,44 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.wsChatMethodsService.getDmRoom(this.roomId).send({})
   }
 
+  async sendAudio(fileName) {
+
+    const roomId = this.roomId
+    this.storage.get('recordData').then((recordData) => {
+      console.log(recordData);
+      if(recordData.value.recordDataBase64.includes('data:audio')){
+        this.audioRecorded = recordData.value.recordDataBase64;
+      }
+      else{
+        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`;
+      }
+    });
+
+    //Converting base64 to blob
+    const base64Response = await fetch(this.audioRecorded);
+    const blob = await  base64Response.blob();
+
+    const formData = new FormData();
+    formData.append("blobFile", blob);
+
+    this.wsChatMethodsService.getDmRoom(roomId).send({
+      file: {
+        "type": "application/audio",
+        /* "guid": '', */
+      },
+      attachments: [{
+        "title": fileName ,
+        "title_link": this.audioRecorded,
+        "title_link_download": true,
+        "type": "file"
+      }],
+      temporaryData: formData
+    })
+    this.deleteRecording();
+
+  }
+
+
   viewDocument(msg: any, url?: string) {
     console.log(msg)
     if (msg.attachments.type == "application/webtrix") {
@@ -405,6 +455,13 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
+  /* playSound(url?:any){
+    alert('here')
+    console.log(url);
+    //this.audioDownloaded = this.sanitiser.bypassSecurityTrustResourceUrl(url);
+    this.audioDownloaded = url;
+  } */
+
   docIndex(index: number) {
     this.dicIndex = index
   }
@@ -464,8 +521,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.chatService.getMembers(this.roomId).subscribe(res => {
       this.members = res['members'];
       this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
-      console.log(res);
-      console.log(this.dmUsers);
       this.showLoader = false;
     });
   }
@@ -956,6 +1011,11 @@ fileToBase64 = (blob,filename) => {
 
   }
 
+ /*  testeDownload(msg: MessageService) {
+    this.downloadFile = "";
+    this.AttachmentsService.downloadFileAndStore(msg.file.guid);
+  } */
+
 
   downloadFileMsg(msg: MessageService) {
     console.log('FILE TYPE', msg.file.type)
@@ -966,7 +1026,8 @@ fileToBase64 = (blob,filename) => {
       var name = msg.file.guid;
 
       if (event.type === HttpEventType.DownloadProgress) {
-        //this.downloadProgess = Math.round((100 * event.loaded) / event.total);
+        this.downloadProgess = Math.round((100 * event.loaded) / event.total);
+        console.log(this.downloadProgess)
         console.log('FILE TYPE 33', msg.file.type)
       } else if (event.type === HttpEventType.Response) {
         if (msg.file.type == "application/img") {
@@ -1009,7 +1070,8 @@ fileToBase64 = (blob,filename) => {
     console.log(msg);
 
     if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url === '') {
-      this.downloadFileMsg(msg)
+      this.downloadFile(msg)
+      //this.testDownlod(msg)
 
     } else {
       const modal = await this.modalController.create({