do not sync profileKey on sync => only on ConfigurationMessage

ts/session/messages/outgoing/content/data/ChatMessage.ts

@@ -108,23 +108,7 @@ export class ChatMessage extends DataMessage {
     if (!sentTimestamp || !isNumber(sentTimestamp)) {
       throw new Error('Tried to build a sync message without a sentTimestamp');
     }
-    // the dataMessage.profileKey is of type ByteBuffer. We need to make it a Uint8Array
+    // don't include our profileKey on syncing message. This is to be done by a ConfigurationMessage now
-    const lokiProfile: any = {};
-    if (dataMessage.profileKey?.length) {
-      lokiProfile.profileKey = new Uint8Array(
-        (dataMessage.profileKey as any).toArrayBuffer()
-      );
-    }
-
-    if (dataMessage.profile) {
-      if (dataMessage.profile?.displayName) {
-        lokiProfile.displayName = dataMessage.profile.displayName;
-      }
-      if (dataMessage.profile?.profilePicture) {
-        lokiProfile.avatarPointer = dataMessage.profile.profilePicture;
-      }
-    }
-
     const timestamp = toNumber(sentTimestamp);
     const body = dataMessage.body || undefined;
 
@@ -157,7 +141,6 @@ export class ChatMessage extends DataMessage {
       attachments,
       body,
       quote,
-      lokiProfile,
       preview,
       syncTarget,
     });

ts/session/utils/String.ts

@@ -36,5 +36,7 @@ export const fromHex = (d: string) => encode(d, 'hex');
 export const fromHexToArray = (d: string) => new Uint8Array(encode(d, 'hex'));
 
 export const fromBase64ToArrayBuffer = (d: string) => encode(d, 'base64');
+export const fromBase64ToArray = (d: string) =>
+  new Uint8Array(encode(d, 'base64'));
 
 export const fromArrayBufferToBase64 = (d: BufferType) => decode(d, 'base64');

ts/session/utils/syncUtils.ts

@@ -15,7 +15,12 @@ import {
   ConfigurationMessageContact,
 } from '../messages/outgoing/content/ConfigurationMessage';
 import { ConversationModel } from '../../models/conversation';
-import { fromHexToArray } from './String';
+import {
+  fromBase64ToArray,
+  fromBase64ToArrayBuffer,
+  fromHexToArray,
+} from './String';
+import { fromBase64 } from 'bytebuffer';
 
 const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp';
 
@@ -57,33 +62,43 @@ export const forceSyncConfigurationNowIfNeeded = async (
 ) =>
   new Promise(resolve => {
     const allConvos = ConversationController.getInstance().getConversations();
-
+    void getCurrentConfigurationMessage(allConvos)
-    void getCurrentConfigurationMessage(allConvos).then(configMessage => {
+      .then(configMessage => {
-      // console.warn('forceSyncConfigurationNowIfNeeded with', configMessage);
+        // console.warn('forceSyncConfigurationNowIfNeeded with', configMessage);
-
+
-      try {
+        try {
-        // this just adds the message to the sending queue.
+          // this just adds the message to the sending queue.
-        // if waitForMessageSent is set, we need to effectively wait until then
+          // if waitForMessageSent is set, we need to effectively wait until then
-        // tslint:disable-next-line: no-void-expression
+          // tslint:disable-next-line: no-void-expression
-        const callback = waitForMessageSent
+          const callback = waitForMessageSent
-          ? () => {
+            ? () => {
-              resolve(true);
+                resolve(true);
-            }
+              }
-          : undefined;
+            : undefined;
-        void getMessageQueue().sendSyncMessage(configMessage, callback as any);
+          void getMessageQueue().sendSyncMessage(
-        // either we resolve from the callback if we need to wait for it,
+            configMessage,
-        // or we don't want to wait, we resolve it here.
+            callback as any
-        if (!waitForMessageSent) {
+          );
-          resolve(true);
+          // either we resolve from the callback if we need to wait for it,
+          // or we don't want to wait, we resolve it here.
+          if (!waitForMessageSent) {
+            resolve(true);
+          }
+        } catch (e) {
+          window.log.warn(
+            'Caught an error while sending our ConfigurationMessage:',
+            e
+          );
+          resolve(false);
         }
-      } catch (e) {
+      })
+      .catch(e => {
         window.log.warn(
-          'Caught an error while sending our ConfigurationMessage:',
+          'Caught an error while building our ConfigurationMessage:',
           e
         );
         resolve(false);
-      }
+      });
-    });
   });
 
 export const getCurrentConfigurationMessage = async (
@@ -146,7 +161,7 @@ export const getCurrentConfigurationMessage = async (
 
   const contacts = contactsModels.map(c => {
     const profileKeyForContact = c.get('profileKey')
-      ? fromHexToArray(c.get('profileKey') as string)
+      ? fromBase64ToArray(c.get('profileKey') as string)
       : undefined;
 
     return new ConfigurationMessageContact({