+ var msgData = JSON.parse(msgInfo.msgData);
+ var msgEl = document.createElement('div');
+ msgEl.setAttribute("class", "row message-body");
+ msgEl.innerHTML = `
-
- ${msghd}
+ ${msghd}
+
+
${getTime(msgInfo.time)}
`;
- msgdiv.querySelector("pre").textContent = msgInfo.text;
- msgEl.appendChild(msgdiv);
+ msgEl.querySelector("pre").textContent = msgData.text;
+ if (msgData.file) {
+ var fileEl = msgEl.querySelector("i");
+ fileEl.textContent = ` ${msgData.file.name} (${getFileSize(msgData.file.size)})`;
+ fileEl.setAttribute("onclick", `downloadFile(${msgInfo.time})`);
+ fileEl.setAttribute("class", "fa fa-arrow-circle-down");
+ }
+ msgCon.appendChild(msgEl);
} catch (e) {
console.log(e);
}
@@ -1057,30 +1080,83 @@ function getTime(time) {
return tmp;
}
+function getFileSize(size){
+ var filesizeUnits = ['B','kB','MB','GB','TB'];
+ for(var i = 0;i
{
+ console.log(msgData);
+ var time = Date.now();
+ var sign = floOpt.signData(msgData, privKey);
+ if (msgType === 'direct')
+ sendDirectMsg(msgData, time, sign);
+ else if (msgType === 'group')
+ sendGroupMsg(msgData, time, sign);
+ }).catch(error => {
+ console.log(error);
+ })
}
-function sendDirectMsg(msg, time, sign) {
+function getfileData(fileInput) {
+ return new Promise((resolve, reject) => {
+ try {
+ var files = document.getElementById(fileInput).files;
+ if (files.length == 0)
+ resolve(null);
+ else {
+ var reader = new FileReader();
+ reader.onload = (event) => {
+ var fileBytes = Crypto.charenc.Binary.stringToBytes(event.target.result);
+ resolve({
+ name: files[0].name,
+ size: files[0].size,
+ content: Crypto.util.bytesToBase64(fileBytes)
+ });
+ };
+ reader.onerror = (event) => {
+ reject("File could not be read! Code " + event.target.error.code);
+ };
+ reader.readAsBinaryString(files[0]);
+ }
+ } catch (e) {
+ reject(e);
+ }
+ });
+}
+
+function getReplyInputs() {
+ return new Promise((resolve, reject) => {
+ getfileData('fileInput').then(fileData => {
+ var msgData = {
+ text: document.getElementById('msgInput').value,
+ file: fileData
+ };
+ resetForm('replyForm');
+ resolve(JSON.stringify(msgData));
+ }).catch(error => {
+ reject(error);
+ });
+ });
+}
+
+function sendDirectMsg(msgData, time, sign) {
var data = JSON.stringify({
from: selfID,
to: receiverID,
directMsg: {
time: time,
- msgCipher: floOpt.encryptData(msg, contacts[receiverID].pubKey),
+ msgCipher: floOpt.encryptData(msgData, contacts[receiverID].pubKey),
sign: sign
}
});
@@ -1092,20 +1168,20 @@ function sendDirectMsg(msg, time, sign) {
var msgInfo = {
time: time,
floID: receiverID,
- text: msg,
+ msgData: msgData,
type: "S"
}
createMsgElement(msgInfo);
storeMsg(msgInfo);
}
-function sendGroupMsg(msg, time, sign) {
+function sendGroupMsg(msgData, time, sign) {
var data = {
from: selfID,
groupMsg: {
group: receiverID,
time: time,
- msgCipher: floOpt.encryptData(msg, groups[receiverID].pubKey),
+ msgCipher: floOpt.encryptData(msgData, groups[receiverID].pubKey),
sign: sign
}
};
@@ -1121,7 +1197,7 @@ function sendGroupMsg(msg, time, sign) {
time: time,
sender: selfID,
groupID: receiverID,
- text: msg,
+ msgData: msgData,
type: "S"
}
createMsgElement(msgInfo);
@@ -1468,6 +1544,7 @@ function customCheckList(userList, ignoreList, okBtnVal = "Ok", okBtnType = "suc
grpNameInput.style.display = (okBtnVal === "Create Group" ? "block" : "none");
grpNameInput.value = '';
var userChecklist = document.getElementById('userChecklist');
+ userChecklist.innerHTML = '';
for (var i = 0; i < userList.length; i++) {
if (ignoreList.includes(userList[i]))
continue;
@@ -1528,4 +1605,25 @@ function searchChecklist() {
} catch (e) {
console.log(e);
}
+}
+
+function downloadFile(msgID) {
+ var idb = indexedDB.open("FLO_Chat");
+ idb.onerror = (event) => {
+ console.log("Error in opening IndexedDB!");
+ };
+ idb.onsuccess = (event) => {
+ var db = event.target.result;
+ var msgReq = db.transaction('messages', "readwrite").objectStore('messages').get(msgID);
+ msgReq.onsuccess = (event) => {
+ var file = JSON.parse(event.target.result.msgData).file;
+ var tmpEl = document.createElement('a');
+ tmpEl.setAttribute('href', 'data:application/octet-stream;charset=utf-8;base64,' + file.content);
+ tmpEl.setAttribute('download', file.name);
+ tmpEl.style.display = 'none';
+ document.body.appendChild(tmpEl);
+ tmpEl.click();
+ document.body.removeChild(tmpEl);
+ }
+ }
}
\ No newline at end of file
diff --git a/app/index.html b/app/index.html
index 4312e62..92b984e 100644
--- a/app/index.html
+++ b/app/index.html
@@ -105,23 +105,32 @@