From 86ca1ebda044362e7c1be6939d7dda6285af0853 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 21 Mar 2022 16:36:07 -0400
Subject: [PATCH] Add basic handling for ProofRequiredExceptions on other
 message types.

---
 .../securesms/jobs/GroupCallUpdateSendJob.java         |  1 +
 .../securesms/jobs/GroupSendJobHelper.java             | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java
index 15953f54b3..67b597efa2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java
@@ -21,6 +21,7 @@ import org.whispersystems.signalservice.api.crypto.ContentHint;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException;
 import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException;
 
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupSendJobHelper.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupSendJobHelper.java
index 8e3368bba2..86390b90a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupSendJobHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupSendJobHelper.java
@@ -36,8 +36,14 @@ final class GroupSendJobHelper {
         skipped.add(recipient.getId());
       }
 
-      if (sendMessageResult.getSuccess()         != null ||
-          sendMessageResult.getIdentityFailure() != null ||
+      if (sendMessageResult.getProofRequiredFailure() != null) {
+        Log.w(TAG, "Proof required failure for " + recipient.getId());
+        skipped.add(recipient.getId());
+      }
+
+      if (sendMessageResult.getSuccess()               != null ||
+          sendMessageResult.getIdentityFailure()       != null ||
+          sendMessageResult.getProofRequiredFailure()  != null ||
           sendMessageResult.isUnregisteredFailure())
       {
         completions.add(recipient);