From d9e90e9ea842c313eab009b04c78d8e655930690 Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Wed, 21 Jul 2021 16:45:41 -0400
Subject: [PATCH] Improvements to shared library components

---
 ts/background.ts                              |   9 +-
 ts/components/GroupDescriptionInput.tsx       |   2 +-
 ts/components/GroupTitleInput.tsx             |   2 +-
 ts/components/Input.stories.tsx               |   8 +-
 ts/components/Input.tsx                       |  38 +--
 ts/components/ProfileEditor.tsx               |  43 ++-
 .../EditConversationAttributesModal.tsx       |  12 +-
 ts/models/conversations.ts                    | 276 +-----------------
 ts/routineProfileRefresh.ts                   |   4 +-
 ts/services/writeProfile.ts                   |  20 +-
 .../routineProfileRefresh_test.ts             | 114 ++++++--
 ts/textsecure/SendMessage.ts                  |  25 ++
 ts/types/SealedSender.ts                      |   9 +
 ts/util/getProfile.ts                         | 269 +++++++++++++++++
 ts/views/conversation_view.ts                 |   2 +-
 15 files changed, 485 insertions(+), 348 deletions(-)
 create mode 100644 ts/types/SealedSender.ts
 create mode 100644 ts/util/getProfile.ts

diff --git a/ts/background.ts b/ts/background.ts
index 590272add4d9..68f496b162a7 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -38,6 +38,7 @@ import { ourProfileKeyService } from './services/ourProfileKey';
 import { shouldRespondWithProfileKey } from './util/shouldRespondWithProfileKey';
 import { LatestQueue } from './util/LatestQueue';
 import { parseIntOrThrow } from './util/parseIntOrThrow';
+import { getProfile } from './util/getProfile';
 import {
   TypingEvent,
   ErrorEvent,
@@ -3655,10 +3656,12 @@ export async function startApp(): Promise<void> {
     const FETCH_LATEST_ENUM = Proto.SyncMessage.FetchLatest.Type;
 
     switch (eventType) {
-      case FETCH_LATEST_ENUM.LOCAL_PROFILE:
-        // Intentionally do nothing since we'll be receiving the
-        // window.storage manifest request and will update local profile along with that.
+      case FETCH_LATEST_ENUM.LOCAL_PROFILE: {
+        const ourUuid = window.textsecure.storage.user.getUuid();
+        const ourE164 = window.textsecure.storage.user.getNumber();
+        await getProfile(ourUuid, ourE164);
         break;
+      }
       case FETCH_LATEST_ENUM.STORAGE_MANIFEST:
         window.log.info('onFetchLatestSync: fetching latest manifest');
         await window.Signal.Services.runStorageServiceSyncJob();
diff --git a/ts/components/GroupDescriptionInput.tsx b/ts/components/GroupDescriptionInput.tsx
index afa955268a94..ec467e3d321e 100644
--- a/ts/components/GroupDescriptionInput.tsx
+++ b/ts/components/GroupDescriptionInput.tsx
@@ -22,7 +22,7 @@ export const GroupDescriptionInput = forwardRef<HTMLInputElement, PropsType>(
         i18n={i18n}
         onChange={onChangeValue}
         placeholder={i18n('setGroupMetadata__group-description-placeholder')}
-        maxGraphemeCount={256}
+        maxLengthCount={256}
         ref={ref}
         value={value}
         whenToShowRemainingCount={150}
diff --git a/ts/components/GroupTitleInput.tsx b/ts/components/GroupTitleInput.tsx
index e885d1e8803e..0043066f9ebf 100644
--- a/ts/components/GroupTitleInput.tsx
+++ b/ts/components/GroupTitleInput.tsx
@@ -21,7 +21,7 @@ export const GroupTitleInput = forwardRef<HTMLInputElement, PropsType>(
         i18n={i18n}
         onChange={onChangeValue}
         placeholder={i18n('setGroupMetadata__group-name-placeholder')}
-        maxGraphemeCount={32}
+        maxLengthCount={32}
         ref={ref}
         value={value}
       />
diff --git a/ts/components/Input.stories.tsx b/ts/components/Input.stories.tsx
index 45544492394f..bf42fbc30c5c 100644
--- a/ts/components/Input.stories.tsx
+++ b/ts/components/Input.stories.tsx
@@ -21,7 +21,7 @@ const createProps = (overrideProps: Partial<PropsType> = {}): PropsType => ({
   hasClearButton: Boolean(overrideProps.hasClearButton),
   i18n,
   icon: overrideProps.icon,
-  maxGraphemeCount: overrideProps.maxGraphemeCount,
+  maxLengthCount: overrideProps.maxLengthCount,
   onChange: action('onChange'),
   placeholder: text(
     'placeholder',
@@ -51,7 +51,7 @@ stories.add('hasClearButton', () => (
 stories.add('character count', () => (
   <Controller
     {...createProps({
-      maxGraphemeCount: 10,
+      maxLengthCount: 10,
     })}
   />
 ));
@@ -59,7 +59,7 @@ stories.add('character count', () => (
 stories.add('character count (customizable show)', () => (
   <Controller
     {...createProps({
-      maxGraphemeCount: 64,
+      maxLengthCount: 64,
       whenToShowRemainingCount: 32,
     })}
   />
@@ -78,7 +78,7 @@ stories.add('expandable w/count', () => (
     {...createProps({
       expandable: true,
       hasClearButton: true,
-      maxGraphemeCount: 140,
+      maxLengthCount: 140,
       whenToShowRemainingCount: 0,
     })}
   />
diff --git a/ts/components/Input.tsx b/ts/components/Input.tsx
index 5932468fd296..d5aed0a8c1f4 100644
--- a/ts/components/Input.tsx
+++ b/ts/components/Input.tsx
@@ -15,12 +15,13 @@ import { getClassNamesFor } from '../util/getClassNamesFor';
 import { multiRef } from '../util/multiRef';
 
 export type PropsType = {
+  countLength?: (value: string) => number;
   disabled?: boolean;
   expandable?: boolean;
   hasClearButton?: boolean;
   i18n: LocalizerType;
   icon?: ReactNode;
-  maxGraphemeCount?: number;
+  maxLengthCount?: number;
   moduleClassName?: string;
   onChange: (value: string) => unknown;
   placeholder: string;
@@ -29,7 +30,7 @@ export type PropsType = {
 };
 
 /**
- * Some inputs must have fewer than maxGraphemeCount glyphs. Ideally, we'd use the
+ * Some inputs must have fewer than maxLengthCount glyphs. Ideally, we'd use the
  * `maxLength` property on inputs, but that doesn't account for glyphs that are more than
  * one UTF-16 code units. For example: `'💩💩'.length === 4`.
  *
@@ -51,12 +52,13 @@ export const Input = forwardRef<
 >(
   (
     {
+      countLength = grapheme.count,
       disabled,
       expandable,
       hasClearButton,
       i18n,
       icon,
-      maxGraphemeCount = 0,
+      maxLengthCount = 0,
       moduleClassName,
       onChange,
       placeholder,
@@ -108,9 +110,9 @@ export const Input = forwardRef<
 
       const newValue = inputEl.value;
 
-      const newGraphemeCount = maxGraphemeCount ? grapheme.count(newValue) : 0;
+      const newLengthCount = maxLengthCount ? countLength(newValue) : 0;
 
-      if (newGraphemeCount <= maxGraphemeCount) {
+      if (newLengthCount <= maxLengthCount) {
         onChange(newValue);
       } else {
         inputEl.value = valueOnKeydownRef.current;
@@ -119,12 +121,12 @@ export const Input = forwardRef<
       }
 
       maybeSetLarge();
-    }, [maxGraphemeCount, maybeSetLarge, onChange]);
+    }, [countLength, maxLengthCount, maybeSetLarge, onChange]);
 
     const handlePaste = useCallback(
       (event: ClipboardEvent<HTMLInputElement | HTMLTextAreaElement>) => {
         const inputEl = innerRef.current;
-        if (!inputEl || !maxGraphemeCount) {
+        if (!inputEl || !maxLengthCount) {
           return;
         }
 
@@ -136,25 +138,25 @@ export const Input = forwardRef<
 
         const pastedText = event.clipboardData.getData('Text');
 
-        const newGraphemeCount =
-          grapheme.count(textBeforeSelection) +
-          grapheme.count(pastedText) +
-          grapheme.count(textAfterSelection);
+        const newLengthCount =
+          countLength(textBeforeSelection) +
+          countLength(pastedText) +
+          countLength(textAfterSelection);
 
-        if (newGraphemeCount > maxGraphemeCount) {
+        if (newLengthCount > maxLengthCount) {
           event.preventDefault();
         }
 
         maybeSetLarge();
       },
-      [maxGraphemeCount, maybeSetLarge, value]
+      [countLength, maxLengthCount, maybeSetLarge, value]
     );
 
     useEffect(() => {
       maybeSetLarge();
     }, [maybeSetLarge]);
 
-    const graphemeCount = maxGraphemeCount ? grapheme.count(value) : -1;
+    const lengthCount = maxLengthCount ? countLength(value) : -1;
     const getClassName = getClassNamesFor('Input', moduleClassName);
 
     const inputProps = {
@@ -187,9 +189,9 @@ export const Input = forwardRef<
         />
       ) : null;
 
-    const graphemeCountElement = graphemeCount >= whenToShowRemainingCount && (
+    const lengthCountElement = lengthCount >= whenToShowRemainingCount && (
       <div className={getClassName('__remaining-count')}>
-        {maxGraphemeCount - graphemeCount}
+        {maxLengthCount - lengthCount}
       </div>
     );
 
@@ -208,12 +210,12 @@ export const Input = forwardRef<
               {clearButtonElement}
             </div>
             <div className={getClassName('__remaining-count--large')}>
-              {graphemeCountElement}
+              {lengthCountElement}
             </div>
           </>
         ) : (
           <div className={getClassName('__controls')}>
-            {graphemeCountElement}
+            {lengthCountElement}
             {clearButtonElement}
           </div>
         )}
diff --git a/ts/components/ProfileEditor.tsx b/ts/components/ProfileEditor.tsx
index e6db766cafa7..a8d9cadfed12 100644
--- a/ts/components/ProfileEditor.tsx
+++ b/ts/components/ProfileEditor.tsx
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import * as grapheme from '../util/grapheme';
 
 import { AvatarInputContainer } from './AvatarInputContainer';
 import { AvatarInputType } from './AvatarInput';
@@ -141,9 +140,19 @@ export const ProfileEditor = ({
     [setAvatarData]
   );
 
-  const calculateGraphemeCount = useCallback((name = '') => {
-    return 256 - grapheme.count(name);
-  }, []);
+  const getTextEncoder = useCallback(() => new TextEncoder(), []);
+
+  const countByteLength = useCallback(
+    (str: string) => getTextEncoder().encode(str).byteLength,
+    [getTextEncoder]
+  );
+
+  const calculateLengthCount = useCallback(
+    (name = '') => {
+      return 256 - countByteLength(name);
+    },
+    [countByteLength]
+  );
 
   useEffect(() => {
     const focusNode = focusInputRef.current;
@@ -155,11 +164,18 @@ export const ProfileEditor = ({
   }, [editState]);
 
   if (editState === EditState.ProfileName) {
+    const shouldDisableSave =
+      !stagedProfile.firstName ||
+      (stagedProfile.firstName === fullName.firstName &&
+        stagedProfile.familyName === fullName.familyName);
+
     content = (
       <>
         <Input
+          countLength={countByteLength}
           i18n={i18n}
-          maxGraphemeCount={calculateGraphemeCount(stagedProfile.familyName)}
+          maxLengthCount={calculateLengthCount(stagedProfile.familyName)}
+          whenToShowRemainingCount={0}
           onChange={newFirstName => {
             setStagedProfile(profileData => ({
               ...profileData,
@@ -171,8 +187,10 @@ export const ProfileEditor = ({
           value={stagedProfile.firstName}
         />
         <Input
+          countLength={countByteLength}
           i18n={i18n}
-          maxGraphemeCount={calculateGraphemeCount(stagedProfile.firstName)}
+          maxLengthCount={calculateLengthCount(stagedProfile.firstName)}
+          whenToShowRemainingCount={0}
           onChange={newFamilyName => {
             setStagedProfile(profileData => ({
               ...profileData,
@@ -208,14 +226,14 @@ export const ProfileEditor = ({
             {i18n('cancel')}
           </Button>
           <Button
-            disabled={!stagedProfile.firstName}
+            disabled={shouldDisableSave}
             onClick={() => {
               if (!stagedProfile.firstName) {
                 return;
               }
               setFullName({
-                firstName,
-                familyName,
+                firstName: stagedProfile.firstName,
+                familyName: stagedProfile.familyName,
               });
 
               onProfileChanged(stagedProfile, avatarData);
@@ -228,6 +246,10 @@ export const ProfileEditor = ({
       </>
     );
   } else if (editState === EditState.Bio) {
+    const shouldDisableSave =
+      stagedProfile.aboutText === fullBio.aboutText &&
+      stagedProfile.aboutEmoji === fullBio.aboutEmoji;
+
     content = (
       <>
         <Input
@@ -247,7 +269,7 @@ export const ProfileEditor = ({
               />
             </div>
           }
-          maxGraphemeCount={140}
+          maxLengthCount={140}
           moduleClassName="ProfileEditor__about-input"
           onChange={value => {
             if (value) {
@@ -317,6 +339,7 @@ export const ProfileEditor = ({
             {i18n('cancel')}
           </Button>
           <Button
+            disabled={shouldDisableSave}
             onClick={() => {
               setFullBio({
                 aboutEmoji: stagedProfile.aboutEmoji,
diff --git a/ts/components/conversation/conversation-details/EditConversationAttributesModal.tsx b/ts/components/conversation/conversation-details/EditConversationAttributesModal.tsx
index 3864a0eede60..54dfd5d02a63 100644
--- a/ts/components/conversation/conversation-details/EditConversationAttributesModal.tsx
+++ b/ts/components/conversation/conversation-details/EditConversationAttributesModal.tsx
@@ -4,6 +4,7 @@
 import React, {
   FormEventHandler,
   FunctionComponent,
+  useCallback,
   useRef,
   useState,
 } from 'react';
@@ -111,6 +112,13 @@ export const EditConversationAttributesModal: FunctionComponent<PropsType> = ({
     makeRequest(request);
   };
 
+  const handleAvatarLoaded = useCallback(
+    loadedAvatar => {
+      setAvatar(loadedAvatar);
+    },
+    [setAvatar]
+  );
+
   return (
     <Modal
       hasXButton
@@ -131,9 +139,7 @@ export const EditConversationAttributesModal: FunctionComponent<PropsType> = ({
             setAvatar(newAvatar);
             setHasAvatarChanged(true);
           }}
-          onAvatarLoaded={loadedAvatar => {
-            setAvatar(loadedAvatar);
-          }}
+          onAvatarLoaded={handleAvatarLoaded}
           variant={AvatarInputVariant.Dark}
         />
 
diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 47a49ba85661..6cd3b69f0747 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -3,7 +3,6 @@
 
 /* eslint-disable class-methods-use-this */
 /* eslint-disable camelcase */
-import { ProfileKeyCredentialRequestContext } from 'zkgroup';
 import { compact, sample } from 'lodash';
 import {
   ConversationAttributesType,
@@ -39,8 +38,6 @@ import {
   deriveAccessKey,
   fromEncodedBinaryToArrayBuffer,
   stringFromBytes,
-  trimForDisplay,
-  verifyAccessKey,
 } from '../Crypto';
 import * as Bytes from '../Bytes';
 import { BodyRangesType } from '../types/Util';
@@ -82,6 +79,8 @@ import {
 import { Deletes } from '../messageModifiers/Deletes';
 import { Reactions, ReactionModel } from '../messageModifiers/Reactions';
 import { isAnnouncementGroupReady } from '../util/isAnnouncementGroupReady';
+import { getProfile } from '../util/getProfile';
+import { SEALED_SENDER } from '../types/SealedSender';
 
 // TODO: remove once we move away from ArrayBuffers
 const FIXMEU8 = Uint8Array;
@@ -89,13 +88,6 @@ const FIXMEU8 = Uint8Array;
 /* eslint-disable more/no-then */
 window.Whisper = window.Whisper || {};
 
-const SEALED_SENDER = {
-  UNKNOWN: 0,
-  ENABLED: 1,
-  DISABLED: 2,
-  UNRESTRICTED: 3,
-};
-
 const { Services, Util } = window.Signal;
 const { Contact, Message } = window.Signal.Types;
 const {
@@ -4388,273 +4380,11 @@ export class ConversationModel extends window.Backbone
     const conversations = (this.getMembers() as unknown) as Array<ConversationModel>;
     return Promise.all(
       window._.map(conversations, conversation => {
-        this.getProfile(conversation.get('uuid'), conversation.get('e164'));
+        getProfile(conversation.get('uuid'), conversation.get('e164'));
       })
     );
   }
 
-  async getProfile(
-    providedUuid?: string,
-    providedE164?: string
-  ): Promise<void> {
-    if (!window.textsecure.messaging) {
-      throw new Error(
-        'Conversation.getProfile: window.textsecure.messaging not available'
-      );
-    }
-
-    const id = window.ConversationController.ensureContactIds({
-      uuid: providedUuid,
-      e164: providedE164,
-    });
-    const c = window.ConversationController.get(id);
-    if (!c) {
-      window.log.error(
-        'getProfile: failed to find conversation; doing nothing'
-      );
-      return;
-    }
-
-    const {
-      generateProfileKeyCredentialRequest,
-      getClientZkProfileOperations,
-      handleProfileKeyCredential,
-    } = Util.zkgroup;
-
-    const clientZkProfileCipher = getClientZkProfileOperations(
-      window.getServerPublicParams()
-    );
-
-    let profile;
-
-    try {
-      await Promise.all([
-        c.deriveAccessKeyIfNeeded(),
-        c.deriveProfileKeyVersionIfNeeded(),
-      ]);
-
-      const profileKey = c.get('profileKey');
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const uuid = c.get('uuid')!;
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const identifier = c.getSendTarget()!;
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const profileKeyVersionHex = c.get('profileKeyVersion')!;
-      const existingProfileKeyCredential = c.get('profileKeyCredential');
-
-      let profileKeyCredentialRequestHex: undefined | string;
-      let profileCredentialRequestContext:
-        | undefined
-        | ProfileKeyCredentialRequestContext;
-
-      if (
-        profileKey &&
-        uuid &&
-        profileKeyVersionHex &&
-        !existingProfileKeyCredential
-      ) {
-        window.log.info('Generating request...');
-        ({
-          requestHex: profileKeyCredentialRequestHex,
-          context: profileCredentialRequestContext,
-        } = generateProfileKeyCredentialRequest(
-          clientZkProfileCipher,
-          uuid,
-          profileKey
-        ));
-      }
-
-      const { sendMetadata = {} } = await getSendOptions(c.attributes);
-      const getInfo =
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        sendMetadata[c.get('uuid')!] || sendMetadata[c.get('e164')!] || {};
-
-      if (getInfo.accessKey) {
-        try {
-          profile = await window.textsecure.messaging.getProfile(identifier, {
-            accessKey: getInfo.accessKey,
-            profileKeyVersion: profileKeyVersionHex,
-            profileKeyCredentialRequest: profileKeyCredentialRequestHex,
-          });
-        } catch (error) {
-          if (error.code === 401 || error.code === 403) {
-            window.log.info(
-              `Setting sealedSender to DISABLED for conversation ${c.idForLogging()}`
-            );
-            c.set({ sealedSender: SEALED_SENDER.DISABLED });
-            profile = await window.textsecure.messaging.getProfile(identifier, {
-              profileKeyVersion: profileKeyVersionHex,
-              profileKeyCredentialRequest: profileKeyCredentialRequestHex,
-            });
-          } else {
-            throw error;
-          }
-        }
-      } else {
-        profile = await window.textsecure.messaging.getProfile(identifier, {
-          profileKeyVersion: profileKeyVersionHex,
-          profileKeyCredentialRequest: profileKeyCredentialRequestHex,
-        });
-      }
-
-      const identityKey = base64ToArrayBuffer(profile.identityKey);
-      const changed = await window.textsecure.storage.protocol.saveIdentity(
-        `${identifier}.1`,
-        identityKey,
-        false
-      );
-      if (changed) {
-        // save identity will close all sessions except for .1, so we
-        // must close that one manually.
-        await window.textsecure.storage.protocol.archiveSession(
-          `${identifier}.1`
-        );
-      }
-
-      const accessKey = c.get('accessKey');
-      if (
-        profile.unrestrictedUnidentifiedAccess &&
-        profile.unidentifiedAccess
-      ) {
-        window.log.info(
-          `Setting sealedSender to UNRESTRICTED for conversation ${c.idForLogging()}`
-        );
-        c.set({
-          sealedSender: SEALED_SENDER.UNRESTRICTED,
-        });
-      } else if (accessKey && profile.unidentifiedAccess) {
-        const haveCorrectKey = await verifyAccessKey(
-          base64ToArrayBuffer(accessKey),
-          base64ToArrayBuffer(profile.unidentifiedAccess)
-        );
-
-        if (haveCorrectKey) {
-          window.log.info(
-            `Setting sealedSender to ENABLED for conversation ${c.idForLogging()}`
-          );
-          c.set({
-            sealedSender: SEALED_SENDER.ENABLED,
-          });
-        } else {
-          window.log.info(
-            `Setting sealedSender to DISABLED for conversation ${c.idForLogging()}`
-          );
-          c.set({
-            sealedSender: SEALED_SENDER.DISABLED,
-          });
-        }
-      } else {
-        window.log.info(
-          `Setting sealedSender to DISABLED for conversation ${c.idForLogging()}`
-        );
-        c.set({
-          sealedSender: SEALED_SENDER.DISABLED,
-        });
-      }
-
-      if (profile.about) {
-        const key = c.get('profileKey');
-        if (key) {
-          const keyBuffer = base64ToArrayBuffer(key);
-          const decrypted = await window.textsecure.crypto.decryptProfile(
-            base64ToArrayBuffer(profile.about),
-            keyBuffer
-          );
-          c.set('about', stringFromBytes(trimForDisplay(decrypted)));
-        }
-      } else {
-        c.unset('about');
-      }
-
-      if (profile.aboutEmoji) {
-        const key = c.get('profileKey');
-        if (key) {
-          const keyBuffer = base64ToArrayBuffer(key);
-          const decrypted = await window.textsecure.crypto.decryptProfile(
-            base64ToArrayBuffer(profile.aboutEmoji),
-            keyBuffer
-          );
-          c.set('aboutEmoji', stringFromBytes(trimForDisplay(decrypted)));
-        }
-      } else {
-        c.unset('aboutEmoji');
-      }
-
-      if (profile.paymentAddress && isMe(c.attributes)) {
-        window.storage.put('paymentAddress', profile.paymentAddress);
-      }
-
-      if (profile.capabilities) {
-        c.set({ capabilities: profile.capabilities });
-      } else {
-        c.unset('capabilities');
-      }
-
-      if (profileCredentialRequestContext) {
-        if (profile.credential) {
-          const profileKeyCredential = handleProfileKeyCredential(
-            clientZkProfileCipher,
-            profileCredentialRequestContext,
-            profile.credential
-          );
-          c.set({ profileKeyCredential });
-        } else {
-          c.unset('profileKeyCredential');
-        }
-      }
-    } catch (error) {
-      switch (error?.code) {
-        case 403:
-          throw error;
-        case 404:
-          window.log.warn(
-            `getProfile failure: failed to find a profile for ${c.idForLogging()}`,
-            error && error.stack ? error.stack : error
-          );
-          c.setUnregistered();
-          return;
-        default:
-          window.log.warn(
-            'getProfile failure:',
-            c.idForLogging(),
-            error && error.stack ? error.stack : error
-          );
-          return;
-      }
-    }
-
-    try {
-      await c.setEncryptedProfileName(profile.name);
-    } catch (error) {
-      window.log.warn(
-        'getProfile decryption failure:',
-        c.idForLogging(),
-        error && error.stack ? error.stack : error
-      );
-      await c.set({
-        profileName: undefined,
-        profileFamilyName: undefined,
-      });
-    }
-
-    try {
-      await c.setProfileAvatar(profile.avatar);
-    } catch (error) {
-      if (error.code === 403 || error.code === 404) {
-        window.log.info(
-          `Clearing profile avatar for conversation ${c.idForLogging()}`
-        );
-        c.set({
-          profileAvatar: null,
-        });
-      }
-    }
-
-    c.set('profileLastFetchedAt', Date.now());
-
-    window.Signal.Data.updateConversation(c.attributes);
-  }
-
   async setEncryptedProfileName(encryptedName: string): Promise<void> {
     if (!encryptedName) {
       return;
diff --git a/ts/routineProfileRefresh.ts b/ts/routineProfileRefresh.ts
index 991461fa7b1c..04067324b355 100644
--- a/ts/routineProfileRefresh.ts
+++ b/ts/routineProfileRefresh.ts
@@ -15,6 +15,8 @@ import { take } from './util/iterables';
 import { isOlderThan } from './util/timestamp';
 import { ConversationModel } from './models/conversations';
 import { StorageInterface } from './types/Storage.d';
+// Imported this way so that sinon.sandbox can stub this properly
+import * as profileGetter from './util/getProfile';
 
 const STORAGE_KEY = 'lastAttemptedToRefreshProfilesAt';
 const MAX_AGE_TO_BE_CONSIDERED_ACTIVE = 30 * 24 * 60 * 60 * 1000;
@@ -60,7 +62,7 @@ export async function routineProfileRefresh({
 
     totalCount += 1;
     try {
-      await conversation.getProfile(
+      await profileGetter.getProfile(
         conversation.get('uuid'),
         conversation.get('e164')
       );
diff --git a/ts/services/writeProfile.ts b/ts/services/writeProfile.ts
index e0578bd051f7..a758a1f3df91 100644
--- a/ts/services/writeProfile.ts
+++ b/ts/services/writeProfile.ts
@@ -1,10 +1,12 @@
 // Copyright 2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import { computeHash } from '../Crypto';
 import dataInterface from '../sql/Client';
 import { ConversationType } from '../state/ducks/conversations';
+import { computeHash } from '../Crypto';
 import { encryptProfileData } from '../util/encryptProfileData';
+import { getProfile } from '../util/getProfile';
+import { handleMessageSend } from '../util/handleMessageSend';
 
 export async function writeProfile(
   conversation: ConversationType,
@@ -16,7 +18,7 @@ export async function writeProfile(
   if (!model) {
     return;
   }
-  await model.getProfile(model.get('uuid'), model.get('e164'));
+  await getProfile(model.get('uuid'), model.get('e164'));
 
   // Encrypt the profile data, update profile, and if needed upload the avatar
   const {
@@ -64,25 +66,27 @@ export async function writeProfile(
         hash,
         path,
       };
-    } else {
-      profileAvatar = {
-        hash: String(avatarHash),
-        path: String(avatarPath),
-      };
     }
   } else if (avatarPath) {
     await window.Signal.Migrations.deleteAttachmentData(avatarPath);
   }
 
+  const profileAvatarData = profileAvatar ? { profileAvatar } : {};
+
   // Update backbone, update DB, run storage service upload
   model.set({
     about: aboutText,
     aboutEmoji,
-    profileAvatar,
     profileName: firstName,
     profileFamilyName: familyName,
+    ...profileAvatarData,
   });
 
   dataInterface.updateConversation(model.attributes);
   model.captureChange('writeProfile');
+
+  await handleMessageSend(
+    window.textsecure.messaging.sendFetchLocalProfileSyncMessage(),
+    { messageIds: [], sendType: 'otherSync' }
+  );
 }
diff --git a/ts/test-electron/routineProfileRefresh_test.ts b/ts/test-electron/routineProfileRefresh_test.ts
index 799570bfa49e..788a225638bc 100644
--- a/ts/test-electron/routineProfileRefresh_test.ts
+++ b/ts/test-electron/routineProfileRefresh_test.ts
@@ -8,12 +8,14 @@ import { ConversationModel } from '../models/conversations';
 import { ConversationAttributesType } from '../model-types.d';
 
 import { routineProfileRefresh } from '../routineProfileRefresh';
+import * as getProfileStub from '../util/getProfile';
 
 describe('routineProfileRefresh', () => {
   let sinonSandbox: sinon.SinonSandbox;
 
   beforeEach(() => {
     sinonSandbox = sinon.createSandbox();
+    sinonSandbox.stub(getProfileStub, 'getProfile').resolves(undefined);
   });
 
   afterEach(() => {
@@ -24,16 +26,17 @@ describe('routineProfileRefresh', () => {
     overrideAttributes: Partial<ConversationAttributesType> = {}
   ): ConversationModel {
     const result = new ConversationModel({
-      profileSharing: true,
-      left: false,
       accessKey: uuid(),
+      active_at: Date.now(),
       draftAttachments: [],
       draftBodyRanges: [],
       draftTimestamp: null,
+      id: uuid(),
       inbox_position: 0,
       isPinned: false,
       lastMessageDeletedForEveryone: false,
       lastMessageStatus: 'sent',
+      left: false,
       markedUnread: false,
       messageCount: 2,
       messageCountBeforeMessageRequests: 0,
@@ -42,18 +45,17 @@ describe('routineProfileRefresh', () => {
       profileAvatar: undefined,
       profileKeyCredential: uuid(),
       profileKeyVersion: '',
+      profileSharing: true,
       quotedMessageId: null,
       sealedSender: 1,
       sentMessageCount: 1,
       sharedGroupNames: [],
-      id: uuid(),
-      type: 'private',
       timestamp: Date.now(),
-      active_at: Date.now(),
+      type: 'private',
+      uuid: uuid(),
       version: 2,
       ...overrideAttributes,
     });
-    sinonSandbox.stub(result, 'getProfile').resolves(undefined);
     return result;
   }
 
@@ -87,8 +89,7 @@ describe('routineProfileRefresh', () => {
       storage,
     });
 
-    sinon.assert.notCalled(conversation1.getProfile as sinon.SinonStub);
-    sinon.assert.notCalled(conversation2.getProfile as sinon.SinonStub);
+    sinon.assert.notCalled(getProfileStub.getProfile as sinon.SinonStub);
     sinon.assert.notCalled(storage.put);
   });
 
@@ -102,8 +103,16 @@ describe('routineProfileRefresh', () => {
       storage: makeStorage(),
     });
 
-    sinon.assert.calledOnce(conversation1.getProfile as sinon.SinonStub);
-    sinon.assert.calledOnce(conversation2.getProfile as sinon.SinonStub);
+    sinon.assert.calledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      conversation1.get('uuid'),
+      conversation1.get('e164')
+    );
+    sinon.assert.calledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      conversation2.get('uuid'),
+      conversation2.get('e164')
+    );
   });
 
   it("skips conversations that haven't been active in 30 days", async () => {
@@ -119,9 +128,22 @@ describe('routineProfileRefresh', () => {
       storage: makeStorage(),
     });
 
-    sinon.assert.calledOnce(recentlyActive.getProfile as sinon.SinonStub);
-    sinon.assert.notCalled(inactive.getProfile as sinon.SinonStub);
-    sinon.assert.notCalled(neverActive.getProfile as sinon.SinonStub);
+    sinon.assert.calledOnce(getProfileStub.getProfile as sinon.SinonStub);
+    sinon.assert.calledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      recentlyActive.get('uuid'),
+      recentlyActive.get('e164')
+    );
+    sinon.assert.neverCalledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      inactive.get('uuid'),
+      inactive.get('e164')
+    );
+    sinon.assert.neverCalledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      neverActive.get('uuid'),
+      neverActive.get('e164')
+    );
   });
 
   it('skips your own conversation', async () => {
@@ -134,7 +156,16 @@ describe('routineProfileRefresh', () => {
       storage: makeStorage(),
     });
 
-    sinon.assert.notCalled(me.getProfile as sinon.SinonStub);
+    sinon.assert.calledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      notMe.get('uuid'),
+      notMe.get('e164')
+    );
+    sinon.assert.neverCalledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      me.get('uuid'),
+      me.get('e164')
+    );
   });
 
   it('skips conversations that were refreshed in the last hour', async () => {
@@ -149,8 +180,17 @@ describe('routineProfileRefresh', () => {
       storage: makeStorage(),
     });
 
-    sinon.assert.calledOnce(neverRefreshed.getProfile as sinon.SinonStub);
-    sinon.assert.notCalled(recentlyFetched.getProfile as sinon.SinonStub);
+    sinon.assert.calledOnce(getProfileStub.getProfile as sinon.SinonStub);
+    sinon.assert.calledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      neverRefreshed.get('uuid'),
+      neverRefreshed.get('e164')
+    );
+    sinon.assert.neverCalledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      recentlyFetched.get('uuid'),
+      recentlyFetched.get('e164')
+    );
   });
 
   it('"digs into" the members of an active group', async () => {
@@ -182,15 +222,31 @@ describe('routineProfileRefresh', () => {
       storage: makeStorage(),
     });
 
-    sinon.assert.calledOnce(privateConversation.getProfile as sinon.SinonStub);
-    sinon.assert.calledOnce(
-      recentlyActiveGroupMember.getProfile as sinon.SinonStub
+    sinon.assert.calledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      privateConversation.get('uuid'),
+      privateConversation.get('e164')
     );
-    sinon.assert.calledOnce(inactiveGroupMember.getProfile as sinon.SinonStub);
-    sinon.assert.notCalled(
-      memberWhoHasRecentlyRefreshed.getProfile as sinon.SinonStub
+    sinon.assert.calledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      recentlyActiveGroupMember.get('uuid'),
+      recentlyActiveGroupMember.get('e164')
+    );
+    sinon.assert.calledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      inactiveGroupMember.get('uuid'),
+      inactiveGroupMember.get('e164')
+    );
+    sinon.assert.neverCalledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      memberWhoHasRecentlyRefreshed.get('uuid'),
+      memberWhoHasRecentlyRefreshed.get('e164')
+    );
+    sinon.assert.neverCalledWith(
+      getProfileStub.getProfile as sinon.SinonStub,
+      groupConversation.get('uuid'),
+      groupConversation.get('e164')
     );
-    sinon.assert.notCalled(groupConversation.getProfile as sinon.SinonStub);
   });
 
   it('only refreshes profiles for the 50 most recently active direct conversations', async () => {
@@ -235,11 +291,19 @@ describe('routineProfileRefresh', () => {
     });
 
     [...activeConversations, ...inactiveGroupMembers].forEach(conversation => {
-      sinon.assert.calledOnce(conversation.getProfile as sinon.SinonStub);
+      sinon.assert.calledWith(
+        getProfileStub.getProfile as sinon.SinonStub,
+        conversation.get('uuid'),
+        conversation.get('e164')
+      );
     });
 
     [me, ...shouldNotBeIncluded].forEach(conversation => {
-      sinon.assert.notCalled(conversation.getProfile as sinon.SinonStub);
+      sinon.assert.neverCalledWith(
+        getProfileStub.getProfile as sinon.SinonStub,
+        conversation.get('uuid'),
+        conversation.get('e164')
+      );
     });
   });
 });
diff --git a/ts/textsecure/SendMessage.ts b/ts/textsecure/SendMessage.ts
index 4ca52c4fd841..ab4606dfcec9 100644
--- a/ts/textsecure/SendMessage.ts
+++ b/ts/textsecure/SendMessage.ts
@@ -1208,6 +1208,31 @@ export default class MessageSender {
     });
   }
 
+  async sendFetchLocalProfileSyncMessage(
+    options?: SendOptionsType
+  ): Promise<CallbackResultType> {
+    const myUuid = window.textsecure.storage.user.getUuid();
+    const myNumber = window.textsecure.storage.user.getNumber();
+
+    const fetchLatest = new Proto.SyncMessage.FetchLatest();
+    fetchLatest.type = Proto.SyncMessage.FetchLatest.Type.LOCAL_PROFILE;
+
+    const syncMessage = this.createSyncMessage();
+    syncMessage.fetchLatest = fetchLatest;
+    const contentMessage = new Proto.Content();
+    contentMessage.syncMessage = syncMessage;
+
+    const { ContentHint } = Proto.UnidentifiedSenderMessage.Message;
+
+    return this.sendIndividualProto({
+      identifier: myUuid || myNumber,
+      proto: contentMessage,
+      timestamp: Date.now(),
+      contentHint: ContentHint.IMPLICIT,
+      options,
+    });
+  }
+
   async sendRequestKeySyncMessage(
     options?: SendOptionsType
   ): Promise<CallbackResultType> {
diff --git a/ts/types/SealedSender.ts b/ts/types/SealedSender.ts
new file mode 100644
index 000000000000..a270ee7424fb
--- /dev/null
+++ b/ts/types/SealedSender.ts
@@ -0,0 +1,9 @@
+// Copyright 2021 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+export enum SEALED_SENDER {
+  UNKNOWN = 0,
+  ENABLED = 1,
+  DISABLED = 2,
+  UNRESTRICTED = 3,
+}
diff --git a/ts/util/getProfile.ts b/ts/util/getProfile.ts
new file mode 100644
index 000000000000..7e91aea9db85
--- /dev/null
+++ b/ts/util/getProfile.ts
@@ -0,0 +1,269 @@
+// Copyright 2020-2021 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import { ProfileKeyCredentialRequestContext } from 'zkgroup';
+import { SEALED_SENDER } from '../types/SealedSender';
+import {
+  base64ToArrayBuffer,
+  stringFromBytes,
+  trimForDisplay,
+  verifyAccessKey,
+} from '../Crypto';
+import {
+  generateProfileKeyCredentialRequest,
+  getClientZkProfileOperations,
+  handleProfileKeyCredential,
+} from './zkgroup';
+import { getSendOptions } from './getSendOptions';
+import { isMe } from './whatTypeOfConversation';
+
+export async function getProfile(
+  providedUuid?: string,
+  providedE164?: string
+): Promise<void> {
+  if (!window.textsecure.messaging) {
+    throw new Error(
+      'Conversation.getProfile: window.textsecure.messaging not available'
+    );
+  }
+
+  const id = window.ConversationController.ensureContactIds({
+    uuid: providedUuid,
+    e164: providedE164,
+  });
+  const c = window.ConversationController.get(id);
+  if (!c) {
+    window.log.error('getProfile: failed to find conversation; doing nothing');
+    return;
+  }
+
+  const clientZkProfileCipher = getClientZkProfileOperations(
+    window.getServerPublicParams()
+  );
+
+  let profile;
+
+  try {
+    await Promise.all([
+      c.deriveAccessKeyIfNeeded(),
+      c.deriveProfileKeyVersionIfNeeded(),
+    ]);
+
+    const profileKey = c.get('profileKey');
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const uuid = c.get('uuid')!;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const identifier = c.getSendTarget()!;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const profileKeyVersionHex = c.get('profileKeyVersion')!;
+    const existingProfileKeyCredential = c.get('profileKeyCredential');
+
+    let profileKeyCredentialRequestHex: undefined | string;
+    let profileCredentialRequestContext:
+      | undefined
+      | ProfileKeyCredentialRequestContext;
+
+    if (
+      profileKey &&
+      uuid &&
+      profileKeyVersionHex &&
+      !existingProfileKeyCredential
+    ) {
+      window.log.info('Generating request...');
+      ({
+        requestHex: profileKeyCredentialRequestHex,
+        context: profileCredentialRequestContext,
+      } = generateProfileKeyCredentialRequest(
+        clientZkProfileCipher,
+        uuid,
+        profileKey
+      ));
+    }
+
+    const { sendMetadata = {} } = await getSendOptions(c.attributes);
+    const getInfo =
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      sendMetadata[c.get('uuid')!] || sendMetadata[c.get('e164')!] || {};
+
+    if (getInfo.accessKey) {
+      try {
+        profile = await window.textsecure.messaging.getProfile(identifier, {
+          accessKey: getInfo.accessKey,
+          profileKeyVersion: profileKeyVersionHex,
+          profileKeyCredentialRequest: profileKeyCredentialRequestHex,
+        });
+      } catch (error) {
+        if (error.code === 401 || error.code === 403) {
+          window.log.info(
+            `Setting sealedSender to DISABLED for conversation ${c.idForLogging()}`
+          );
+          c.set({ sealedSender: SEALED_SENDER.DISABLED });
+          profile = await window.textsecure.messaging.getProfile(identifier, {
+            profileKeyVersion: profileKeyVersionHex,
+            profileKeyCredentialRequest: profileKeyCredentialRequestHex,
+          });
+        } else {
+          throw error;
+        }
+      }
+    } else {
+      profile = await window.textsecure.messaging.getProfile(identifier, {
+        profileKeyVersion: profileKeyVersionHex,
+        profileKeyCredentialRequest: profileKeyCredentialRequestHex,
+      });
+    }
+
+    const identityKey = base64ToArrayBuffer(profile.identityKey);
+    const changed = await window.textsecure.storage.protocol.saveIdentity(
+      `${identifier}.1`,
+      identityKey,
+      false
+    );
+    if (changed) {
+      // save identity will close all sessions except for .1, so we
+      // must close that one manually.
+      await window.textsecure.storage.protocol.archiveSession(
+        `${identifier}.1`
+      );
+    }
+
+    const accessKey = c.get('accessKey');
+    if (profile.unrestrictedUnidentifiedAccess && profile.unidentifiedAccess) {
+      window.log.info(
+        `Setting sealedSender to UNRESTRICTED for conversation ${c.idForLogging()}`
+      );
+      c.set({
+        sealedSender: SEALED_SENDER.UNRESTRICTED,
+      });
+    } else if (accessKey && profile.unidentifiedAccess) {
+      const haveCorrectKey = await verifyAccessKey(
+        base64ToArrayBuffer(accessKey),
+        base64ToArrayBuffer(profile.unidentifiedAccess)
+      );
+
+      if (haveCorrectKey) {
+        window.log.info(
+          `Setting sealedSender to ENABLED for conversation ${c.idForLogging()}`
+        );
+        c.set({
+          sealedSender: SEALED_SENDER.ENABLED,
+        });
+      } else {
+        window.log.info(
+          `Setting sealedSender to DISABLED for conversation ${c.idForLogging()}`
+        );
+        c.set({
+          sealedSender: SEALED_SENDER.DISABLED,
+        });
+      }
+    } else {
+      window.log.info(
+        `Setting sealedSender to DISABLED for conversation ${c.idForLogging()}`
+      );
+      c.set({
+        sealedSender: SEALED_SENDER.DISABLED,
+      });
+    }
+
+    if (profile.about) {
+      const key = c.get('profileKey');
+      if (key) {
+        const keyBuffer = base64ToArrayBuffer(key);
+        const decrypted = await window.textsecure.crypto.decryptProfile(
+          base64ToArrayBuffer(profile.about),
+          keyBuffer
+        );
+        c.set('about', stringFromBytes(trimForDisplay(decrypted)));
+      }
+    } else {
+      c.unset('about');
+    }
+
+    if (profile.aboutEmoji) {
+      const key = c.get('profileKey');
+      if (key) {
+        const keyBuffer = base64ToArrayBuffer(key);
+        const decrypted = await window.textsecure.crypto.decryptProfile(
+          base64ToArrayBuffer(profile.aboutEmoji),
+          keyBuffer
+        );
+        c.set('aboutEmoji', stringFromBytes(trimForDisplay(decrypted)));
+      }
+    } else {
+      c.unset('aboutEmoji');
+    }
+
+    if (profile.paymentAddress && isMe(c.attributes)) {
+      window.storage.put('paymentAddress', profile.paymentAddress);
+    }
+
+    if (profile.capabilities) {
+      c.set({ capabilities: profile.capabilities });
+    } else {
+      c.unset('capabilities');
+    }
+
+    if (profileCredentialRequestContext) {
+      if (profile.credential) {
+        const profileKeyCredential = handleProfileKeyCredential(
+          clientZkProfileCipher,
+          profileCredentialRequestContext,
+          profile.credential
+        );
+        c.set({ profileKeyCredential });
+      } else {
+        c.unset('profileKeyCredential');
+      }
+    }
+  } catch (error) {
+    switch (error?.code) {
+      case 403:
+        throw error;
+      case 404:
+        window.log.warn(
+          `getProfile failure: failed to find a profile for ${c.idForLogging()}`,
+          error && error.stack ? error.stack : error
+        );
+        c.setUnregistered();
+        return;
+      default:
+        window.log.warn(
+          'getProfile failure:',
+          c.idForLogging(),
+          error && error.stack ? error.stack : error
+        );
+        return;
+    }
+  }
+
+  try {
+    await c.setEncryptedProfileName(profile.name);
+  } catch (error) {
+    window.log.warn(
+      'getProfile decryption failure:',
+      c.idForLogging(),
+      error && error.stack ? error.stack : error
+    );
+    await c.set({
+      profileName: undefined,
+      profileFamilyName: undefined,
+    });
+  }
+
+  try {
+    await c.setProfileAvatar(profile.avatar);
+  } catch (error) {
+    if (error.code === 403 || error.code === 404) {
+      window.log.info(
+        `Clearing profile avatar for conversation ${c.idForLogging()}`
+      );
+      c.set({
+        profileAvatar: null,
+      });
+    }
+  }
+
+  c.set('profileLastFetchedAt', Date.now());
+
+  window.Signal.Data.updateConversation(c.attributes);
+}
diff --git a/ts/views/conversation_view.ts b/ts/views/conversation_view.ts
index 71d4786adc65..7b3bc8606ab5 100644
--- a/ts/views/conversation_view.ts
+++ b/ts/views/conversation_view.ts
@@ -2412,7 +2412,7 @@ Whisper.ConversationView = Whisper.View.extend({
       conversation =>
         conversation?.get('announcementsOnly') && !conversation.areWeAdmin()
     );
-    if (!cannotSend) {
+    if (cannotSend) {
       throw new Error('Cannot send to group');
     }