Show Session Switchover Events

Co-authored-by: Scott Nonnenberg <scott@signal.org>

ts/models/conversations.ts

@@ -3032,6 +3032,59 @@ export class ConversationModel extends window.Backbone
     this.trigger('newmessage', model);
   }
 
+  async addPhoneNumberDiscoveryIfNeeded(originalPni: PniString): Promise<void> {
+    const logId = `addPhoneNumberDiscoveryIfNeeded(${this.idForLogging()}, ${originalPni})`;
+
+    const e164 = this.get('e164');
+
+    if (!e164) {
+      log.info(`${logId}: not adding, no e164`);
+      return;
+    }
+
+    const hadSession = await window.textsecure.storage.protocol.hasSessionWith(
+      originalPni
+    );
+
+    if (!hadSession) {
+      log.info(`${logId}: not adding, no PNI session`);
+      return;
+    }
+
+    log.info(`${logId}: adding notification`);
+    const timestamp = Date.now();
+    const message: MessageAttributesType = {
+      id: generateGuid(),
+      conversationId: this.id,
+      type: 'phone-number-discovery',
+      sent_at: timestamp,
+      timestamp,
+      received_at: incrementMessageCounter(),
+      received_at_ms: timestamp,
+      phoneNumberDiscovery: {
+        e164,
+      },
+      readStatus: ReadStatus.Read,
+      seenStatus: SeenStatus.Unseen,
+      schemaVersion: Message.VERSION_NEEDED_FOR_DISPLAY,
+    };
+
+    const id = await window.Signal.Data.saveMessage(message, {
+      ourAci: window.textsecure.storage.user.getCheckedAci(),
+      forceSave: true,
+    });
+    const model = window.MessageCache.__DEPRECATED$register(
+      id,
+      new window.Whisper.Message({
+        ...message,
+        id,
+      }),
+      'addPhoneNumberDiscoveryIfNeeded'
+    );
+
+    this.trigger('newmessage', model);
+  }
+
   async addVerifiedChange(
     verifiedChangeId: string,
     verified: boolean,

ts/models/messages.ts

@@ -98,6 +98,7 @@ import {
   isUnsupportedMessage,
   isVerifiedChange,
   isConversationMerge,
+  isPhoneNumberDiscovery,
 } from '../state/selectors/message';
 import type { ReactionAttributesType } from '../messageModifiers/Reactions';
 import { isInCall } from '../state/selectors/calling';
@@ -139,6 +140,7 @@ import { SeenStatus } from '../MessageSeenStatus';
 import { isNewReactionReplacingPrevious } from '../reactions/util';
 import { parseBoostBadgeListFromServer } from '../badges/parseBadgesFromServer';
 import type { StickerWithHydratedData } from '../types/Stickers';
+
 import {
   addToAttachmentDownloadQueue,
   shouldUseAttachmentDownloadQueue,
@@ -313,6 +315,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
       !isGroupV1Migration(attributes) &&
       !isGroupV2Change(attributes) &&
       !isKeyChange(attributes) &&
+      !isPhoneNumberDiscovery(attributes) &&
       !isProfileChange(attributes) &&
       !isUniversalTimerNotification(attributes) &&
       !isUnsupportedMessage(attributes) &&
@@ -643,6 +646,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
     const isUniversalTimerNotificationValue =
       isUniversalTimerNotification(attributes);
     const isConversationMergeValue = isConversationMerge(attributes);
+    const isPhoneNumberDiscoveryValue = isPhoneNumberDiscovery(attributes);
 
     const isPayment = messageHasPaymentEvent(attributes);
 
@@ -674,7 +678,8 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
       isKeyChangeValue ||
       isProfileChangeValue ||
       isUniversalTimerNotificationValue ||
-      isConversationMergeValue;
+      isConversationMergeValue ||
+      isPhoneNumberDiscoveryValue;
 
     return !hasSomethingToDisplay;
   }