From f80b8bbbf0461ba25e7641d6550cd9b9c02e26fa Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 18 Apr 2022 15:24:01 +0100
Subject: [PATCH] fix

---
 src/app/pages/chat/group-messages/group-messages.page.ts  | 4 ++--
 src/app/pages/chat/messages/messages.page.ts              | 4 ++--
 src/app/shared/chat/group-messages/group-messages.page.ts | 4 ++--
 src/app/shared/chat/messages/messages.page.ts             | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index c2588adb2..d9dc73790 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -264,7 +264,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
         if (recordData?.value?.recordDataBase64.includes('data:audio')) {
           this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData?.value?.recordDataBase64);
         }
-        else {
+        else if(recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
           this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
         }
       });
@@ -483,7 +483,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       if (recordData?.value?.recordDataBase64.includes('data:audio')) {
         this.audioRecorded = recordData?.value?.recordDataBase64;
       }
-      else {
+      else if(recordData?.value?.mimeType && recordData?.value?.recordDataBase64){
         this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
       }
 
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index a5c8a2ce5..3a085b657 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -232,7 +232,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         if (recordData?.value?.recordDataBase64.includes('data:audio')) {
           this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData?.value?.recordDataBase64);
         }
-        else {
+        else if(recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
           this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
         }
       });
@@ -429,7 +429,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       if (recordData?.value?.recordDataBase64.includes('data:audio')) {
         this.audioRecorded = recordData?.value?.recordDataBase64;
       }
-      else {
+      else if(recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
         this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
       }
 
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index d06d6405b..4ca0ac85f 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -293,7 +293,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         if (recordData?.value?.recordDataBase64.includes('data:audio')) {
           this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData?.value?.recordDataBase64);
         }
-        else {
+        else if(recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
           this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
         }
       });
@@ -469,7 +469,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       if (recordData?.value?.recordDataBase64.includes('data:audio')) {
         this.audioRecorded = recordData?.value?.recordDataBase64;
       }
-      else {
+      else if(recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
         this.audioRecorded = `data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`;
       }
 
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 3fa34d03b..3931cd440 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -287,7 +287,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
         if (recordData?.value?.recordDataBase64.includes('data:audio')) {
           this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(recordData?.value?.recordDataBase64);
         }
-        else {
+        else if(recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
           this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData?.value?.recordDataBase64}`);
         }
       });
@@ -296,10 +296,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
     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 if(recordData?.value?.mimeType && recordData?.value?.recordDataBase64) {
         this.audioRecorded = this.sanitiser.bypassSecurityTrustResourceUrl(`data:${recordData.value.mimeType};base64,${recordData.value.recordDataBase64}`);
       }
     });
@@ -411,7 +411,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       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 {