Adding logging output for dropping outdated config messages. Removing libsodium-wrapper usage as we use sumo version now. Making target for linux build on one line.

Gruntfile.js

@@ -35,8 +35,8 @@ module.exports = grunt => {
     'node_modules/bytebuffer/dist/bytebuffer.js',
     'js/curve/curve25519_compiled.js',
     'js/curve/curve25519_wrapper.js',
-    'node_modules/libsodium/dist/modules/libsodium.js',
+    'node_modules/libsodium-sumo/dist/modules-sumo/libsodium-sumo.js',
-    'node_modules/libsodium-wrappers/dist/modules/libsodium-wrappers.js',
+    'node_modules/libsodium-wrappers-sumo/dist/modules-sumo/libsodium-wrappers.js',
     'libtextsecure/libsignal-protocol.js',
     'js/util_worker_tasks.js',
   ];

package.json

@@ -80,7 +80,6 @@
     "ip2country": "1.0.1",
     "jquery": "3.3.1",
     "jsbn": "1.1.0",
-    "libsodium-wrappers": "^0.7.8",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "3.0.2",
     "lodash": "4.17.11",
@@ -139,7 +138,6 @@
     "@types/filesize": "3.6.0",
     "@types/fs-extra": "5.0.5",
     "@types/jquery": "3.3.29",
-    "@types/libsodium-wrappers": "^0.7.8",
     "@types/libsodium-wrappers-sumo": "^0.7.5",
     "@types/linkify-it": "2.0.3",
     "@types/lodash": "4.14.106",
@@ -252,11 +250,7 @@
         "StartupWMClass": "Session"
       },
       "asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries",
-      "target": [
+      "target": [ "deb", "rpm", "freebsd" ],
-        "deb",
-        "rpm",
-        "freebsd"
-      ],
       "icon": "build/icon-linux.icns"
     },
     "asarUnpack": [

ts/receiver/configMessage.ts

@@ -62,12 +62,11 @@ async function handleGroupsAndContactsFromConfigMessage(
     (lastConfigTimestamp && lastConfigTimestamp < _.toNumber(envelope.timestamp));
 
   if (!isNewerConfig) {
-    return;
-  }
-
     window?.log?.info(
-    'Dropping configuration groups change as we already handled one... Only handling contacts '
+      'Received outdated configuration message... Dropping message.'
     );
+    return;
+  }
 
   await createOrUpdateItem({
     id: 'hasSyncedInitialConfigurationItem',

yarn.lock

@@ -1068,11 +1068,6 @@
   resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.9.tgz#89c3ad2156d5143e64bce86cfeb0045a983aeccc"
   integrity sha512-LisgKLlYQk19baQwjkBZZXdJL0KbeTpdEnrAfz5hQACbklCY0gVFnsKUyjfNWF1UQsCSjw93Sj5jSbiO8RPfdw==
 
-"@types/libsodium-wrappers@^0.7.8":
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.8.tgz#34575d7692fdbb7a7fdb63afcde381db86ec0de2"
-  integrity sha512-vkDSj6enD3K0+Ep83wnoGUk+f7sqsO4alsqxxEZ8BcTJhFmcY4UehYH3rTf4M3JGHXNhdpGFDdMbWFMgyvw/fA==
-
 "@types/linkify-it@2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-2.0.3.tgz#5352a2d7a35d7c77b527483cd6e68da9148bd780"
@@ -5891,18 +5886,6 @@ libsodium-wrappers-sumo@^0.7.9:
   dependencies:
     libsodium-sumo "^0.7.0"
 
-libsodium-wrappers@^0.7.8:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/libsodium-wrappers/-/libsodium-wrappers-0.7.8.tgz#d95cdf3e7236c2aef76844bf8e1929ba9eef3e9e"
-  integrity sha512-PDhPWXBqd/SaqAFUBgH2Ux7b3VEEJgyD6BQB+VdNFJb9PbExGr/T/myc/MBoSvl8qLzfm0W0IVByOQS5L1MrCg==
-  dependencies:
-    libsodium "0.7.8"
-
-libsodium@0.7.8:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/libsodium/-/libsodium-0.7.8.tgz#fbd12247b7b1353f88d8de1cbc66bc1a07b2e008"
-  integrity sha512-/Qc+APf0jbeWSaeEruH0L1/tbbT+sbf884ZL0/zV/0JXaDPBzYkKbyb/wmxMHgAHzm3t6gqe7bOOXAVwfqVikQ==
-
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"