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

handle profile properly if primaryDevicePubKey is not set

Browse source
This commit is contained in:
Ryan Tharp 2020-02-10 17:08:54 -08:00
parent 60259ab0bb
commit 5feee5dd5f
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
js/modules/loki_app_dot_net_api.js
View file

@ -216,7 +216,9 @@ class LokiAppDotNetServerAPI {
// get our profile name
// this should be primaryDevicePubKey
// because the rest of the profile system uses that...
const ourNumber = window.storage.get('primaryDevicePubKey');
const ourNumber =
window.storage.get('primaryDevicePubKey') ||
textsecure.storage.user.getNumber();
const profileConvo = ConversationController.get(ourNumber);
const profile = profileConvo.getLokiProfile();
const profileName = profile && profile.displayName;
@ -1028,7 +1030,7 @@ class LokiPublicChannelAPI {
// if we encountered problems then we'll keep the old mod status
if (moderators) {
this.modStatus =
moderators.includes(ourNumberProfile) ||
(ourNumberProfile && moderators.includes(ourNumberProfile)) ||
moderators.includes(ourNumberDevice);
}
@ -1432,8 +1434,10 @@ class LokiPublicChannelAPI {
let pendingMessages = [];
// get our profile name
const ourNumberProfile = window.storage.get('primaryDevicePubKey');
const ourNumberDevice = textsecure.storage.user.getNumber();
// if no primaryDevicePubKey fall back to ourNumberDevice
const ourNumberProfile =
window.storage.get('primaryDevicePubKey') || ourNumberDevice;
let lastProfileName = false;
// the signature forces this to be async