mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-20 15:06:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prefill room secrets entry with displayName given by server to prevent displayName undefined in EditPairedDevices Dialog (fixes #221)

Browse source
This commit is contained in:
schlagmichdoch 2024-02-04 18:05:11 +01:00
parent f22abca783
commit d81c03a560
3 changed files with 47 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

28
public/scripts/network.js
View file

@ -350,7 +350,7 @@ class Peer {
// Is overwritten in expanding classes
_send(message) {}
sendDisplayName(displayName) {
_sendDisplayName(displayName) {
this.sendJSON({type: 'display-name-changed', displayName: displayName});
}
@ -756,15 +756,23 @@ class Peer {
}
_onDisplayNameChanged(message) {
const displayNameHasChanged = this._displayName !== message.displayName
const displayNameHasChanged = message.displayName !== this._displayName;
if (message.displayName && displayNameHasChanged) {
this._displayName = message.displayName;
if (!message.displayName || !displayNameHasChanged) return;
this._displayName = message.displayName;
const roomSecret = this._getPairSecret();
if (roomSecret) {
PersistentStorage
.updateRoomSecretDisplayName(roomSecret, message.displayName)
.then(roomSecretEntry => {
console.log(`Successfully updated DisplayName for roomSecretEntry ${roomSecretEntry.key}`);
})
}
Events.fire('peer-display-name-changed', {peerId: this._peerId, displayName: message.displayName});
if (!displayNameHasChanged) return;
Events.fire('notify-peer-display-name-changed', this._peerId);
}
}
@ -985,7 +993,7 @@ class RTCPeer extends Peer {
await this._handleRemoteCandidate(message.candidate);
break;
default:
console.warn(this.name, 'Unknown message type:', message.type);
console.warn('Unknown signalType:', message.signalType);
break;
}
}
@ -1060,8 +1068,8 @@ class RTCPeer extends Peer {
this._server.send(message);
}
sendDisplayName(displayName) {
super.sendDisplayName(displayName);
_sendDisplayName(displayName) {
super._sendDisplayName(displayName);
}
getConnectionHash() {
@ -1403,7 +1411,7 @@ class PeersManager {
_notifyPeerDisplayNameChanged(peerId) {
const peer = this.peers[peerId];
if (!peer) return;
this.peers[peerId].sendDisplayName(this._displayName);
this.peers[peerId]._sendDisplayName(this._displayName);
}
_onDisplayName(displayName) {