Remove old multi device functions

js/delivery_receipts.js

@@ -4,7 +4,6 @@
   ConversationController,
   MessageController,
   _,
-  libloki,
 */
 
 /* eslint-disable more/no-then */
@@ -36,7 +35,9 @@
         return null;
       }
 
-      const primary = await window.libsession.Protocols.MultiDeviceProtocol.getPrimaryDevice(originalSource);
+      const primary = await window.libsession.Protocols.MultiDeviceProtocol.getPrimaryDevice(
+        originalSource
+      );
       const source = primary.key;
 
       const message = messages.find(

js/models/conversations.js

@@ -211,7 +211,9 @@
         return true;
       }
 
-      const ourDevices = await window.libsession.Protocols.MultiDeviceProtocol.getAllDevices(this.ourNumber);
+      const ourDevices = await window.libsession.Protocols.MultiDeviceProtocol.getAllDevices(
+        this.ourNumber
+      );
 
       return ourDevices.some(device => device.key === this.id);
     },

js/models/message.d.ts

@@ -1,4 +1,3 @@
-
 type MessageModelType = 'incoming' | 'outgoing' | 'friend-request';
 export type EndSessionType = 'done' | 'ongoing';
 

js/modules/data.js

@@ -642,14 +642,6 @@ async function removePairingAuthorisationsFor(pubKey) {
   await channels.removePairingAuthorisationsFor(pubKey);
 }
 
-function getAuthorisationForSecondaryPubKey(pubKey) {
-  return channels.getAuthorisationForSecondaryPubKey(pubKey);
-}
-
-function getSecondaryDevicesFor(primaryDevicePubKey) {
-  return channels.getSecondaryDevicesFor(primaryDevicePubKey);
-}
-
 function getGuardNodes() {
   return channels.getGuardNodes();
 }
@@ -658,14 +650,6 @@ function updateGuardNodes(nodes) {
   return channels.updateGuardNodes(nodes);
 }
 
-function getPrimaryDeviceFor(secondaryDevicePubKey) {
-  return channels.getPrimaryDeviceFor(secondaryDevicePubKey);
-}
-
-function getPairedDevicesFor(pubKey) {
-  return channels.getPairedDevicesFor(pubKey);
-}
-
 // Items
 
 const ITEM_KEYS = {

js/views/create_group_dialog_view.js

@@ -1,4 +1,4 @@
-/* global Whisper, i18n, textsecure, libloki, _ */
+/* global Whisper, i18n, textsecure, _ */
 
 // eslint-disable-next-line func-names
 (function() {

libloki/storage.js

@@ -1,5 +1,4 @@
-/* global window, libsignal, textsecure,
-   lokiFileServerAPI,  */
+/* global window, libsignal, textsecure */
 
 // eslint-disable-next-line func-names
 (function() {

libtextsecure/account_manager.js

@@ -574,8 +574,12 @@
         secondaryDevicePubKey,
         libloki.crypto.PairingType.GRANT
       );
-      const authorisations = await libsession.Protocols.MultiDeviceProtocol.getPairingAuthorisations(secondaryDevicePubKey);
-      const existingAuthorisation = authorisations.some(pairing => pairing.secondaryDevicePubKey === secondaryDevicePubKey);
+      const authorisations = await libsession.Protocols.MultiDeviceProtocol.getPairingAuthorisations(
+        secondaryDevicePubKey
+      );
+      const existingAuthorisation = authorisations.some(
+        pairing => pairing.secondaryDevicePubKey === secondaryDevicePubKey
+      );
       if (!existingAuthorisation) {
         throw new Error(
           'authoriseSecondaryDevice: request signature missing from database!'
@@ -590,7 +594,9 @@
       };
 
       // Update authorisation in database with the new grant signature
-      await libsession.Protocols.MultiDeviceProtocol.savePairingAuthorisation(authorisation);
+      await libsession.Protocols.MultiDeviceProtocol.savePairingAuthorisation(
+        authorisation
+      );
 
       // Try to upload to the file server and then send a message
       try {

libtextsecure/message_receiver.js

@@ -968,7 +968,9 @@ MessageReceiver.prototype.extend({
     if (valid) {
       // Pairing dialog is open and is listening
       if (Whisper.events.isListenedTo('devicePairingRequestReceived')) {
-        await window.libsession.Protocols.MultiDeviceProtocol.savePairingAuthorisation(pairingRequest);
+        await window.libsession.Protocols.MultiDeviceProtocol.savePairingAuthorisation(
+          pairingRequest
+        );
         Whisper.events.trigger(
           'devicePairingRequestReceived',
           pairingRequest.secondaryDevicePubKey
@@ -1014,7 +1016,9 @@ MessageReceiver.prototype.extend({
         window.storage.remove('secondaryDeviceStatus');
         window.storage.put('isSecondaryDevice', true);
         window.storage.put('primaryDevicePubKey', primaryDevicePubKey);
-        await window.libsession.Protocols.MultiDeviceProtocol.savePairingAuthorisation(pairingAuthorisation);
+        await window.libsession.Protocols.MultiDeviceProtocol.savePairingAuthorisation(
+          pairingAuthorisation
+        );
         const primaryConversation = await ConversationController.getOrCreateAndWait(
           primaryDevicePubKey,
           'private'

libtextsecure/outgoing_message.js

@@ -431,7 +431,9 @@ OutgoingMessage.prototype = {
     const ourPubKey = textsecure.storage.user.getNumber();
     const ourPrimaryPubkey = window.storage.get('primaryDevicePubKey');
     const secondaryPubKeys =
-      (await window.libsession.Protocols.MultiDeviceProtocol.getSecondaryDevices(ourPubKey)) || [];
+      (await window.libsession.Protocols.MultiDeviceProtocol.getSecondaryDevices(
+        ourPubKey
+      )) || [];
     let aliasedPubkey = devicePubKey;
     if (devicePubKey === ourPubKey) {
       aliasedPubkey = 'OUR_PUBKEY'; // should not happen

ts/components/session/settings/SessionSettings.tsx

@@ -7,6 +7,9 @@ import {
   SessionButtonColor,
   SessionButtonType,
 } from '../SessionButton';
+import { UserUtil } from '../../../util';
+import { MultiDeviceProtocol } from '../../../session/protocols';
+import { PubKey } from '../../../session/types';
 
 export enum SessionSettingCategory {
   Appearance = 'appearance',
@@ -644,16 +647,14 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
     }
   }
 
-  private refreshLinkedDevice() {
-    const ourPubKey = window.textsecure.storage.user.getNumber();
+  private async refreshLinkedDevice() {
+    const ourPubKey = await UserUtil.getCurrentDevicePubKey();
+    if (ourPubKey) {
+      const pubKey = new PubKey(ourPubKey);
+      const devices = await MultiDeviceProtocol.getSecondaryDevices(pubKey);
 
-    window.libloki.storage
-      .getSecondaryDevicesFor(ourPubKey)
-      .then((pubKeys: any) => {
-        this.setState({
-          linkedPubKeys: pubKeys,
-        });
-      });
+      this.setState({ linkedPubKeys: devices.map(d => d.key) });
+    }
   }
 
   private async onKeyUp(event: any) {

ts/components/session/settings/SessionSettingsHeader.tsx

@@ -3,6 +3,9 @@ import { SessionIconButton, SessionIconSize, SessionIconType } from '../icon';
 
 import { SessionSettingCategory, SettingsViewProps } from './SessionSettings';
 import { SessionButton } from '../SessionButton';
+import { UserUtil } from '../../../util';
+import { PubKey } from '../../../session/types';
+import { MultiDeviceProtocol } from '../../../session/protocols';
 
 interface Props extends SettingsViewProps {
   // showLinkDeviceButton is used to completely hide the button while the settings password lock is displayed
@@ -37,22 +40,20 @@ export class SettingsHeader extends React.Component<Props, any> {
   public componentDidMount() {
     if (!this.props.isSecondaryDevice) {
       window.Whisper.events.on('refreshLinkedDeviceList', async () => {
-        this.refreshLinkedDevice();
+        void this.refreshLinkedDevice();
       });
-      this.refreshLinkedDevice();
+      void this.refreshLinkedDevice();
     }
   }
 
-  public refreshLinkedDevice() {
-    const ourPubKey = window.textsecure.storage.user.getNumber();
+  public async refreshLinkedDevice() {
+    const ourPubKey = await UserUtil.getCurrentDevicePubKey();
+    if (ourPubKey) {
+      const pubKey = new PubKey(ourPubKey);
+      const devices = await MultiDeviceProtocol.getSecondaryDevices(pubKey);
 
-    window.libloki.storage
-      .getSecondaryDevicesFor(ourPubKey)
-      .then((pubKeys: any) => {
-        this.setState({
-          disableLinkDeviceButton: pubKeys && pubKeys.length > 0,
-        });
-      });
+      this.setState({ disableLinkDeviceButton: devices.length > 0 });
+    }
   }
 
   public componentWillUnmount() {

ts/receiver/receiver.ts

@@ -605,9 +605,9 @@ export async function handleDataMessage(
 
   const isOwnDevice = async (device: string) => {
     const pubKey = new PubKey(device);
-    const allDevices = await  MultiDeviceProtocol.getAllDevices(pubKey);
+    const allDevices = await MultiDeviceProtocol.getAllDevices(pubKey);
 
-    return allDevices.some(device => PubKey.isEqual(device, pubKey));
+    return allDevices.some(d => PubKey.isEqual(d, pubKey));
   };
 
   const ownDevice = await isOwnDevice(source);

ts/session/sending/MessageQueue.ts

@@ -1,5 +1,3 @@
-import { getPairedDevicesFor } from '../../../js/modules/data';
-
 import { EventEmitter } from 'events';
 import {
   MessageQueueInterface,
@@ -20,7 +18,7 @@ import {
 } from '../utils';
 import { PubKey } from '../types';
 import { MessageSender } from '.';
-import { SessionProtocol } from '../protocols';
+import { MultiDeviceProtocol, SessionProtocol } from '../protocols';
 import { UserUtil } from '../../util';
 
 export class MessageQueue implements MessageQueueInterface {
@@ -35,8 +33,7 @@ export class MessageQueue implements MessageQueueInterface {
   }
 
   public async sendUsingMultiDevice(user: PubKey, message: ContentMessage) {
-    const userLinked = await getPairedDevicesFor(user.key);
-    const userDevices = userLinked.map(d => new PubKey(d));
+    const userDevices = await MultiDeviceProtocol.getAllDevices(user.key);
 
     await this.sendMessageToDevices(userDevices, message);
   }
@@ -56,11 +53,10 @@ export class MessageQueue implements MessageQueueInterface {
       const currentDevice = await UserUtil.getCurrentDevicePubKey();
 
       if (currentDevice) {
-        const otherDevices = await getPairedDevicesFor(currentDevice);
-
-        const ourDevices = [currentDevice, ...otherDevices].map(
-          device => new PubKey(device)
+        const ourDevices = await MultiDeviceProtocol.getAllDevices(
+          currentDevice
         );
+
         await this.sendSyncMessage(message, ourDevices);
 
         // Remove our devices from currentDevices

ts/session/utils/SyncMessageUtils.ts

@@ -1,12 +1,10 @@
 import * as _ from 'lodash';
 import * as UserUtils from '../../util/user';
-import {
-  getAllConversations,
-  getPrimaryDeviceFor,
-} from '../../../js/modules/data';
+import { getAllConversations } from '../../../js/modules/data';
 import { ConversationController, Whisper } from '../../window';
 
 import { ContentMessage, SyncMessage } from '../messages/outgoing';
+import { MultiDeviceProtocol } from '../protocols';
 
 export function from(message: ContentMessage): SyncMessage | undefined {
   // const { timestamp, identifier } = message;
@@ -30,7 +28,7 @@ export async function getSyncContacts(): Promise<Array<any> | undefined> {
     return [];
   }
 
-  const primaryDevice = await getPrimaryDeviceFor(thisDevice);
+  const primaryDevice = await MultiDeviceProtocol.getPrimaryDevice(thisDevice);
   const conversations = await getAllConversations({
     ConversationCollection: Whisper.ConversationCollection,
   });
@@ -62,7 +60,7 @@ export async function getSyncContacts(): Promise<Array<any> | undefined> {
 
   const secondaryContacts = (await Promise.all(seondaryContactsPromise))
     // Filter out our primary key if it was added here
-    .filter(c => c.id !== primaryDevice);
+    .filter(c => c.id !== primaryDevice.key);
 
   // Return unique contacts
   return _.uniqBy(

ts/state/ducks/search.ts

@@ -5,11 +5,7 @@ import { AdvancedSearchOptions, SearchOptions } from '../../types/Search';
 import { trigger } from '../../shims/events';
 import { getMessageModel } from '../../shims/Whisper';
 import { cleanSearchTerm } from '../../util/cleanSearchTerm';
-import {
-  getPrimaryDeviceFor,
-  searchConversations,
-  searchMessages,
-} from '../../../js/modules/data';
+import { searchConversations, searchMessages } from '../../../js/modules/data';
 import { makeLookup } from '../../util/makeLookup';
 
 import {
@@ -19,6 +15,8 @@ import {
   RemoveAllConversationsActionType,
   SelectedConversationChangedActionType,
 } from './conversations';
+import { MultiDeviceProtocol } from '../../session/protocols';
+import { PubKey } from '../../session/types';
 
 // State
 
@@ -283,15 +281,13 @@ async function queryConversationsAndContacts(
     query
   );
 
-  const ourPrimaryDevice = isSecondaryDevice
-    ? await getPrimaryDeviceFor(ourNumber)
-    : ourNumber;
+  const ourPrimaryDevice = await MultiDeviceProtocol.getPrimaryDevice(
+    ourNumber
+  );
 
-  const resultPrimaryDevices: Array<string | null> = await Promise.all(
+  const resultPrimaryDevices = await Promise.all(
     searchResults.map(async conversation =>
-      conversation.id === ourPrimaryDevice
-        ? Promise.resolve(ourPrimaryDevice)
-        : getPrimaryDeviceFor(conversation.id)
+      MultiDeviceProtocol.getPrimaryDevice(conversation.id)
     )
   );
 
@@ -303,18 +299,10 @@ async function queryConversationsAndContacts(
     const conversation = searchResults[i];
     const primaryDevice = resultPrimaryDevices[i];
 
-    if (primaryDevice) {
-      if (isSecondaryDevice && primaryDevice === ourPrimaryDevice) {
-        conversations.push(ourNumber);
-      } else {
-        conversations.push(primaryDevice);
-      }
-    } else if (conversation.type === 'direct') {
-      contacts.push(conversation.id);
-    } else if (conversation.type !== 'group') {
-      contacts.push(conversation.id);
+    if (isSecondaryDevice && PubKey.isEqual(primaryDevice, ourPrimaryDevice)) {
+      conversations.push(ourNumber);
     } else {
-      conversations.push(conversation.id);
+      conversations.push(primaryDevice.key);
     }
   }
   // Inject synthetic Note to Self entry if query matches localized 'Note to Self'