Request configuration sync on startup of new version

signalapp · Nov 28, 2018 · 313d083 · 313d083
1 parent f5954db
commit 313d083
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 243 deletions.
diff --git a/js/background.js b/js/background.js
@@ -698,19 +698,6 @@
     }
 
     const deviceId = textsecure.storage.user.getDeviceId();
-    const ourNumber = textsecure.storage.user.getNumber();
-    const { sendRequestConfigurationSyncMessage } = textsecure.messaging;
-    const status = await Signal.Startup.syncReadReceiptConfiguration({
-      ourNumber,
-      deviceId,
-      sendRequestConfigurationSyncMessage,
-      storage,
-      prepareForSend: ConversationController.prepareForSend.bind(
-        ConversationController
-      ),
-    });
-    window.log.info('Sync configuration status:', status);
-
     if (firstRun === true && deviceId !== '1') {
       const hasThemeSetting = Boolean(storage.get('theme-setting'));
       if (!hasThemeSetting && textsecure.storage.get('userAgent') === 'OWI') {

diff --git a/js/modules/signal.js b/js/modules/signal.js
@@ -9,7 +9,6 @@ const IndexedDB = require('./indexeddb');
 const Notifications = require('../../ts/notifications');
 const OS = require('../../ts/OS');
 const Settings = require('./settings');
-const Startup = require('./startup');
 const Util = require('../../ts/util');
 const { migrateToSQL } = require('./migrate_to_sql');
 const Metadata = require('./metadata/SecretSessionCipher');
@@ -233,7 +232,6 @@ exports.setup = (options = {}) => {
     OS,
     RefreshSenderCertificate,
     Settings,
-    Startup,
     Types,
     Util,
     Views,

diff --git a/js/modules/startup.js b/js/modules/startup.js
diff --git a/libtextsecure/sync_request.js b/libtextsecure/sync_request.js
@@ -28,7 +28,11 @@
       ourNumber,
       { syncMessage: true }
     );
-    window.log.info('SyncRequest created. Sending contact sync message...');
+
+    window.log.info('SyncRequest created. Sending config sync request...');
+    wrap(sender.sendRequestConfigurationSyncMessage(sendOptions));
+
+    window.log.info('SyncRequest now sending contact sync message...');
     wrap(sender.sendRequestContactSyncMessage(sendOptions))
       .then(() => {
         window.log.info('SyncRequest now sending group sync messsage...');

diff --git a/test/modules/startup_test.js b/test/modules/startup_test.js
diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json
@@ -244,15 +244,15 @@
     "rule": "jQuery-wrap(",
     "path": "js/background.js",
     "line": "        wrap(",
-    "lineNumber": 740,
+    "lineNumber": 727,
     "reasonCategory": "falseMatch",
     "updated": "2018-10-18T22:23:00.485Z"
   },
   {
     "rule": "jQuery-wrap(",
     "path": "js/background.js",
     "line": "      await wrap(",
-    "lineNumber": 1270,
+    "lineNumber": 1257,
     "reasonCategory": "falseMatch",
     "updated": "2018-10-26T22:43:23.229Z"
   },
@@ -379,14 +379,6 @@
     "reasonCategory": "falseMatch",
     "updated": "2018-09-19T18:13:29.628Z"
   },
-  {
-    "rule": "jQuery-wrap(",
-    "path": "js/modules/startup.js",
-    "line": "    await wrap(sendRequestConfigurationSyncMessage(sendOptions));",
-    "lineNumber": 52,
-    "reasonCategory": "falseMatch",
-    "updated": "2018-10-05T23:12:28.961Z"
-  },
   {
     "rule": "jQuery-$(",
     "path": "js/permissions_popup_start.js",
@@ -2372,19 +2364,27 @@
     "reasonCategory": "falseMatch",
     "updated": "2018-09-19T18:13:29.628Z"
   },
+  {
+    "rule": "jQuery-wrap(",
+    "path": "libtextsecure/sync_request.js",
+    "line": "    wrap(sender.sendRequestConfigurationSyncMessage(sendOptions));",
+    "lineNumber": 33,
+    "reasonCategory": "falseMatch",
+    "updated": "2018-11-28T19:48:16.607Z"
+  },
   {
     "rule": "jQuery-wrap(",
     "path": "libtextsecure/sync_request.js",
     "line": "    wrap(sender.sendRequestContactSyncMessage(sendOptions))",
-    "lineNumber": 32,
+    "lineNumber": 36,
     "reasonCategory": "falseMatch",
     "updated": "2018-10-05T23:12:28.961Z"
   },
   {
     "rule": "jQuery-wrap(",
     "path": "libtextsecure/sync_request.js",
     "line": "        return wrap(sender.sendRequestGroupSyncMessage(sendOptions));",
-    "lineNumber": 35,
+    "lineNumber": 39,
     "reasonCategory": "falseMatch",
     "updated": "2018-10-05T23:12:28.961Z"
   },