diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index ac53a29ac..122571bc3 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -591,6 +591,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
} else {
this.sqlservice.getAllChatMSG(roomId).then((msg: any) => {
+ console.log('ALL MSG DBBB', msg)
let chatmsgArray = [];
let array = []
msg.forEach(element => {
@@ -606,7 +607,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
rid: element.Rid,
ts: element.Ts,
u: this.isJson(element.U),
- _updatedAt: element.UpdatedAt
+ _updatedAt: element.UpdatedAt,
+ image_url: this.isJson(element.image_url)
}
chatmsgArray.push(msgChat)
@@ -787,11 +789,12 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
console.log('SAVED FILE WEB error ', error)
});
- const readFile = await Filesystem.readdir({
+ const readFile = await Filesystem.readFile({
path: `${IMAGE_DIR}/${name}`,
directory: Directory.Data,
}).then((foo) => {
console.log('GET FILE WEB', foo)
+
});
}
diff --git a/src/app/services/sqlite.service.ts b/src/app/services/sqlite.service.ts
index 640fc9ad3..2457f5fb0 100644
--- a/src/app/services/sqlite.service.ts
+++ b/src/app/services/sqlite.service.ts
@@ -279,8 +279,8 @@ export class SqliteService {
public addChatMSG(data) {
console.log('INSIDE DB CHAT MSG',data,)
this.dbInstance.executeSql(`
- INSERT OR IGNORE INTO ${this.chatmsg} (Id,Attachments,Channels,File,Mentions,Msg,Rid, Ts ,U, UpdatedAt,image_url)
- VALUES ('${data._id}','${JSON.stringify(data.attachments)}','${JSON.stringify(data.channels)}','${JSON.stringify(data.file)}','${JSON.stringify(data.mentions)}','${data.msg}','${data.rid}','${data.ts}','${JSON.stringify(data.u)}','${data._updatedAt}','${JSON.stringify(data.image_url)}')`, [])
+ INSERT OR IGNORE INTO ${this.chatmsg} (Id,Attachments,Channels,File,Mentions,Msg,Rid, Ts ,U, UpdatedAt)
+ VALUES ('${data._id}','${JSON.stringify(data.attachments)}','${JSON.stringify(data.channels)}','${JSON.stringify(data.file)}','${JSON.stringify(data.mentions)}','${data.msg}','${data.rid}','${data.ts}','${JSON.stringify(data.u)}','${data._updatedAt}')`, [])
.then(() => {
console.log("chat msg add with Success");
@@ -321,10 +321,12 @@ export class SqliteService {
//updateChatMsg
public updateChatMsg(id, data) {
+ let jsonId = JSON.stringify(id)
+ let jsondata = JSON.stringify(data)
try {
console.log("update action data", data)
this.dbInstance.executeSql(`
- UPDATE ${this.chatmsg} SET image_url = ? WHERE Id = ${id}`, [data])
+ UPDATE ${this.chatmsg} SET image_url = ? WHERE Id = ${jsonId}`, [jsondata])
.then(() => {
console.log("ChatMsg update with Success");
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 b548ea7e6..5bbb36301 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -146,15 +146,15 @@
-
-
-
+
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 6d74c03cd..cc1fa9eb8 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -56,7 +56,7 @@
-

+
@@ -110,15 +110,15 @@
-
-
-
+
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 1aa86adac..443cb98e3 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -252,6 +252,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
transformData(res) {
let mgsArray = [];
res.forEach(async element => {
+ /* console.log('Web TRANSFORM MSG', element)
+ let image = await this.storageservice.get(element.file.guid);
+ console.log('IMAGE STORAGE', image) */
let chatmsg = {
_id: element._id,
@@ -264,17 +267,15 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
ts: element.ts,
u: element.u,
_updatedAt: element._updatedAt,
- /* image_url: {
- name: element.file.guid,
- path: `${IMAGE_DIR}/${element.file.guid}`,
- data: `data:image/jpeg;base64,${readFile.data}`,
- }, */
+ /* image_url: image, */
}
mgsArray.push(chatmsg)
});
+ console.log('Web TRANSFORM MSG', mgsArray)
+
this.storageservice.store('chatmsg',mgsArray);
}
@@ -283,7 +284,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
//this.showLoader = true;
const roomId = this.roomId
this.chatService.getRoomMessages(this.roomId).subscribe(res => {
- console.log(res);
+ console.log('ALL MSG FROM CHATROCK',res);
this.transformData(res['messages']);
this.getMessageDB();
//this.getFileFromLakeFS();
@@ -728,17 +729,69 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
card.el.style['z-index'] = 11;
}
+ downloadFileMsg(msg) {
+ console.log('FILE TYPE', msg.file.type)
+ this.downloadFile = "";
+ if (msg.file.type == "application/img") {
+ this.fileService.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) {
+ this.downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
+ console.log('FILE TYPE 44', this.downloadFile)
+
+ console.log('TRY ARRAY BUFFER NAME', name);
+ console.log('TRY ARRAY BUFFER', this.downloadFile);
+
+ this.storageservice.store(msg.file.guid,this.downloadFile);
+
+ await Filesystem.writeFile({
+ path: `${IMAGE_DIR}/${name}`,
+ data: this.downloadFile,
+ directory: Directory.Data
+ }).then((foo) => {
+ console.log('SAVED FILE WEB', foo)
+ }).catch((error) => {
+ console.log('SAVED FILE WEB error ', error)
+ });
+
+ const readFile = await Filesystem.readFile({
+ path: `${IMAGE_DIR}/${name}`,
+ directory: Directory.Data,
+ }).then((foo) => {
+ console.log('GET FILE WEB', foo)
+
+ });
+ }
+
+ });
+
+ console.log('FILE TYPE 44', this.downloadFile)
+
+ }
+
+ }
+
async openPreview(msg) {
- const modal = await this.modalController.create({
- component: ViewMediaPage,
- cssClass: 'modal modal-desktop',
- componentProps: {
- image: msg.attachments[0].image_url,
- username: msg.u.name,
- _updatedAt: msg._updatedAt
- }
- });
- modal.present();
+ if(msg.image_url = "") {
+ const modal = await this.modalController.create({
+ component: ViewMediaPage,
+ cssClass: 'modal modal-desktop',
+ componentProps: {
+ image: msg.attachments[0].image_url,
+ username: msg.u.name,
+ _updatedAt: msg._updatedAt
+ }
+ });
+ modal.present();
+ } else {
+ this.downloadFileMsg(msg)
+ }
+
}
}
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
index a0042f5a1..eca090810 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
@@ -6,9 +6,9 @@