Update profile if we get it through a message.

js/models/conversations.js

@@ -1738,14 +1738,12 @@
     },
     // Update profile variables dynamically
     async updateProfile() {
+      const profileName = this.get('profileName');
       const profile = await storage.getProfile(this.id);
-      if (!profile) {
-        this.set({ profileName: null });
-      } else {
-        this.set({ profileName: profile.name.displayName });
-      }
 
-      if (this.hasChanged()) {
+      const newProfileName = (profile && profile.name && profile.name.displayName) || null
+      if (profileName !== newProfileName) {
+        this.set({ profileName: newProfileName });
         await window.Signal.Data.updateConversation(this.id, this.attributes, {
           Conversation: Whisper.Conversation,
         });

libtextsecure/message_receiver.js

@@ -1,5 +1,6 @@
 /* global window: false */
 /* global textsecure: false */
+/* global storage: false */
 /* global StringView: false */
 /* global libloki: false */
 /* global libsignal: false */
@@ -917,15 +918,31 @@ MessageReceiver.prototype.extend({
       p = this.handleEndSession(envelope.source);
     }
     return p.then(() =>
-      this.processDecrypted(envelope, msg, envelope.source).then(message => {
+      this.processDecrypted(envelope, msg, envelope.source).then(async message => {
         const groupId = message.group && message.group.id;
         const isBlocked = this.isGroupBlocked(groupId);
         const isMe = envelope.source === textsecure.storage.user.getNumber();
+        const conversation = window.ConversationController.get(envelope.source);
         const isLeavingGroup = Boolean(
           message.group &&
           message.group.type === textsecure.protobuf.GroupContext.Type.QUIT
         );
 
+        // Check if we need to update any profile names
+        if (!isMe) {
+          if (message.profile) {
+            const name = JSON.parse(message.profile.name.encodeJSON());
+            await storage.saveProfile(envelope.source, { name });
+          } else {
+            await storage.removeProfile(envelope.source);
+          }
+
+          // Update the conversation profle
+          if (conversation) {
+            conversation.updateProfile();
+          }
+        }
+
         if (type === 'friend-request' && isMe) {
           window.log.info(
             'refusing to add a friend request to ourselves'

libtextsecure/sendmessage.js

@@ -136,7 +136,7 @@ Message.prototype = {
     if (this.profile) {
       const contact = new textsecure.protobuf.DataMessage.Contact();
       contact.name = this.profile.name;
-      proto.contact.push(contact);
+      proto.profile = contact;
     }
 
     this.dataMessage = proto;

protos/SignalService.proto

@@ -184,6 +184,7 @@ message DataMessage {
   optional uint64             timestamp   = 7;
   optional Quote              quote       = 8;
   repeated Contact            contact     = 9;
+  optional Contact            profile     = 101; // Loki: The profile of the current user
 }
 
 message NullMessage {