From 2f90608e1b155bd91a46f69dae949972a9fe9407 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Tue, 4 Jan 2022 16:24:18 -0600
Subject: [PATCH] Improve "send anyway" experience when starting app

---
 ts/jobs/normalMessageSendJobQueue.ts |  3 ++-
 ts/models/conversations.ts           | 39 ++++++++++++++--------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/ts/jobs/normalMessageSendJobQueue.ts b/ts/jobs/normalMessageSendJobQueue.ts
index 3592e0b6f..3c8b2a02f 100644
--- a/ts/jobs/normalMessageSendJobQueue.ts
+++ b/ts/jobs/normalMessageSendJobQueue.ts
@@ -1,4 +1,4 @@
-// Copyright 2021 Signal Messenger, LLC
+// Copyright 2021-2022 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import type PQueue from 'p-queue';
@@ -156,6 +156,7 @@ export class NormalMessageSendJobQueue extends JobQueue<NormalMessageSendJobData
           messageId,
           untrustedConversationIds
         );
+        await markMessageFailed(message, messageSendErrors);
         return;
       }
 
diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 761d09dfe..8fb466d11 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Signal Messenger, LLC
+// Copyright 2020-2022 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 /* eslint-disable camelcase */
@@ -2513,10 +2513,10 @@ export class ConversationModel extends window.Backbone
     );
   }
 
-  async _setVerified(
+  private async _setVerified(
     verified: number,
     providedOptions?: VerificationOptions
-  ): Promise<boolean | void> {
+  ): Promise<void> {
     const options = providedOptions || {};
     window._.defaults(options, {
       viaStorageServiceSync: false,
@@ -2537,7 +2537,7 @@ export class ConversationModel extends window.Backbone
 
     const uuid = this.getUuid();
     const beginningVerified = this.get('verified');
-    let keyChange;
+    let keyChange = false;
     if (options.viaSyncMessage) {
       strictAssert(
         uuid,
@@ -2553,10 +2553,7 @@ export class ConversationModel extends window.Backbone
           options.key || undefined
         );
     } else if (uuid) {
-      keyChange = await window.textsecure.storage.protocol.setVerified(
-        uuid,
-        verified
-      );
+      await window.textsecure.storage.protocol.setVerified(uuid, verified);
     } else {
       log.warn(`_setVerified(${this.id}): no uuid to update protocol storage`);
     }
@@ -2572,17 +2569,21 @@ export class ConversationModel extends window.Backbone
       this.captureChange('verified');
     }
 
-    // Three situations result in a verification notice in the conversation:
-    //   1) The message came from an explicit verification in another client (not
-    //      a contact sync)
-    //   2) The verification value received by the contact sync is different
-    //      from what we have on record (and it's not a transition to UNVERIFIED)
-    //   3) Our local verification status is VERIFIED and it hasn't changed,
-    //      but the key did change (Key1/VERIFIED to Key2/VERIFIED - but we don't
-    //      want to show DEFAULT->DEFAULT or UNVERIFIED->UNVERIFIED)
+    const didSomethingChange = keyChange || beginningVerified !== verified;
+    const isExplicitUserAction =
+      !options.viaContactSync && !options.viaStorageServiceSync;
+    const shouldShowFromContactSync =
+      options.viaContactSync && verified !== UNVERIFIED;
     if (
-      !options.viaContactSync ||
-      (beginningVerified !== verified && verified !== UNVERIFIED) ||
+      // The message came from an explicit verification in a client (not a contact sync
+      //   or storage service sync)
+      (didSomethingChange && isExplicitUserAction) ||
+      // The verification value received by the contact sync is different from what we
+      //   have on record (and it's not a transition to UNVERIFIED)
+      (didSomethingChange && shouldShowFromContactSync) ||
+      // Our local verification status is VERIFIED and it hasn't changed, but the key did
+      //   change (Key1/VERIFIED -> Key2/VERIFIED), but we don't want to show DEFAULT ->
+      //   DEFAULT or UNVERIFIED -> UNVERIFIED
       (keyChange && verified === VERIFIED)
     ) {
       await this.addVerifiedChange(this.id, verified === VERIFIED, {
@@ -2592,8 +2593,6 @@ export class ConversationModel extends window.Backbone
     if (!options.viaSyncMessage && uuid) {
       await this.sendVerifySyncMessage(this.get('e164'), uuid, verified);
     }
-
-    return keyChange;
   }
 
   async sendVerifySyncMessage(