conflit soved after merge

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

@@ -25,7 +25,6 @@ import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.serv
 import { WsChatService } from 'src/app/services/chat/ws-chat.service'
 import { MessageService } from 'src/app/services/chat/message.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
-
 import { CameraService } from 'src/app/services/camera.service';
 import { FileType } from 'src/app/models/fileType';
 import { SearchPage } from 'src/app/pages/search/search.page';
@@ -250,10 +249,22 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   async loadFiles() {
+    try {
+      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}`);
+        }
+      });
+    } catch (error) { }
 
-    this.storage.get('fileName').then((fileName) => {
-      this.lastAudioRecorded = fileName;
-    })
 
     this.storage.get('recordData').then((recordData) => {
       console.log(recordData);
@@ -267,7 +278,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   startRecording() {
-    console.log('Recording');
 
     if (this.recording) {
       return;
@@ -354,64 +364,49 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     this.wsChatMethodsService.getDmRoom(this.roomId).send({})
   }
 
-  async sendAudio(fileName) {
 
+  async sendAudio(fileName) {
     const roomId = this.roomId
     let audioFile;
     this.storage.get('recordData').then((recordData) => {
       console.log(recordData);
       audioFile = recordData;
+
       if (recordData.value.recordDataBase64.includes('data:audio')) {
         this.audioRecorded = recordData.value.recordDataBase64;
       }
-      else {
-        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`;
+      else{
+        this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
       }
-    });
+        //Converting base64 to blob
+        const encodedData = btoa(this.audioRecorded);
+        const blob = this.base64toBlob(encodedData, recordData.value.mimeType)
+        console.log(blob)
+        const formData = new FormData();
+        formData.append("blobFile", blob);
 
-    //Converting base64 to blob
-    const base64Response = await fetch(this.audioRecorded);
-    const blob = await base64Response.blob();
+        this.wsChatMethodsService.getDmRoom(roomId).send({
+          file: {
+            "type": "application/audio",
+            "msDuration": audioFile.value.msDuration,
+            "mimeType": audioFile.value.mimeType,
+          },
+          attachments: [{
+            "title": fileName,
+            "title_link_download": true,
+            "type": "audio"
+          }],
+          temporaryData: formData
+        })
 
-    const formData = new FormData();
-    formData.append("blobFile", blob);
-
-    this.wsChatMethodsService.getDmRoom(roomId).send({
-      file: {
-        "type": "application/audio",
-        /* "guid": '', */
-        "msDuration": audioFile.value.msDuration,
-        "mimeType": audioFile.value.mimeType,
-      },
-      attachments: [{
-        "title": fileName,
-        "title_link": this.audioRecorded,
-        "title_link_download": true,
-        "type": "audio"
-      }],
-      temporaryData: formData
-    })
+      });
     this.deleteRecording();
-
   }
 
+
   deleteMessage(msgId: string, msg: MessageService) {
-
-    /*  msg.delateStatusFalse()
-     this.wsChatMethodsService.getDmRoom(this.roomId).sendDeleteRequest(msgId) */
-
-  }
-
-  async viewDocument(msg: any, url?: string) {
-    if (msg.file.type == "application/img") {
-      let response: any = await this.AttachmentsService.getFile(msg.file.guid).toPromise();
-      console.log(response);
-      alert(response);
-
-      //this.openPreview(msg);
-
-    }
-    else if (msg.file.type == "application/webtrix") {
+    this.wsChatMethodsService.getDmRoom(this.roomId).sendDeleteRequest(msgId)
+    if (msg.file.type == "application/webtrix") {
       this.openViewDocumentModal(msg.file);
     }
     else {
@@ -955,6 +950,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     DocumentViewer.viewDocument
   }
 
+  async audioPreview(msg) {
+    console.log(msg);
+    if (!msg.attachments[0].title_link || msg.attachments[0].title_link === null || msg.attachments[0].title_link === '') {
+      this.downloadFileMsg(msg)
+    } else { }
+  }
+
   async openPreview(msg) {
     console.log(msg);
 
@@ -962,22 +964,22 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       this.downloadFileMsg(msg)
 
 
-   /*  } else if (msg.file.type === "application/pdf") {
-      
-
-      console.log(str);
-      const win = window.open("", "_blank");
-      let html = '';
-
-      html += '<html>';
-      html += '<body style="margin:0!important">';
-      html += '<iframe width="100%" height="100%" src="' + str + '" type="application/pdf" />';
-      html += '</body>';
-      html += '</html>';
-
-      setTimeout(() => {
-        win.document.write(html);
-      }, 0); */
+      /*  } else if (msg.file.type === "application/pdf") {
+         
+   
+         console.log(str);
+         const win = window.open("", "_blank");
+         let html = '';
+   
+         html += '<html>';
+         html += '<body style="margin:0!important">';
+         html += '<iframe width="100%" height="100%" src="' + str + '" type="application/pdf" />';
+         html += '</body>';
+         html += '</html>';
+   
+         setTimeout(() => {
+           win.document.write(html);
+         }, 0); */