move sync request messages types to new pipeline

js/background.js

@@ -1621,21 +1621,22 @@
       });
 
       if (Whisper.Import.isComplete()) {
-        const {
+        // FIXME Audric; Is that needed for us?
-          wrap,
+        // const {
-          sendOptions,
+        //   wrap,
-        } = ConversationController.prepareForSend(
+        //   sendOptions,
-          textsecure.storage.user.getNumber(),
+        // } = ConversationController.prepareForSend(
-          { syncMessage: true }
+        //   textsecure.storage.user.getNumber(),
-        );
+        //   { syncMessage: true }
-        wrap(
+        // );
-          textsecure.messaging.sendRequestConfigurationSyncMessage(sendOptions)
+        // wrap(
-        ).catch(error => {
+        //   textsecure.messaging.sendRequestConfigurationSyncMessage(sendOptions)
-          window.log.error(
+        // ).catch(error => {
-            'Import complete, but failed to send sync message',
+        //   window.log.error(
-            error && error.stack ? error.stack : error
+        //     'Import complete, but failed to send sync message',
-          );
+        //     error && error.stack ? error.stack : error
-        });
+        //   );
+        // });
       }
     }
 

libtextsecure/sendmessage.js

@@ -529,60 +529,6 @@ MessageSender.prototype = {
     });
   },
 
-  sendRequestConfigurationSyncMessage() {
-    const myNumber = textsecure.storage.user.getNumber();
-    const myDevice = textsecure.storage.user.getDeviceId();
-    if (myDevice !== 1 && myDevice !== '1') {
-      const { CONFIGURATION } = textsecure.protobuf.SyncMessage.Request.Type;
-      const user = libsession.Types.PubKey.from(myNumber);
-      const { RequestContactSyncMessage } = window.libsession.Messages.Outgoing;
-
-      const requestContactSyncMessage = new RequestContactSyncMessage({
-        timestamp: Date.now(),
-        reqestType: CONFIGURATION,
-      });
-      return libsession.getMessageQueue().send(user, requestContactSyncMessage);
-    }
-
-    return Promise.resolve();
-  },
-
-  // Currently not in use under session (our device ID are always 1)
-
-  sendRequestGroupSyncMessage() {
-    const myNumber = textsecure.storage.user.getNumber();
-    const myDevice = textsecure.storage.user.getDeviceId();
-    if (myDevice !== 1 && myDevice !== '1') {
-      const { GROUPS } = textsecure.protobuf.SyncMessage.Request.Type;
-      const user = libsession.Types.PubKey.from(myNumber);
-      const { RequestContactSyncMessage } = window.libsession.Messages.Outgoing;
-
-      const requestContactSyncMessage = new RequestContactSyncMessage({
-        timestamp: Date.now(),
-        reqestType: GROUPS,
-      });
-      return libsession.getMessageQueue().send(user, requestContactSyncMessage);
-    }
-
-    return Promise.resolve();
-  },
-  // Currently not in use under session (our device ID are always 1)
-  async sendRequestContactSyncMessage() {
-    const myNumber = textsecure.storage.user.getNumber();
-    const myDevice = textsecure.storage.user.getDeviceId();
-    if (myDevice !== 1 && myDevice !== '1') {
-      const { CONTACTS } = textsecure.protobuf.SyncMessage.Request.Type;
-      const user = libsession.Types.PubKey.from(myNumber);
-      const { RequestContactSyncMessage } = window.libsession.Messages.Outgoing;
-
-      const requestContactSyncMessage = new RequestContactSyncMessage({
-        timestamp: Date.now(),
-        reqestType: CONTACTS,
-      });
-      return libsession.getMessageQueue().send(user, requestContactSyncMessage);
-    }
-    return Promise.resolve();
-  },
   async sendContactSyncMessage(conversations) {
     // If we havn't got a primaryDeviceKey then we are in the middle of pairing
     // primaryDevicePubKey is set to our own number if we are the master device
@@ -1125,20 +1071,11 @@ window.textsecure = window.textsecure || {};
 
 textsecure.MessageSender = function MessageSenderWrapper(username, password) {
   const sender = new MessageSender(username, password);
-  this.sendRequestGroupSyncMessage = sender.sendRequestGroupSyncMessage.bind(
-    sender
-  );
-  this.sendRequestContactSyncMessage = sender.sendRequestContactSyncMessage.bind(
-    sender
-  );
   this.sendContactSyncMessage = sender.sendContactSyncMessage.bind(sender);
   this.sendGroupSyncMessage = sender.sendGroupSyncMessage.bind(sender);
   this.sendOpenGroupsSyncMessage = sender.sendOpenGroupsSyncMessage.bind(
     sender
   );
-  this.sendRequestConfigurationSyncMessage = sender.sendRequestConfigurationSyncMessage.bind(
-    sender
-  );
   this.sendMessageToNumber = sender.sendMessageToNumber.bind(sender);
   this.sendMessage = sender.sendMessage.bind(sender);
   this.sendMessageToGroup = sender.sendMessageToGroup.bind(sender);
@@ -1149,7 +1086,6 @@ textsecure.MessageSender = function MessageSenderWrapper(username, password) {
   this.setGroupAvatar = sender.setGroupAvatar.bind(sender);
   this.requestSenderKeys = sender.requestSenderKeys.bind(sender);
   this.sendSyncMessage = sender.sendSyncMessage.bind(sender);
-  this.getProfile = sender.getProfile.bind(sender);
   this.uploadAvatar = sender.uploadAvatar.bind(sender);
   this.syncReadMessages = sender.syncReadMessages.bind(sender);
   this.syncVerification = sender.syncVerification.bind(sender);

libtextsecure/sync_request.js

@@ -1,4 +1,4 @@
-/* global Event, textsecure, window, ConversationController */
+/* global Event, textsecure, window, libsession */
 
 /* eslint-disable more/no-then */
 
@@ -6,44 +6,45 @@
 (function() {
   window.textsecure = window.textsecure || {};
 
-  function SyncRequest(sender, receiver) {
+  async function SyncRequest() {
-    if (
+
-      !(sender instanceof textsecure.MessageSender) ||
+    // this.receiver = receiver;
-      !(receiver instanceof textsecure.MessageReceiver)
-    ) {
-      throw new Error(
-        'Tried to construct a SyncRequest without MessageSender and MessageReceiver'
-      );
-    }
-    this.receiver = receiver;
 
-    this.oncontact = this.onContactSyncComplete.bind(this);
+    // this.oncontact = this.onContactSyncComplete.bind(this);
-    receiver.addEventListener('contactsync', this.oncontact);
+    // receiver.addEventListener('contactsync', this.oncontact);
 
-    this.ongroup = this.onGroupSyncComplete.bind(this);
+    // this.ongroup = this.onGroupSyncComplete.bind(this);
-    receiver.addEventListener('groupsync', this.ongroup);
+    // receiver.addEventListener('groupsync', this.ongroup);
 
     const ourNumber = textsecure.storage.user.getNumber();
-    const {
-      wrap,
-      sendOptions,
-    } = ConversationController.prepareForSend(ourNumber, { syncMessage: true });
 
     window.log.info('SyncRequest created. Sending config sync request...');
-    wrap(sender.sendRequestConfigurationSyncMessage(sendOptions));
+    const { CONFIGURATION } = textsecure.protobuf.SyncMessage.Request.Type;
+    const user = libsession.Types.PubKey.from(ourNumber);
+    const { RequestSyncMessage } = window.libsession.Messages.Outgoing;
+
+    const requestConfigurationSyncMessage = new RequestSyncMessage({
+      timestamp: Date.now(),
+      reqestType: CONFIGURATION,
+    });
+    await libsession.getMessageQueue().send(user, requestConfigurationSyncMessage);
 
     window.log.info('SyncRequest now sending contact sync message...');
-    wrap(sender.sendRequestContactSyncMessage(sendOptions))
+    const { CONTACTS } = textsecure.protobuf.SyncMessage.Request.Type;
-      .then(() => {
+    const requestContactSyncMessage = new RequestSyncMessage({
+      timestamp: Date.now(),
+      reqestType: CONTACTS,
+    });
+    await libsession.getMessageQueue().send(user, requestContactSyncMessage);
+
     window.log.info('SyncRequest now sending group sync messsage...');
-        return wrap(sender.sendRequestGroupSyncMessage(sendOptions));
+    const { GROUPS } = textsecure.protobuf.SyncMessage.Request.Type;
-      })
+    const requestGroupSyncMessage = new RequestSyncMessage({
-      .catch(error => {
+      timestamp: Date.now(),
-        window.log.error(
+      reqestType: GROUPS,
-          'SyncRequest error:',
-          error && error.stack ? error.stack : error
-        );
     });
+    await libsession.getMessageQueue().send(user, requestGroupSyncMessage);
+
     this.timeout = setTimeout(this.onTimeout.bind(this), 60000);
   }
 
@@ -80,8 +81,8 @@
     },
   });
 
-  textsecure.SyncRequest = function SyncRequestWrapper(sender, receiver) {
+  textsecure.SyncRequest = function SyncRequestWrapper() {
-    const syncRequest = new SyncRequest(sender, receiver);
+    const syncRequest = new SyncRequest();
     this.addEventListener = syncRequest.addEventListener.bind(syncRequest);
     this.removeEventListener = syncRequest.removeEventListener.bind(
       syncRequest