Git pull with conflits

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

@@ -19,7 +19,6 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { StorageService } from 'src/app/services/storage.service';
-import { Directory, Filesystem } from '@capacitor/filesystem';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
 import { Storage } from '@ionic/storage';
 import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service'
@@ -34,6 +33,9 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
 import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
 import { DocumentViewer, DocumentViewerOptions } from '@ionic-native/document-viewer';
+import { VoiceRecorder, VoiceRecorderPlugin, RecordingData, GenericResponse, CurrentRecordingStatus } from 'capacitor-voice-recorder';
+import { Filesystem, Directory, Encoding } from '@capacitor/filesystem';
+import { DomSanitizer } from '@angular/platform-browser';
 
 const IMAGE_DIR = 'stored-images';
 @Component({
@@ -78,7 +80,16 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   downloadFile: string;
   massages: MessageService[] = []
 
-  showAvatar = true
+  showAvatar = true;
+
+  recording = false;
+  allowTyping = true;
+  storedFileNames = [];
+  lastAudioRecorded = '';
+  audioRecorded:any = "";
+  audioDownloaded:any = "";
+  durationDisplay = '';
+  duration = 0;
 
   constructor(
     public popoverController: PopoverController,
@@ -107,11 +118,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     private CameraService: CameraService,
     private processesService: ProcessesService,
     private fileToBase64Service: FileToBase64Service,
+    private sanitiser: DomSanitizer,
   ) {
-
     this.loggedUser = authService.ValidatedUserChat['data'];
-
   }
+
   ngOnChanges(changes: SimpleChanges): void {
     this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({})
 
@@ -130,13 +141,17 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       this.showAvatar = true
     }, 150)
 
+    this.deleteRecording()
+
   }
 
   ngOnInit() {
     this.scrollToBottom();
 
     this.getChatMembers();
-
+    VoiceRecorder.requestAudioRecordingPermission();
+    this.deleteRecording();
+    this.loadFiles();
   }
 
 
@@ -176,7 +191,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   scrollToBottomClicked = () => {
-    console.log('scroll')
     try {
       this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
       //this.scrollingOnce = false;
@@ -209,6 +223,96 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     this.currentPosition = scroll;
   }
 
+  calculateDuration() {
+    if (!this.recording) {
+      this.duration = 0;
+      this.durationDisplay = '';
+      return;
+    }
+    this.duration += 1;
+    const minutes = Math.floor(this.duration / 60);
+    const seconds = (this.duration % 60).toString().padStart(2, '0');
+    this.durationDisplay = `${minutes}:${seconds}`;
+
+    setTimeout(() => {
+      this.calculateDuration();
+    }, 1000)
+  }
+
+  async getFile(fileName?:any){
+    const audioFile = await Filesystem.readFile({
+      path: fileName,
+      directory: Directory.Data
+    })
+    const base64sound = audioFile.data;
+    const base64Response = await fetch(`data:audio/ogg;base64,${base64sound}`);
+    this.audioRecorded = base64Response.url;
+  }
+
+  async loadFiles() {
+
+    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();
+    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);
+        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 deleteRecording(){
+    this.storage.remove('fileName');
+    this.storage.remove('recordData');
+
+    this.allowTyping = true;
+    this.lastAudioRecorded = '';
+    this.loadFiles();
+  }
+
   ngOnDestroy() {
     this.checktimeOut = false;
     window.removeEventListener('scroll', this.scrollChangeCallback, true);
@@ -250,9 +354,52 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     this.wsChatMethodsService.getDmRoom(this.roomId).send({})
   }
 
-  deleteMessage(msgId: string) {
-    const room = this.wsChatMethodsService.getDmRoom(this.roomId)
-    this.alertService.confirmDeleteMessage(msgId, room);
+  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}`;
+      }
+    });
+
+    //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": '', */
+        "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) {
@@ -333,14 +480,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   getChatMembers() {
-    console.log(this.roomId);
+    // console.log(this.roomId);
 
     //this.showLoader = true;
     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;
     });
   }
@@ -471,6 +616,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       temporaryData: formData,
       attachments: [{
         "title": file.path,
+        // "image_url": "",
         //"image_url": 'data:image/jpeg;base64,' + file.base64String,
         "text": "description",
         "title_link_download": false,
@@ -600,6 +746,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     const roomId = this.roomId
 
     const file: any = await this.fileService.getFileFromDevice(types);
+    
     console.log('Add file', file)
     /* const imageData =  await this.fileToBase64Service.convert(file).then((filee) => {
       console.log('Add file', filee)
@@ -763,9 +910,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
           ts: msg.attachments[0].ts
         }
 
-        await this.storage.set(msg.file.guid, this.downloadFile).then(() => {
-          console.log('IMAGE SAVED')
-        });
+        // save the changes to the storage
+        //msg.save()
+
+        
       }
 
     });
@@ -821,7 +969,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
 
   testEditMessage(msg: MessageService) {
-    msg.receptorReceive()
+    // msg.receptorReceive()
     // alert('cool!')
   }
 }