oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

Toast on device pairing request received but in device pairing mode

Browse source
This commit is contained in:
Audric Ackermann 2020-03-23 14:50:48 +11:00
parent a6e54d5c52
commit b3d895caf3
No known key found for this signature in database
GPG key ID: 999F434D76324AD4
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
_locales/en/messages.json
View file

@ -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..."
},

12
js/background.js
View file

@ -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);

5
libtextsecure/message_receiver.js
View file

@ -977,6 +977,11 @@ MessageReceiver.prototype.extend({
'devicePairingRequestReceived',
pairingRequest.secondaryDevicePubKey
);
} else {
Whisper.events.trigger(
'devicePairingRequestReceivedNoListener',
pairingRequest.secondaryDevicePubKey
);
}
// Ignore requests if the dialog is closed
}