Merge branch 'charlesmchen/groupCreationErrors'

src/Messages/Interactions/TSErrorMessage.h

@@ -21,6 +21,7 @@ typedef NS_ENUM(int32_t, TSErrorMessageType) {
     TSErrorMessageInvalidVersion,
     TSErrorMessageNonBlockingIdentityChange,
     TSErrorMessageUnknownContactBlockOffer,
+    TSErrorMessageGroupCreationFailed,
 };
 
 - (instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER;

src/Messages/Interactions/TSErrorMessage.m

@@ -115,6 +115,9 @@ NSUInteger TSErrorMessageSchemaVersion = 1;
         case TSErrorMessageUnknownContactBlockOffer:
             return NSLocalizedString(@"UNKNOWN_CONTACT_BLOCK_OFFER",
                 @"Message shown in conversation view that offers to block an unknown user.");
+        case TSErrorMessageGroupCreationFailed:
+            return NSLocalizedString(@"GROUP_CREATION_FAILED",
+                @"Message shown in conversation view that indicates there were issues with group creation.");
         default:
             return NSLocalizedString(@"ERROR_MESSAGE_UNKNOWN_ERROR", @"");
             break;

src/Messages/OWSMessageSender.m

@@ -159,6 +159,7 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4;
 @property (nonatomic, readonly) void (^failureHandler)(NSError *_Nonnull error);
 @property (nonatomic) OWSSendMessageOperationState operationState;
 @property (nonatomic) UIBackgroundTaskIdentifier backgroundTaskIdentifier;
+@property (nonatomic) BOOL hasCompleted;
 
 @end
 
@@ -190,6 +191,13 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4;
             return;
         }
 
+        // Ensure we call the success or failure handler exactly once.
+        @synchronized(strongSelf)
+        {
+            OWSCAssert(!strongSelf.hasCompleted);
+            strongSelf.hasCompleted = YES;
+        }
+
         [message updateWithMessageState:TSOutgoingMessageStateSentToService];
 
         DDLogDebug(@"%@ succeeded.", strongSelf.tag);
@@ -204,6 +212,13 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4;
             return;
         }
 
+        // Ensure we call the success or failure handler exactly once.
+        @synchronized(strongSelf)
+        {
+            OWSCAssert(!strongSelf.hasCompleted);
+            strongSelf.hasCompleted = YES;
+        }
+
         [strongSelf.message updateWithSendingError:error];
 
         DDLogDebug(@"%@ failed with error: %@", strongSelf.tag, error);
@@ -281,9 +296,14 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4;
 {
     DDLogDebug(@"%@ remainingRetries: %lu", self.tag, (unsigned long)remainingRetries);
 
+    // Use this flag to ensure a given operation only succeeds or fails once.
+    __block BOOL onceFlag = NO;
     RetryableFailureHandler retryableFailureHandler = ^(NSError *_Nonnull error) {
         DDLogInfo(@"%@ Sending failed.", self.tag);
 
+        OWSAssert(!onceFlag);
+        onceFlag = YES;
+
         if (![error isRetryable] || [error isFatal]) {
             DDLogInfo(@"%@ Skipping retry due to terminal error: %@", self.tag, error);
             self.failureHandler(error);
@@ -299,7 +319,14 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4;
         }
     };
 
-    [self.messageSender attemptToSendMessage:self.message success:self.successHandler failure:retryableFailureHandler];
+    [self.messageSender attemptToSendMessage:self.message
+                                     success:^{
+                                         OWSAssert(!onceFlag);
+                                         onceFlag = YES;
+
+                                         self.successHandler();
+                                     }
+                                     failure:retryableFailureHandler];
 }
 
 - (void)markAsComplete
@@ -762,6 +789,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                         // retryable errors.
                         if ([error isFatal]) {
                             failureHandler(error);
+                            return;
                         }
 
                         if ([error isRetryable] && !firstRetryableError) {