Merge pull request #603 from sachaaaaa/Fix_secondary_nickname

[multi-device] Fix secondary nickname

js/background.js

@@ -723,7 +723,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'

libtextsecure/message_receiver.js

@@ -1119,7 +1119,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);