core-3nweb-client-lib 0.41.1 → 0.41.3

package/build/core/app-files.js

@@ -27,7 +27,8 @@ function userIdToFolderName(userId) {
     return buffer_utils_1.base64urlSafe.pack(buffer_utils_1.utf8.pack(userId));
 }
 function folderNameToUserId(folderName) {
-    return buffer_utils_1.utf8.open(buffer_utils_1.base64urlSafe.open(folderName));
+    const str = buffer_utils_1.utf8.open(buffer_utils_1.base64urlSafe.open(folderName));
+    return (str.includes('@') ? str : undefined);
 }
 exports.UTIL_DIR = 'util';
 const INBOX_DIR = 'inbox';
@@ -70,7 +71,10 @@ function appDirs(appDir) {
                     continue;
                 }
                 try {
-                    users.push(folderNameToUserId(entry.name));
+                    const userId = folderNameToUserId(entry.name);
+                    if (userId) {
+                        users.push(userId);
+                    }
                 }
                 catch (e) {
                     continue;

package/build/core/keyring/correspondent-keys.js

@@ -96,9 +96,11 @@ class CorrespondentKeys {
      */
     mapAllKeysIntoRing() {
         // index key pairs
-        const pairs = [this.keys.receptionPairs.suggested,
+        const pairs = [
+            this.keys.receptionPairs.suggested,
             this.keys.receptionPairs.inUse,
-            this.keys.receptionPairs.old];
+            this.keys.receptionPairs.old
+        ];
         const email = this.correspondent;
         pairs.forEach(pair => {
             if (!pair) {
@@ -156,7 +158,7 @@ class CorrespondentKeys {
             return false;
         }
         const now = Date.now();
-        if ((this.keys.sendingPair.sentMsgs.lastTS + MIN_PERIOD_FOR_PAIR) < now) {
+        if ((this.keys.sendingPair.timestamp + MIN_PERIOD_FOR_PAIR) > now) {
             return false;
         }
         return true;
@@ -173,6 +175,7 @@ class CorrespondentKeys {
         }
         const mp = this.keys.receptionPairs.inUse;
         this.keys.receptionPairs.inUse = this.keys.receptionPairs.suggested;
+        this.keys.receptionPairs.suggested = null;
         if (mp) {
             const dp = this.keys.receptionPairs.old;
             this.keys.receptionPairs.old = mp;
@@ -225,7 +228,7 @@ class CorrespondentKeys {
                     && (existingPair.senderKey.pkey.kid === pair.senderKid)) {
                     return;
                 }
-                if (existingPair.timestamp < pair.timestamp) {
+                if (existingPair.timestamp > pair.timestamp) {
                     return;
                 }
             }