+
+ NOT UPLOADED
+
+
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 c2dd76e6e..d10e4cf45 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -276,7 +276,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
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;
@@ -293,7 +293,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
})
}
})
-
+
}
startRecording() {
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 3c5e5e934..453c0f899 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -24,10 +24,10 @@ export class MessageService {
msg = ''
rid = ''
ts = {}
-
- u = {
- name: '',
- username: '',
+
+ u = {
+ name: '',
+ username: '',
_id: ""
}
@@ -105,7 +105,7 @@ export class MessageService {
}
if(this.hasFile) {
-
+
if(this.file.type != 'application/webtrix') {
this.displayType = this.file.type.replace('application/','').toUpperCase()
}
@@ -129,7 +129,7 @@ export class MessageService {
if(!this.hasFile) {
const params = {roomId:this.rid, msg:this.msg, localReference: this.localReference}
-
+
await this.sendRequest(params)
} else {
@@ -143,7 +143,7 @@ export class MessageService {
this.uploadingFile = false
- if(uploadSuccessfully || this.hasSendAttachment == false) {
+ if(uploadSuccessfully ) {
this.hasSendAttachment = true
this.errorUploadingAttachment = false
this.temporaryData = {}
@@ -169,7 +169,7 @@ export class MessageService {
return new Promise((resolve, reject)=>{
reject(false)
})
-
+
}
}
@@ -193,13 +193,8 @@ export class MessageService {
this.WsChatService.registerCallback({
type: 'reConnect',
funx: async ()=> {
-
- this.WsChatService.send(params).then(({message, requestId}) => {
- let ChatMessage = message.result
- this.messageSend = true
- this.redefinedMessage(ChatMessage)
-
- })
+
+ this.sendRequest(params)
return true
}
})
@@ -209,7 +204,7 @@ export class MessageService {
async redefinedMessage(ChatMessage , update = true) {
ChatMessage = this.NfService.fix_updatedAt(ChatMessage)
-
+
const message = this.getChatObj()
ChatMessage = Object.assign(message, ChatMessage)
@@ -244,7 +239,7 @@ export class MessageService {
title_link_download: this.attachments[0].title_link_download,
ts: this.attachments[0].ts
}
-
+
console.log(this.attachments)
// save the changes to the storage
this.save()
@@ -264,7 +259,7 @@ export class MessageService {
}
async delateDB() {
-
+
// alert('delete data')
const message = await MessageModel.get({_id: this._id})
await message.delete()
@@ -284,8 +279,8 @@ export class MessageService {
return {
channels: this.channels,
mentions: this.mentions,
- //msg: this.AESEncrypt.encrypt(this.msg, SessionStore.user.RochetChatUser),
- msg:this.msg,
+ //msg: this.AESEncrypt.encrypt(this.msg, SessionStore.user.RochetChatUser),
+ msg:this.msg,
rid: this.rid,
ts: this.ts,
u: this.u,
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 72961fdaa..e9cf98ea0 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -76,7 +76,11 @@
-
+
+ NOT UPLOADED
+
+
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 8c340283a..829ce53d3 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -278,7 +278,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
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')){
@@ -290,7 +290,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
});
} catch (error) {}
-
+
}
startRecording() {
@@ -454,7 +454,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
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)
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index b7f8692cf..7ec469275 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -84,7 +84,6 @@
-
= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg">
@@ -144,6 +143,7 @@
Apagou a mensagem
+
{{msg.u.name}} criou esta reunião