Change defaults for conversation title generation

ts/model-types.d.ts

@@ -333,7 +333,7 @@ export type ConversationAttributesType = {
   messageRequestResponseType?: number;
   muteExpiresAt?: number;
   dontNotifyForMentionsIfMuted?: boolean;
-  notSharingPhoneNumber?: boolean;
+  sharingPhoneNumber?: boolean;
   profileAvatar?: ContactAvatarType | null;
   profileKeyCredential?: string | null;
   profileKeyCredentialExpiration?: number | null;

ts/models/conversations.ts

@@ -1859,7 +1859,7 @@ export class ConversationModel extends window.Backbone
     this.set('e164', e164 || undefined);
 
     // This user changed their phone number
-    if (oldValue && e164 && !this.get('notSharingPhoneNumber')) {
+    if (oldValue && e164 && this.get('sharingPhoneNumber')) {
       void this.addChangeNumberNotification(oldValue, e164);
     }
 

ts/services/profiles.ts

@@ -434,15 +434,15 @@ async function doGetProfile(c: ConversationModel): Promise<void> {
           decryptionKey
         );
 
-        // It should be one byte, but be conservative about it and only
-        // set `notSharingPhoneNumber` to `true` in all cases except [0x01].
+        // It should be one byte, but be conservative about it and
+        // set `sharingPhoneNumber` to `false` in all cases except [0x01].
         c.set(
-          'notSharingPhoneNumber',
-          decrypted.length !== 1 || decrypted[0] !== 1
+          'sharingPhoneNumber',
+          decrypted.length === 1 && decrypted[0] === 1
         );
       }
     } else {
-      c.unset('notSharingPhoneNumber');
+      c.unset('sharingPhoneNumber');
     }
 
     if (profile.paymentAddress && isMe(c.attributes)) {

ts/services/usernameIntegrity.ts

@@ -123,7 +123,7 @@ class UsernameIntegrityService {
 
     {
       const localValue = isSharingPhoneNumberWithEverybody();
-      const remoteValue = !me.get('notSharingPhoneNumber');
+      const remoteValue = me.get('sharingPhoneNumber') === true;
       if (localValue === remoteValue) {
         return;
       }
@@ -152,7 +152,7 @@ class UsernameIntegrityService {
 
     {
       const localValue = isSharingPhoneNumberWithEverybody();
-      const remoteValue = !me.get('notSharingPhoneNumber');
+      const remoteValue = me.get('sharingPhoneNumber') === true;
       if (localValue === remoteValue) {
         log.info(
           'usernameIntegrity: phone number sharing mode conflict resolved by ' +

ts/sql/migrations/990-phone-number-sharing.ts

@@ -0,0 +1,45 @@
+// Copyright 2024 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import type { Database } from '@signalapp/better-sqlite3';
+
+import type { LoggerType } from '../../types/Logging';
+
+export const version = 990;
+
+export function updateToSchemaVersion990(
+  currentVersion: number,
+  db: Database,
+  logger: LoggerType
+): void {
+  if (currentVersion >= 990) {
+    return;
+  }
+
+  db.transaction(() => {
+    db.exec(`
+      UPDATE conversations
+      SET json = json_remove(
+        json_insert(
+          json,
+          '$.sharingPhoneNumber',
+          iif(
+            json ->> '$.notSharingPhoneNumber',
+            -- We flip the value from false to true, and vice versa
+            json('false'),
+            json('true')
+          )
+        ),
+        '$.notSharingPhoneNumber'
+      )
+      -- Default value of '$.notSharingPhoneNumber' is true and
+      -- the default value of '$.sharingPhoneNumber' is false so we don't have
+      -- to do anything if the field wasn't present.
+      WHERE json ->> '$.notSharingPhoneNumber' IS NOT NULL;
+    `);
+  })();
+
+  db.pragma('user_version = 990');
+
+  logger.info('updateToSchemaVersion990: success!');
+}

ts/sql/migrations/index.ts

@@ -73,10 +73,11 @@ import { updateToSchemaVersion940 } from './940-fts5-revert';
 import { updateToSchemaVersion950 } from './950-fts5-secure-delete';
 import { updateToSchemaVersion960 } from './960-untag-pni';
 import { updateToSchemaVersion970 } from './970-fts5-optimize';
+import { updateToSchemaVersion980 } from './980-reaction-timestamp';
 import {
   version as MAX_VERSION,
-  updateToSchemaVersion980,
-} from './980-reaction-timestamp';
+  updateToSchemaVersion990,
+} from './990-phone-number-sharing';
 
 function updateToSchemaVersion1(
   currentVersion: number,
@@ -2017,6 +2018,7 @@ export const SCHEMA_VERSIONS = [
   updateToSchemaVersion960,
   updateToSchemaVersion970,
   updateToSchemaVersion980,
+  updateToSchemaVersion990,
 ];
 
 export class DBVersionFromFutureError extends Error {

ts/state/ducks/conversations.ts

@@ -308,7 +308,7 @@ export type ConversationType = ReadonlyDeep<
     typingContactIdTimestamps?: Record<string, number>;
     recentMediaItems?: ReadonlyArray<MediaItemType>;
     profileSharing?: boolean;
-    notSharingPhoneNumber?: boolean;
+    sharingPhoneNumber?: boolean;
 
     shouldShowDraft?: boolean;
     // Full information for re-hydrating composition area

ts/test-mock/pnp/accept_gv2_invite_test.ts

@@ -53,6 +53,7 @@ describe('pnp/accept gv2 invite', function (this: Mocha.Suite) {
       {
         identityState: Proto.ContactRecord.IdentityState.DEFAULT,
         whitelisted: true,
+        profileKey: undefined,
 
         serviceE164: unknownPniContact.device.number,
       },

ts/test-node/sql/migration_990_test.ts

@@ -0,0 +1,69 @@
+// Copyright 2023 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import { assert } from 'chai';
+import type { Database } from '@signalapp/better-sqlite3';
+import SQL from '@signalapp/better-sqlite3';
+
+import { updateToVersion, insertData, getTableData } from './helpers';
+
+describe('SQL/updateToSchemaVersion990', () => {
+  let db: Database;
+
+  beforeEach(() => {
+    db = new SQL(':memory:');
+    updateToVersion(db, 980);
+  });
+
+  afterEach(() => {
+    db.close();
+  });
+
+  it('should migrate conversations', () => {
+    insertData(db, 'conversations', [
+      {
+        id: 'no-prop',
+        json: {
+          keep: 'this',
+        },
+      },
+      {
+        id: 'false-prop',
+        json: {
+          keep: 'this',
+          notSharingPhoneNumber: false,
+        },
+      },
+      {
+        id: 'true-prop',
+        json: {
+          keep: 'this',
+          notSharingPhoneNumber: true,
+        },
+      },
+    ]);
+    updateToVersion(db, 990);
+    assert.deepStrictEqual(getTableData(db, 'conversations'), [
+      {
+        id: 'no-prop',
+        json: {
+          keep: 'this',
+        },
+      },
+      {
+        id: 'false-prop',
+        json: {
+          keep: 'this',
+          sharingPhoneNumber: true,
+        },
+      },
+      {
+        id: 'true-prop',
+        json: {
+          keep: 'this',
+          sharingPhoneNumber: false,
+        },
+      },
+    ]);
+  });
+});

ts/util/createIPCEvents.ts

@@ -247,12 +247,6 @@ export function createIPCEvents(
     setPhoneNumberSharingSetting: async (newValue: PhoneNumberSharingMode) => {
       const account = window.ConversationController.getOurConversationOrThrow();
 
-      // writeProfile fetches the latest profile first so do it before updating
-      // local data to prevent triggering a conflict.
-      await writeProfile(getConversation(account), {
-        keepAvatar: true,
-      });
-
       const promises = new Array<Promise<void>>();
       promises.push(window.storage.put('phoneNumberSharingMode', newValue));
       if (newValue === PhoneNumberSharingMode.Everybody) {
@@ -264,6 +258,12 @@ export function createIPCEvents(
       }
       account.captureChange('phoneNumberSharingMode');
       await Promise.all(promises);
+
+      // Write profile after updating storage so that the write has up-to-date
+      // information.
+      await writeProfile(getConversation(account), {
+        keepAvatar: true,
+      });
     },
 
     getHasStoriesDisabled: () =>

ts/util/getConversation.ts

@@ -211,7 +211,7 @@ export function getConversation(model: ConversationModel): ConversationType {
     profileName: getProfileName(attributes),
     profileSharing: attributes.profileSharing,
     profileLastUpdatedAt: attributes.profileLastUpdatedAt,
-    notSharingPhoneNumber: attributes.notSharingPhoneNumber,
+    sharingPhoneNumber: attributes.sharingPhoneNumber,
     publicParams: attributes.publicParams,
     secretParams: attributes.secretParams,
     shouldShowDraft,

ts/util/getE164.ts

@@ -13,12 +13,13 @@ export function getE164(
     | 'systemGivenName'
     | 'systemFamilyName'
     | 'e164'
-    | 'notSharingPhoneNumber'
+    | 'sharingPhoneNumber'
+    | 'profileKey'
   >
 ): string | undefined {
-  const { e164, notSharingPhoneNumber = false } = attributes;
+  const { e164, profileKey, sharingPhoneNumber } = attributes;
 
-  if (notSharingPhoneNumber && !isInSystemContacts(attributes)) {
+  if (!sharingPhoneNumber && profileKey && !isInSystemContacts(attributes)) {
     return undefined;
   }
 

ts/util/getTitle.ts

@@ -110,7 +110,7 @@ export function getSystemName(
 export function getNumber(
   attributes: Pick<
     ConversationAttributesType,
-    'e164' | 'type' | 'notSharingPhoneNumber'
+    'e164' | 'type' | 'sharingPhoneNumber' | 'profileKey'
   >
 ): string | undefined {
   if (!isDirectConversation(attributes)) {

ts/util/phoneNumberSharingMode.ts

@@ -16,7 +16,7 @@ export enum PhoneNumberSharingMode {
 
 export const parsePhoneNumberSharingMode = makeEnumParser(
   PhoneNumberSharingMode,
-  PhoneNumberSharingMode.Everybody
+  PhoneNumberSharingMode.Nobody
 );
 
 export const isSharingPhoneNumberWithEverybody = (): boolean => {