From b6ff4dc18691bccf97b0791267c576299a534684 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 26 Feb 2021 16:07:13 +1100
Subject: [PATCH] always share profileKey if it is set

---
 ts/models/conversation.ts |  2 +-
 ts/models/message.ts      |  2 +-
 ts/session/utils/User.ts  | 22 ++++++++--------------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 92bed6108..64d48d2cc 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -673,7 +673,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         expireTimer,
         preview: uploads.preview,
         quote: uploads.quote,
-        lokiProfile: UserUtils.getOurProfile(true),
+        lokiProfile: UserUtils.getOurProfile(),
       };
 
       const destinationPubkey = new PubKey(destination);
diff --git a/ts/models/message.ts b/ts/models/message.ts
index b15679dc5..1b83fa83c 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -887,7 +887,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
         attachments,
         preview,
         quote,
-        lokiProfile: UserUtils.getOurProfile(true),
+        lokiProfile: UserUtils.getOurProfile(),
       };
       if (!chatParams.lokiProfile) {
         delete chatParams.lokiProfile;
diff --git a/ts/session/utils/User.ts b/ts/session/utils/User.ts
index 69443f6be..500ae81f4 100644
--- a/ts/session/utils/User.ts
+++ b/ts/session/utils/User.ts
@@ -85,27 +85,21 @@ export interface OurLokiProfile {
   profileKey: Uint8Array | null;
 }
 
-/**
- * Returns
- *   displayName: string;
- *   avatarPointer: string;
- *   profileKey: Uint8Array;
- */
-export function getOurProfile(
-  shareAvatar: boolean
-): OurLokiProfile | undefined {
+export function getOurProfile(): OurLokiProfile | undefined {
   try {
     // Secondary devices have their profile stored
     // in their primary device's conversation
     const ourNumber = window.storage.get('primaryDevicePubKey');
     const ourConversation = ConversationController.getInstance().get(ourNumber);
-    let profileKey = null;
-    if (shareAvatar) {
-      profileKey = new Uint8Array(window.storage.get('profileKey'));
-    }
+    const profileKey = new Uint8Array(window.storage.get('profileKey'));
+
     const avatarPointer = ourConversation.get('avatarPointer');
     const { displayName } = ourConversation.getLokiProfile();
-    return { displayName, avatarPointer, profileKey };
+    return {
+      displayName,
+      avatarPointer,
+      profileKey: profileKey.length ? profileKey : null,
+    };
   } catch (e) {
     window.log.error(`Failed to get our profile: ${e}`);
     return undefined;