bug fixes

Author: danieltigse

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.27.3",
+  "version": "0.27.4",
   "author": {
     "name": "Criptext Inc",
     "email": "[email protected]",

electron_app/src/database/DBEmanager.js

@@ -986,7 +986,9 @@ const getAllLabels = () => {
 };
 
 const getLabelById = id => {
-  return Label().findAll({ where: { id } });
+  return Label()
+    .findAll({ where: { id } })
+    .map(label => label.toJSON());
 };
 
 const getLabelByUuid = uuid => {
@@ -1201,7 +1203,7 @@ const updateSettings = async ({
   if (Object.keys(params).length < 1) {
     return Promise.resolve([1]);
   }
-  const result = await Settings().update(params, { where: { id: 1 } });
+  const result = await Settings().update(params, { where: {} });
   mySettings.update(params);
   if (params.language) setLanguage(params.language);
   return result;

electron_app/src/eventQueueManager.js

@@ -36,19 +36,20 @@ const removeMalformedEvents = async batch => {
   const eventsData = batch
     .map(event => {
       const isMalformed = event.data.match(mailformedEventRegex);
-      if (isMalformed) {
+      const data = JSON.parse(event.data);
+      const metadataKeysMalformed = hasMetadataKeysMalformed(data.params);
+      if (isMalformed || metadataKeysMalformed) {
         invalidIds.push(event.id);
       } else {
         validIds.push(event.id);
-        const data = JSON.parse(event.data);
         if (data.cmd === 500) {
           if (data.params.unread === 0) {
             const params = { metadataKeys: data.params.metadataKeys };
             const d = { cmd: data.cmd, params };
             return d;
           }
         }
-        return JSON.parse(event.data);
+        return data;
       }
     })
     .filter(data => !!data);
@@ -62,6 +63,11 @@ const removeMalformedEvents = async batch => {
   };
 };
 
+const hasMetadataKeysMalformed = params => {
+  if (!params.metadataKeys) return false;
+  return params.metadataKeys.some(metadataKey => metadataKey.length === 1);
+};
+
 module.exports = {
   processEventsQueue
 };

email_composer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_composer",
-  "version": "0.27.3",
+  "version": "0.27.4",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_loading/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_loading",
-  "version": "0.27.3",
+  "version": "0.27.4",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_login/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_login",
-  "version": "0.27.3",
+  "version": "0.27.4",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_mailbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_mailbox",
-  "version": "0.27.3",
+  "version": "0.27.4",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_mailbox/src/actions/threads.js

@@ -436,7 +436,8 @@ export const removeThreads = (threadsParams, labelId) => {
       });
       if (emails.length) {
         const metadataKeys = emails.reduce((result, email) => {
-          return [...result, ...email.keys];
+          const keysArray = email.keys.split(',');
+          return [...result, ...keysArray];
         }, []);
         const eventParams = {
           cmd: SocketCommand.PEER_EMAIL_DELETED_PERMANENTLY,

email_pin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_pin",
-  "version": "0.27.3",
+  "version": "0.27.4",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",