From f48e10fccd3afc2ff85872245e0d4b1162508676 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Thu, 9 Jul 2020 13:55:47 +1000
Subject: [PATCH] Fix profile keys not being decoded properly

---
 ts/components/session/LeftPaneMessageSection.tsx | 2 +-
 ts/receiver/dataMessage.ts                       | 4 ++--
 ts/receiver/queuedJob.ts                         | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ts/components/session/LeftPaneMessageSection.tsx b/ts/components/session/LeftPaneMessageSection.tsx
index 26f92bfd6..31a46fdc3 100644
--- a/ts/components/session/LeftPaneMessageSection.tsx
+++ b/ts/components/session/LeftPaneMessageSection.tsx
@@ -496,7 +496,7 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
     } finally {
       this.setState({
         loading: false,
-       });
+      });
     }
   }
 
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 293103cb8..b07acdc97 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -368,12 +368,12 @@ async function isMessageDuplicate({
 }
 
 async function handleProfileUpdate(
-  profileKeyBuffer: any,
+  profileKeyBuffer: Uint8Array,
   convoId: string,
   convoType: ConversationType,
   isIncoming: boolean
 ) {
-  const profileKey = profileKeyBuffer.toString('base64');
+  const profileKey = StringUtils.decode(profileKeyBuffer, 'base64');
 
   if (!isIncoming) {
     const receiver = await window.ConversationController.getOrCreateAndWait(
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 6fc2da5de..94025ef63 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -7,6 +7,7 @@ import { PrimaryPubKey, PubKey } from '../session/types';
 import _ from 'lodash';
 import { MultiDeviceProtocol } from '../session/protocols';
 import { SignalService } from '../protobuf';
+import { StringUtils } from '../session/utils';
 
 async function handleGroups(
   conversation: ConversationModel,
@@ -265,11 +266,11 @@ function processProfileKey(
   source: string,
   conversation: ConversationModel,
   sendingDeviceConversation: ConversationModel,
-  profileKeyBuffer: any
+  profileKeyBuffer: Uint8Array
 ) {
   const ourNumber = window.textsecure.storage.user.getNumber();
 
-  const profileKey = profileKeyBuffer.toString('base64');
+  const profileKey = StringUtils.decode(profileKeyBuffer, 'base64');
   if (source === ourNumber) {
     conversation.set({ profileSharing: true });
   } else if (conversation.isPrivate()) {