Feature send pdf done and verification added to mobile pdf preview

src/app/shared/chat/group-messages/group-messages.page.html

@@ -217,9 +217,9 @@
           <ion-fab-button title="Nova Reunião" (click)="bookMeeting()" color="light">
             <ion-icon name="calendar"></ion-icon>
           </ion-fab-button>
-          <!-- <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
+          <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
             <ion-icon name="document"></ion-icon>
-          </ion-fab-button> -->
+          </ion-fab-button>
           <ion-fab-button title="Anexar Fotografia" (click)="addImage()" color="light">
             <ion-icon name="image"></ion-icon>
           </ion-fab-button>

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

@@ -94,8 +94,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   allowTyping = true;
   storedFileNames = [];
   lastAudioRecorded = '';
-  audioRecorded:any = "";
-  audioDownloaded:any = "";
+  audioRecorded: any = "";
+  audioDownloaded: any = "";
   durationDisplay = '';
   duration = 0;
 
@@ -142,7 +142,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
     this.showAvatar = false
 
-    setTimeout(()=>{
+    setTimeout(() => {
       this.scrollToBottomClicked()
       this.showAvatar = true
     }, 50)
@@ -152,7 +152,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
   ngOnInit() {
-    this.loggedUser=this.loggedUserChat;
+    this.loggedUser = this.loggedUserChat;
     setTimeout(() => {
       this.getRoomInfo();
     }, 1000);
@@ -260,7 +260,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     }, 1000)
   }
 
-  async getFile(fileName?:any){
+  async getFile(fileName?: any) {
     const audioFile = await Filesystem.readFile({
       path: fileName,
       directory: Directory.Data
@@ -278,14 +278,14 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
       this.storage.get('recordData').then((recordData) => {
         console.log(recordData);
-        if(recordData?.value?.recordDataBase64.includes('data:audio')){
+        if (recordData?.value?.recordDataBase64.includes('data:audio')) {
           this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData?.value?.recordDataBase64);
         }
-        else{
+        else {
           this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
         }
       });
-    } catch (error) {}
+    } catch (error) { }
 
 
   }
@@ -317,8 +317,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         //console.log(recordData);
         const fileName = new Date().getTime() + ".mp3";
         //Save file
-        this.storage.set('fileName',fileName);
-        this.storage.set('recordData',result).then(() => {
+        this.storage.set('fileName', fileName);
+        this.storage.set('recordData', result).then(() => {
           console.log('Audio recorded saved');
         })
       }
@@ -328,7 +328,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     }, 1000);
   }
 
-  async deleteRecording(){
+  async deleteRecording() {
     this.storage.remove('fileName');
     this.storage.remove('recordData');
 
@@ -426,17 +426,17 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     var byteArrays = new Array(slicesCount);
 
     for (var sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
-        var begin = sliceIndex * sliceSize;
-        var end = Math.min(begin + sliceSize, bytesLength);
+      var begin = sliceIndex * sliceSize;
+      var end = Math.min(begin + sliceSize, bytesLength);
 
-        var bytes = new Array(end - begin);
-        for (var offset = begin, i = 0; offset < end; ++i, ++offset) {
-            bytes[i] = byteCharacters[offset].charCodeAt(0);
-        }
-        byteArrays[sliceIndex] = new Uint8Array(bytes);
+      var bytes = new Array(end - begin);
+      for (var offset = begin, i = 0; offset < end; ++i, ++offset) {
+        bytes[i] = byteCharacters[offset].charCodeAt(0);
+      }
+      byteArrays[sliceIndex] = new Uint8Array(bytes);
     }
     return new Blob(byteArrays, { type: contentType });
-}
+  }
 
   async sendAudio(fileName) {
     const roomId = this.roomId
@@ -444,36 +444,36 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     this.storage.get('recordData').then((recordData) => {
       console.log(recordData);
       audioFile = recordData;
-      if(recordData?.value?.recordDataBase64.includes('data:audio')){
+      if (recordData?.value?.recordDataBase64.includes('data:audio')) {
         this.audioRecorded = recordData?.value?.recordDataBase64;
       }
-      else{
+      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 encodedData = btoa(this.audioRecorded);
+      const blob = this.base64toBlob(encodedData, recordData.value.mimeType)
+      console.log(blob)
+      const formData = new FormData();
+      formData.append("blobFile", blob);
 
-    this.wsChatMethodsService.getGroupRoom(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
-    })
+      this.wsChatMethodsService.getGroupRoom(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
+      })
 
-  });
+    });
     this.deleteRecording();
   }
 
@@ -724,7 +724,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     //const imageData =  await this.fileToBase64Service.convert(file)
     //console.log('ADDFILECHAT', imageData)
 
-    const response = await fetch('data:image/jpeg;base64,'+ file.base64String!);
+    const response = await fetch('data:image/jpeg;base64,' + file.base64String!);
     const blob = await response.blob();
 
     const formData = new FormData();
@@ -737,8 +737,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       },
       temporaryData: formData,
       attachments: [{
-        "title": file.path ,
-        "image_url": 'data:image/jpeg;base64,' +file.base64String,
+        "title": file.path,
+        "image_url": 'data:image/jpeg;base64,' + file.base64String,
         "text": "description",
         "title_link_download": false,
       }]
@@ -752,7 +752,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     const image = await this.CameraService.takePicture();
     await this.fileService.saveImage(image)
     const lastphoto: any = await this.fileService.loadFiles();
-    const { capturedImage, capturedImageTitle} = await this.fileService.loadFileData(lastphoto);
+    const { capturedImage, capturedImageTitle } = await this.fileService.loadFileData(lastphoto);
 
     const base64 = await fetch(capturedImage);
     const blob = await base64.blob();
@@ -765,7 +765,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         "guid": ''
       },
       attachments: [{
-        "title": capturedImageTitle ,
+        "title": capturedImageTitle,
         "image_url": capturedImage,
         "text": "description",
         "title_link_download": false,
@@ -796,13 +796,13 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       }
     });
     await modal.present();
-    modal.onDidDismiss().then(async res=>{
+    modal.onDidDismiss().then(async res => {
       const data = res.data;
 
-      if(data.selected) {
+      if (data.selected) {
 
         this.wsChatMethodsService.getGroupRoom(roomId).send({
-          file:{
+          file: {
             "name": res.data.selected.Assunto,
             "type": "application/webtrix",
             "ApplicationId": res.data.selected.ApplicationType,
@@ -828,7 +828,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       }
     });
   }
-  async addFileToChatMobile(types: typeof FileType[] ) {
+  async addFileToChatMobile(types: typeof FileType[]) {
     const roomId = this.roomId
 
     const file = await Camera.getPhoto({
@@ -841,7 +841,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     //const imageData =  await this.fileToBase64Service.convert(file)
     //console.log('ADDFILECHAT', imageData)
 
-    const response = await fetch('data:image/jpeg;base64,'+ file.base64String!);
+    const response = await fetch('data:image/jpeg;base64,' + file.base64String!);
     const blob = await response.blob();
 
     const formData = new FormData();
@@ -854,8 +854,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       },
       temporaryData: formData,
       attachments: [{
-        "title": file.path ,
-        "image_url": 'data:image/jpeg;base64,' +file.base64String,
+        "title": file.path,
+        "image_url": 'data:image/jpeg;base64,' + file.base64String,
         "text": "description",
         "title_link_download": false,
       }]
@@ -864,39 +864,38 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
 
-  async addFileToChat(types: typeof FileType[] ) {
+  async addFileToChat(types: typeof FileType[]) {
 
     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)
-    }) */
-    const blob = new Blob([file],{type: file.type})
-    console.log('Add file', blob)
 
-    const formData = new FormData();
-    formData.append("blobFile", blob);
+    if (file.type == "application/pdf") {
+
+      const blob = new Blob([file], { type: file.type })
+      console.log('Add file', blob)
+
+      const formData = new FormData();
+      formData.append("blobFile", blob);
 
-    let pdfBase64;
-    this.blobToBase64(blob).then(res => {
-      console.log('Base64 pdf', res);
       this.wsChatMethodsService.getGroupRoom(roomId).send({
         file: {
           "type": file.type,
           "guid": '',
         },
         attachments: [{
-          "title": file.name ,
-          "name": file.name ,
-          "image_url": res,
+          "title": file.name,
+          "name": file.name,
+          /*  "image_url": res, */
           // "text": "description",
           "title_link_download": false,
         }],
         temporaryData: formData
       })
-    });
+    } else {
+      console.log('File type invalid')
+    }
 
 
   }
@@ -955,7 +954,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       }
     });
     await modal.present();
-    modal.onDidDismiss().then( async (res) => {
+    modal.onDidDismiss().then(async (res) => {
       console.log(res['data']);
       const roomId = this.roomId;
 
@@ -999,15 +998,19 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
   async openPreview(msg) {
 
-    if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url  === '' ) {
+    if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url === '') {
       this.downloadFileMsg(msg)
 
     } else {
+
+      var str = msg.attachments[0].image_url;
+      str = str.substring(1, ((str.length) - 1));
+
       const modal = await this.modalController.create({
         component: ViewMediaPage,
         cssClass: 'modal modal-desktop',
         componentProps: {
-          image: msg.attachments[0].image_url,
+          image: str,
           type: msg.file.type,
           username: msg.u.name,
           _updatedAt: msg._updatedAt
@@ -1022,7 +1025,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     console.log(msg);
     if (!msg.attachments[0].title_link || msg.attachments[0].title_link === null || msg.attachments[0].title_link === '') {
       this.downloadFileMsg(msg)
-    } else {}
+    } else { }
   }
 
 }

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

@@ -198,9 +198,9 @@
           <ion-fab-button title="Nova Reunião" (click)="bookMeeting()" color="light">
             <ion-icon name="calendar"></ion-icon>
           </ion-fab-button>
-          <!-- <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
+          <ion-fab-button title="Adicionar Documento" (click)="addFile()" color="light">
             <ion-icon name="document"></ion-icon>
-          </ion-fab-button> -->
+          </ion-fab-button>
           <ion-fab-button title="Anexar Fotografia" (click)="addImage()" color="light">
             <ion-icon name="image"></ion-icon>
           </ion-fab-button>

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

@@ -375,31 +375,31 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       if (recordData.value.recordDataBase64.includes('data:audio')) {
         this.audioRecorded = recordData.value.recordDataBase64;
       }
-      else{
+      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 encodedData = btoa(this.audioRecorded);
+      const blob = this.base64toBlob(encodedData, recordData.value.mimeType)
+      console.log(blob)
+      const formData = new FormData();
+      formData.append("blobFile", 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
-        })
+      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
+      })
 
-      });
+    });
     this.deleteRecording();
   }
 
@@ -768,19 +768,18 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
     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)
-    }) */
-    const blob = new Blob([file], { type: file.type })
-    console.log('Add file', blob)
+    if (file.type == "application/pdf") {
 
-    const formData = new FormData();
-    formData.append("blobFile", blob);
+      console.log('Add file', file)
+      /* const imageData =  await this.fileToBase64Service.convert(file).then((filee) => {
+        console.log('Add file', filee)
+      }) */
+      const blob = new Blob([file], { type: file.type })
+      console.log('Add file', blob)
+
+      const formData = new FormData();
+      formData.append("blobFile", blob);
 
-    let pdfBase64;
-    this.blobToBase64(blob).then(res => {
-      console.log('Base64 pdf', res);
       this.wsChatMethodsService.getDmRoom(roomId).send({
         file: {
           "type": file.type,
@@ -795,7 +794,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
         }],
         temporaryData: formData
       })
-    });
+
+    } else {
+      console.log('File type invalid')
+    }
 
 
   }
@@ -903,44 +905,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
 
   downloadFileMsg(msg: MessageService) {
-    console.log('FILE TYPE', msg.file.type)
-    this.downloadFile = "";
-    //if (msg.file.type == "application/img") {
-    this.AttachmentsService.downloadFile(msg.file.guid).subscribe(async (event) => {
-      console.log('FILE TYPE 22', msg.file.guid)
-      var name = msg.file.guid;
-
-      if (event.type === HttpEventType.DownloadProgress) {
-        //this.downloadProgess = Math.round((100 * event.loaded) / event.total);
-        console.log('FILE TYPE 33', msg.file.type)
-      } else if (event.type === HttpEventType.Response) {
-        if (msg.file.type == "application/img") {
-          this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
-        } else if (msg.file.type === 'application/pdf') {
-
-          this.downloadFile = new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '');
-          //console.log(this._arrayBufferToBase64(event.body))
-          console.log(eval(this.downloadFile))
-        }
-
-        msg.attachments[0] = {
-          image_url: this.downloadFile,
-          name: msg.attachments[0].name,
-          title: msg.attachments[0].title,
-          title_link_download: msg.attachments[0].title_link_download,
-          ts: msg.attachments[0].ts
-        }
-
-        // save the changes to the storage
-        //msg.save()
-
-
-      }
-
-    });
-
-    // }
-
+    msg.downloadFileMsg()
   }
 
   pdfPreview() {