From b3d895caf3cce994952572b87b40abf6da596a57 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 23 Mar 2020 14:50:48 +1100
Subject: [PATCH] Toast on device pairing request received but in device
 pairing mode

---
 _locales/en/messages.json         |  7 +++++++
 js/background.js                  | 12 ++++++++++++
 libtextsecure/message_receiver.js |  5 +++++
 3 files changed, 24 insertions(+)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index b176ebefb..8f10bd4e4 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -987,6 +987,13 @@
   "devicePairingReceived": {
     "message": "Device Pairing Received"
   },
+  "devicePairingRequestReceivedNoListenerTitle": {
+    "message": "Device pairing request received."
+  },
+  "devicePairingRequestReceivedNoListenerDescription": {
+    "message":
+      "Device pairing request received but you are not on the device pairing screen. \nFirst go to Settings -> Device -> Link New Device."
+  },
   "waitingForDeviceToRegister": {
     "message": "Waiting for device to register..."
   },
diff --git a/js/background.js b/js/background.js
index 6d52f87c3..1511a198b 100644
--- a/js/background.js
+++ b/js/background.js
@@ -1340,6 +1340,18 @@
       }
     });
 
+    Whisper.events.on('devicePairingRequestReceivedNoListener', async () => {
+      window.pushToast({
+        title: window.i18n('devicePairingRequestReceivedNoListenerTitle'),
+        description: window.i18n(
+          'devicePairingRequestReceivedNoListenerDescription'
+        ),
+        type: 'info',
+        id: 'pairingRequestNoListener',
+        shouldFade: false,
+      });
+    });
+
     Whisper.events.on('devicePairingRequestAccepted', async (pubKey, cb) => {
       try {
         await getAccountManager().authoriseSecondaryDevice(pubKey);
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index b6b24f355..ab0f9afb9 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -977,6 +977,11 @@ MessageReceiver.prototype.extend({
           'devicePairingRequestReceived',
           pairingRequest.secondaryDevicePubKey
         );
+      } else {
+        Whisper.events.trigger(
+          'devicePairingRequestReceivedNoListener',
+          pairingRequest.secondaryDevicePubKey
+        );
       }
       // Ignore requests if the dialog is closed
     }