remove stale comment and simplify conversation creation

libloki/api.js

@@ -77,7 +77,6 @@
       pairingAuthorisation,
     });
     const options = {};
-    // Send a empty message with information about how to contact us directly
     const outgoingMessage = new textsecure.OutgoingMessage(
       null, // server
       Date.now(), // timestamp,

libtextsecure/account_manager.js

@@ -563,23 +563,15 @@
       }
 
       // Validate pubKey
-      const c = new Whisper.Conversation({
+      const c = await ConversationController.getOrCreateAndWait(
-        id: secondaryDevicePubKey,
+        secondaryDevicePubKey,
-        type: 'private',
+        'private'
-      });
+      );
       const validationError = c.validateNumber();
       if (validationError) {
         throw new Error('Invalid secondary device pubkey provided');
       }
       // Ensure there is a conversation existing
-      try {
-        await ConversationController.getOrCreateAndWait(
-          secondaryDevicePubKey,
-          'private'
-        );
-      } catch (e) {
-        window.log.error(e);
-      }
       const signature = await libloki.crypto.generateSignatureForPairing(
         secondaryDevicePubKey,
         textsecure.protobuf.PairingAuthorisationMessage.Type.PAIRING_REQUEST