save merge

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

@@ -48,11 +48,11 @@
           </mat-menu>
         </div>
         <div class="title">
-          <ion-label>{{msg.u.name}}  {{msg.offline}} {{ msg.sendAttempt }} {{ msg.uploadingFile }} errorUploadingAttachment:{{ msg.errorUploadingAttachment}}</ion-label>
+          <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
         </div>
         <div>
-          <ion-label>{{msg.msg}} {{msg.offline}}</ion-label>
+          <ion-label>{{msg.msg}}</ion-label>
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
@@ -67,7 +67,7 @@
             </mat-menu>
           </div>
           <div class="title">
-            <ion-label>{{msg.u.name}}  {{msg.offline}} {{ msg.sendAttempt }} {{ msg.uploadingFile }}  errorUploadingAttachment:{{ msg.errorUploadingAttachment}}</ion-label>
+            <ion-label>{{msg.u.name}}      </ion-label>
             <span class="time">{{showDateDuration(msg.duration)}}</span>
           </div>
           <div>

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

@@ -32,6 +32,7 @@ import { FileType } from 'src/app/models/fileType';
 import { SearchPage } from 'src/app/pages/search/search.page';
 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';
 
 const IMAGE_DIR = 'stored-images';
 @Component({
@@ -441,6 +442,40 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
 
+  async takePictureMobile() {
+    const roomId = this.roomId
+
+    const file = await Camera.getPhoto({
+      quality: 90,
+      // allowEditing: true,
+      resultType: CameraResultType.Base64,
+      source: CameraSource.Camera
+    });
+    console.log('ADDFILECHAT', file)
+    //const imageData =  await this.fileToBase64Service.convert(file)
+    //console.log('ADDFILECHAT', imageData)
+
+    const response = await fetch('data:image/jpeg;base64,'+ file.base64String!);
+    const blob = await response.blob();
+
+    const formData = new FormData();
+    formData.append("blobFile", blob);
+    
+    this.wsChatMethodsService.getDmRoom(roomId).send({
+      file: {
+        "type": "application/img",
+        "guid": '',
+      },
+      temporaryData: formData,
+      attachments: [{
+        "title": file.path ,
+        "image_url": 'data:image/jpeg;base64,' +file.base64String,
+        "text": "description",
+        "title_link_download": false,
+      }]
+    })
+
+  }
 
   async takePicture() {
     const roomId = this.roomId
@@ -450,6 +485,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     const lastphoto: any = await this.fileService.loadFiles();
     const { capturedImage, capturedImageTitle} = await this.fileService.loadFileData(lastphoto);
     const base64 = await fetch(capturedImage);
+    console.log('imsge take picture', image)
     const blob = await base64.blob();
     const formData = new FormData();
     formData.append("blobFile", blob);
@@ -473,7 +509,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
   
   async addImage() {
-    this.addFileToChat(['image/apng', 'image/jpeg', 'image/png'])
+    this.addFileToChatMobile(['image/apng', 'image/jpeg', 'image/png'])
   }
   
   async addFile() {
@@ -522,14 +558,51 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     });
   }
 
+  async addFileToChatMobile(types: typeof FileType[] ) {
+    const roomId = this.roomId
+
+    const file = await Camera.getPhoto({
+      quality: 90,
+      // allowEditing: true,
+      resultType: CameraResultType.Base64,
+      source: CameraSource.Photos
+    });
+    console.log('ADDFILECHAT', file)
+    //const imageData =  await this.fileToBase64Service.convert(file)
+    //console.log('ADDFILECHAT', imageData)
+
+    const response = await fetch('data:image/jpeg;base64,'+ file.base64String!);
+    const blob = await response.blob();
+
+    const formData = new FormData();
+    formData.append("blobFile", blob);
+    
+    this.wsChatMethodsService.getDmRoom(roomId).send({
+      file: {
+        "type": "application/img",
+        "guid": ''
+      },
+      temporaryData: formData,
+      attachments: [{
+        "title": file.path ,
+        "image_url": 'data:image/jpeg;base64,' +file.base64String,
+        "text": "description",
+        "title_link_download": false,
+      }]
+    })
+
+  }
+
 
 
   async addFileToChat(types: typeof FileType[] ) {
+    
     const roomId = this.roomId
 
     const file: any = await this.fileService.getFileFromDevice(types);
+    console.log('Add image', file)
     const imageData =  await this.fileToBase64Service.convert(file)
-
+    
     const formData = new FormData();
     formData.append("blobFile", file);
     
@@ -617,7 +690,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       }
       else if (res['data'] == 'take-picture') {
 
-        this.takePicture()
+        this.takePictureMobile()
 
       }
       else if (res['data'] == 'add-picture') {