From 1b14e7f2234e0ad407fd7b791d711d9c1dc1b5ac Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Fri, 3 Dec 2021 14:51:11 +0100
Subject: [PATCH] fix(llc): fix retry queue mechanism

---
 .../lib/src/client/retry_queue.dart           | 35 +++++++++----------
 .../lib/src/message_widget.dart               |  4 +--
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/retry_queue.dart b/packages/stream_chat/lib/src/client/retry_queue.dart
index c441b5fb..f00f12ed 100644
--- a/packages/stream_chat/lib/src/client/retry_queue.dart
+++ b/packages/stream_chat/lib/src/client/retry_queue.dart
@@ -71,14 +71,15 @@ class RetryQueue {
   /// Add a list of messages
   void add(List<Message> messages) {
     if (messages.isEmpty) return;
-    if (_messageQueue.containsAllMessage(messages)) return;
+    if (!_messageQueue.containsAllMessage(messages)) {
+      logger?.info('Adding ${messages.length} messages');
+      final messageList = _messageQueue.toList();
+      // we should not add message if already available in the queue
+      _messageQueue.addAll(messages.where(
+        (it) => !messageList.any((m) => m.id == it.id),
+      ));
+    }
 
-    logger?.info('Adding ${messages.length} messages');
-    final messageList = _messageQueue.toList();
-    // we should not add message if already available in the queue
-    _messageQueue.addAll(messages.where(
-      (it) => !messageList.any((m) => m.id == it.id),
-    ));
     _startRetrying();
   }
 
@@ -87,9 +88,9 @@ class RetryQueue {
     _isRetrying = true;
 
     logger?.info('Started retrying failed messages');
-    while (_messageQueue.isNotEmpty) {
+    for (var i = 0; i < _messageQueue.length; ++i) {
       logger?.info('${_messageQueue.length} messages remaining in the queue');
-      final message = _messageQueue.first;
+      final message = _messageQueue.toList()[i];
       await _runAndRetry(message);
     }
     _isRetrying = false;
@@ -109,8 +110,12 @@ class RetryQueue {
         await _retryMessage(message);
         logger?.info('Message (${message.id}) sent successfully');
         _messageQueue.removeMessage(message);
-        break;
-      } on StreamChatError catch (e) {
+        return;
+      } catch (e) {
+        if (e is! StreamChatNetworkError || !e.isRetriable) {
+          _messageQueue.removeMessage(message);
+          return;
+        }
         // retry logic
         final maxAttempt = _retryPolicy.maxRetryAttempts;
         if (attempt < maxAttempt) {
@@ -143,14 +148,6 @@ class RetryQueue {
           _sendFailedEvent(message);
           break;
         }
-      } catch (e) {
-        logger?.info(
-          'API call failed due to unknown error (attempt $attempt). '
-          'Giving up for now, will retry when connection recovers. '
-          'Error was $e',
-        );
-        _sendFailedEvent(message);
-        break;
       }
     }
   }
diff --git a/packages/stream_chat_flutter/lib/src/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget.dart
index 6182df54..4010b11b 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget.dart
@@ -832,8 +832,8 @@ class _MessageWidgetState extends State<MessageWidget>
                         ),
                       if (isFailedState)
                         Positioned(
-                          left: widget.reverse ? 0 : null,
-                          right: widget.reverse ? null : 0,
+                          right: widget.reverse ? 0 : null,
+                          left: widget.reverse ? null : 0,
                           bottom: showBottomRow ? 18 : -2,
                           child: StreamSvgIcon.error(size: 20),
                         ),