It works, though no double-encryption of own msg's

AnthyG · Apr 14, 2017 · 3ec8b70 · 3ec8b70
1 parent e32cbec
commit 3ec8b70
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/js/all.js b/js/all.js
diff --git a/js/page.js b/js/page.js
@@ -772,7 +772,6 @@ class ThunderWave extends ZeroFrame {
                 var first = true
                 for (var x in messages1) {
                     var y = messages1[x]
-
                     page.cmd("eciesDecrypt", y.message, (msg) => {
                         if (msg)
                             var msg = JSON.parse(msg)
@@ -794,7 +793,7 @@ class ThunderWave extends ZeroFrame {
                 for (var x in messages2) {
                     var y = messages2[x]
 
-                    var msg2 = y
+                    var msg2 = y.message
                         // page.cmd("aesDecrypt", [
                         //     btoa(sender),
                         //     y.message,
@@ -1785,6 +1784,12 @@ class ThunderWave extends ZeroFrame {
                 var olddata = JSON.parse(JSON.stringify(data))
                 console.log("BEFORE 2", olddata)
 
+                var curpversion = 1
+                if (data.pversion !== curpversion)
+                    data = {
+                        "pversion": curpversion
+                    }
+
                 if (!data.hasOwnProperty("private_messages"))
                     data.private_messages = []
                 if (!data.hasOwnProperty("private_messages_with"))
@@ -1824,6 +1829,12 @@ class ThunderWave extends ZeroFrame {
                     var data = {}
                 var olddata = JSON.parse(JSON.stringify(data))
 
+                var curpversion = 1
+                if (data.pversion !== curpversion) {
+                    data.pversion = curpversion
+                    data.private_messages = []
+                }
+
                 if (!data.hasOwnProperty("messages"))
                     data.messages = []
                     // data.messages = [{