Bug Fix: Resend now function doesn't work on canceled upload file

element-hq/element-ios#890
matrix-org · Dec 26, 2016 · d2946d6 · d2946d6
1 parent 561ff62
commit d2946d6
Showing 1 changed file with 39 additions and 15 deletions.
diff --git a/MatrixSDK/Data/MXRoom.m b/MatrixSDK/Data/MXRoom.m
@@ -611,11 +611,19 @@ - (MXHTTPOperation*)sendImage:(NSData*)imageData
 
     void(^onFailure)(NSError *) = ^(NSError *error) {
 
-        // Update the local echo with the error state (This will trigger kMXEventDidChangeSentStateNotification notification).
-        event.sentState = MXEventSentStateFailed;
-
-        // Update the stored echo.
-        [self updateOutgoingMessage:event.eventId withOutgoingMessage:event];
+        // Remove outgoing message when its sent has been cancelled
+        if ([error.domain isEqualToString:NSURLErrorDomain] && error.code == NSURLErrorCancelled)
+        {
+            [self removeOutgoingMessage:event.eventId];
+        }
+        else
+        {
+            // Update the local echo with the error state (This will trigger kMXEventDidChangeSentStateNotification notification).
+            event.sentState = MXEventSentStateFailed;
+
+            // Update the stored echo.
+            [self updateOutgoingMessage:event.eventId withOutgoingMessage:event];
+        }
 
         if (uploaderObserver)
         {
@@ -772,11 +780,19 @@ - (MXHTTPOperation*)sendVideo:(NSURL*)videoLocalURL
 
     void(^onFailure)(NSError *) = ^(NSError *error) {
 
-        // Update the local echo with the error state (This will trigger kMXEventDidChangeSentStateNotification notification).
-        event.sentState = MXEventSentStateFailed;
-
-        // Update the stored echo.
-        [self updateOutgoingMessage:event.eventId withOutgoingMessage:event];
+        // Remove outgoing message when its sent has been cancelled
+        if ([error.domain isEqualToString:NSURLErrorDomain] && error.code == NSURLErrorCancelled)
+        {
+            [self removeOutgoingMessage:event.eventId];
+        }
+        else
+        {
+            // Update the local echo with the error state (This will trigger kMXEventDidChangeSentStateNotification notification).
+            event.sentState = MXEventSentStateFailed;
+
+            // Update the stored echo.
+            [self updateOutgoingMessage:event.eventId withOutgoingMessage:event];
+        }
 
         if (uploaderObserver)
         {
@@ -988,11 +1004,19 @@ - (MXHTTPOperation*)sendFile:(NSURL*)fileLocalURL
 
     void(^onFailure)(NSError *) = ^(NSError *error) {
 
-        // Update the local echo with the error state (This will trigger kMXEventDidChangeSentStateNotification notification).
-        event.sentState = MXEventSentStateFailed;
-
-        // Update the stored echo.
-        [self updateOutgoingMessage:event.eventId withOutgoingMessage:event];
+        // Remove outgoing message when its sent has been cancelled
+        if ([error.domain isEqualToString:NSURLErrorDomain] && error.code == NSURLErrorCancelled)
+        {
+            [self removeOutgoingMessage:event.eventId];
+        }
+        else
+        {
+            // Update the local echo with the error state (This will trigger kMXEventDidChangeSentStateNotification notification).
+            event.sentState = MXEventSentStateFailed;
+
+            // Update the stored echo.
+            [self updateOutgoingMessage:event.eventId withOutgoingMessage:event];
+        }
 
         if (uploaderObserver)
         {