From e9f3f7f012b9bc1516713ca95513e731e4923f58 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Mon, 26 Jun 2023 21:02:27 +0700
Subject: [PATCH] TF-1963 Add catch error message in remote exception thrower

(cherry picked from commit e4ab29bf245eb24a536ea4c0436f4e51a13740d6)
---
 lib/main/exceptions/remote_exception_thrower.dart | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/main/exceptions/remote_exception_thrower.dart b/lib/main/exceptions/remote_exception_thrower.dart
index f275ad9b3..356cc7e69 100644
--- a/lib/main/exceptions/remote_exception_thrower.dart
+++ b/lib/main/exceptions/remote_exception_thrower.dart
@@ -36,9 +36,15 @@ class RemoteExceptionThrower extends ExceptionThrower {
             } else if (error.error is SocketException) {
               throw const SocketError();
             } else {
-              throw UnknownError(
-                code: error.response?.statusCode,
-                message: error.response?.statusMessage);
+              if (error.response != null) {
+                throw UnknownError(
+                  code: error.response!.statusCode,
+                  message: error.response!.statusMessage);
+              } else if (error.error != null) {
+                throw UnknownError(message: error.error!.toString());
+              } else {
+                throw const UnknownError();
+              }
             }
         }
       } else if (error is ErrorMethodResponseException) {