From dc626ec4d03a1b0ca3f55cb74929199d2592e13b Mon Sep 17 00:00:00 2001
From: sachaaaaa <sacha@loki.network>
Date: Wed, 6 Nov 2019 13:07:29 +1100
Subject: [PATCH] use primary device pubkey when setting nickname

---
 js/background.js                  | 2 +-
 libtextsecure/message_receiver.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/background.js b/js/background.js
index 411c15066..1e93a286e 100644
--- a/js/background.js
+++ b/js/background.js
@@ -722,7 +722,7 @@
     });
 
     Whisper.events.on('onEditProfile', async () => {
-      const ourNumber = textsecure.storage.user.getNumber();
+      const ourNumber = window.storage.get('primaryDevicePubKey');
       const conversation = await ConversationController.getOrCreateAndWait(
         ourNumber,
         'private'
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 5f51a6848..497848483 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -1111,7 +1111,7 @@ MessageReceiver.prototype.extend({
         Whisper.events.trigger('secondaryDeviceRegistration');
         // Update profile name
         if (dataMessage && dataMessage.profile) {
-          const ourNumber = textsecure.storage.user.getNumber();
+          const ourNumber = window.storage.get('primaryDevicePubKey');
           const me = window.ConversationController.get(ourNumber);
           if (me) {
             me.setLokiProfile(dataMessage.profile);