From 0ae860e78928966bd8b71084fbe1b22ff363e522 Mon Sep 17 00:00:00 2001
From: Dat PHAM HOANG <dphamhoang@linagora.com>
Date: Thu, 9 Mar 2023 15:20:20 +0700
Subject: [PATCH] Fix build error

---
 lib/features/base/base_controller.dart                  | 4 ++--
 lib/features/base/reloadable/reloadable_controller.dart | 8 --------
 lib/features/thread/presentation/thread_controller.dart | 2 +-
 prebuild.sh                                             | 2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/features/base/base_controller.dart b/lib/features/base/base_controller.dart
index c60759463..dc400f21c 100644
--- a/lib/features/base/base_controller.dart
+++ b/lib/features/base/base_controller.dart
@@ -122,8 +122,8 @@ abstract class BaseController extends GetxController
           log('BaseController::onData(): $success');
           _getSubscriptionLocalAction();
         } else if (success is GetFCMSubscriptionLocalSuccess) {
-          final _subscriptionId = success.fcmSubscription.subscriptionId;
-          _destroySubscriptionAction(_subscriptionId);
+          final subscriptionId = success.fcmSubscription.subscriptionId;
+          _destroySubscriptionAction(subscriptionId);
         } else if (success is DestroySubscriptionSuccess) {
           checkAuthenticationTypeWhenLogout();
         }
diff --git a/lib/features/base/reloadable/reloadable_controller.dart b/lib/features/base/reloadable/reloadable_controller.dart
index 0f5d39521..2fe7cb5ba 100644
--- a/lib/features/base/reloadable/reloadable_controller.dart
+++ b/lib/features/base/reloadable/reloadable_controller.dart
@@ -55,14 +55,6 @@ abstract class ReloadableController extends BaseController {
           _handleGetSessionSuccess(success);
         } else if (success is GetStoredTokenOidcSuccess) {
           _handleGetStoredTokenOIDCSuccess(success);
-<<<<<<< HEAD
-        } else if (success is GetFCMSubscriptionLocalSuccess) {
-          final subscriptionId = success.fcmSubscription.subscriptionId;
-          _destroySubscriptionAction(subscriptionId);
-        } else if (success is DestroySubscriptionSuccess) {
-          _checkAuthenticationTypeWhenLogout();
-=======
->>>>>>> d49ace46 (Move logout logic to BaseController to handle logout when BadCredentials for all cases)
         }
       }
     );
diff --git a/lib/features/thread/presentation/thread_controller.dart b/lib/features/thread/presentation/thread_controller.dart
index 99f1a276a..9344f276c 100644
--- a/lib/features/thread/presentation/thread_controller.dart
+++ b/lib/features/thread/presentation/thread_controller.dart
@@ -337,7 +337,7 @@ class ThreadController extends BaseController with EmailActionController {
   void _handleErrorGetAllOrRefreshChangesEmail(dynamic error) async {
     logError('ThreadController::_handleErrorGetAllOrRefreshChangesEmail():Error: $error');
     if (error is CannotCalculateChangesMethodResponseException) {
-      await _cachingManager.clearEmailCache();
+      await cachingManager.clearEmailCache();
       _getAllEmailAction();
     } else {
       super.onError(error);
diff --git a/prebuild.sh b/prebuild.sh
index ee26aa519..a9bb162c3 100644
--- a/prebuild.sh
+++ b/prebuild.sh
@@ -5,7 +5,7 @@ set -e
 set -x
 
 cd core
-flutter pub get
+#flutter pub get
 
 ## Install necessary pods
 #cd ../ios