Update to the latest SignalService.proto

ts/messageModifiers/MessageRequests.ts

@@ -13,7 +13,6 @@ export type MessageRequestAttributesType = {
   groupV2Id?: string;
   removeFromMessageReceiverCache: () => unknown;
   threadAci?: AciString;
-  threadE164?: string;
   type: number;
 };
 
@@ -33,17 +32,6 @@ export function forConversation(
 
   const messageRequestValues = Array.from(messageRequests.values());
 
-  if (conversation.get('e164')) {
-    const syncByE164 = messageRequestValues.find(
-      item => item.threadE164 === conversation.get('e164')
-    );
-    if (syncByE164) {
-      log.info(`${logId}: Found early message request response for E164`);
-      remove(syncByE164);
-      return syncByE164;
-    }
-  }
-
   if (conversation.getServiceId()) {
     const syncByServiceId = messageRequestValues.find(
       item => item.threadAci === conversation.getServiceId()
@@ -74,9 +62,9 @@ export async function onResponse(
   sync: MessageRequestAttributesType
 ): Promise<void> {
   messageRequests.set(sync.envelopeId, sync);
-  const { threadE164, threadAci, groupV2Id } = sync;
+  const { threadAci, groupV2Id } = sync;
 
-  const logId = `MessageRequests.onResponse(groupv2(${groupV2Id}) ${threadAci} ${threadE164})`;
+  const logId = `MessageRequests.onResponse(groupv2(${groupV2Id}) ${threadAci}`;
 
   try {
     let conversation;
@@ -85,9 +73,8 @@ export async function onResponse(
     if (groupV2Id) {
       conversation = window.ConversationController.get(groupV2Id);
     }
-    if (!conversation && (threadE164 || threadAci)) {
+    if (!conversation && threadAci) {
       conversation = window.ConversationController.lookupOrCreate({
-        e164: threadE164,
         serviceId: threadAci,
         reason: logId,
       });

ts/messageModifiers/ViewOnceOpenSyncs.ts

@@ -12,7 +12,6 @@ import { MessageModel } from '../models/messages';
 
 export type ViewOnceOpenSyncAttributesType = {
   removeFromMessageReceiverCache: () => unknown;
-  source?: string;
   sourceAci: AciString;
   timestamp: number;
 };
@@ -46,15 +45,6 @@ export function forMessage(
     return syncBySourceServiceId;
   }
 
-  const syncBySource = viewOnceSyncValues.find(item => {
-    return item.source === message.source && item.timestamp === message.sent_at;
-  });
-  if (syncBySource) {
-    log.info(`${logId}: Found early view once open sync for message`);
-    remove(syncBySource);
-    return syncBySource;
-  }
-
   return null;
 }
 
@@ -69,23 +59,16 @@ export async function onSync(
     const messages = await DataReader.getMessagesBySentAt(sync.timestamp);
 
     const found = messages.find(item => {
-      const itemSourceAci = item.sourceServiceId;
-      const syncSourceAci = sync.sourceAci;
-      const itemSource = item.source;
-      const syncSource = sync.source;
+      const itemSource = item.sourceServiceId;
+      const syncSource = sync.sourceAci;
 
-      return Boolean(
-        (itemSourceAci && syncSourceAci && itemSourceAci === syncSourceAci) ||
-          (itemSource && syncSource && itemSource === syncSource)
-      );
+      return Boolean(itemSource && syncSource && itemSource === syncSource);
     });
 
-    const syncSource = sync.source;
     const syncSourceAci = sync.sourceAci;
     const syncTimestamp = sync.timestamp;
     const wasMessageFound = Boolean(found);
     log.info(`${logId} receive:`, {
-      syncSource,
       syncSourceAci,
       syncTimestamp,
       wasMessageFound,