From a30dd68b1b6a40df301797f5f89fe8c76cc8d6e2 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Wed, 8 Jun 2022 10:39:45 +0700
Subject: [PATCH] TF-624 Remove null-aware of instance
 WidgetsBinding/SchedulerBinding on flutter 3.0

---
 .../views/quick_search/quick_search_input_form.dart         | 6 +++---
 core/lib/utils/fps_manager.dart                             | 4 ++--
 lib/features/composer/presentation/composer_controller.dart | 2 +-
 .../authentication_client/authentication_client_web.dart    | 2 --
 .../presentation/mailbox_dashboard_view_web.dart            | 2 +-
 .../presentation/manage_account_dashboard_view.dart         | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/core/lib/presentation/views/quick_search/quick_search_input_form.dart b/core/lib/presentation/views/quick_search/quick_search_input_form.dart
index b5bff63a1..5eeb498e0 100644
--- a/core/lib/presentation/views/quick_search/quick_search_input_form.dart
+++ b/core/lib/presentation/views/quick_search/quick_search_input_form.dart
@@ -591,7 +591,7 @@ class _TypeAheadFieldQuickSearchState<T, R> extends State<TypeAheadFieldQuickSea
   void dispose() {
     this._suggestionsBox!.close();
     this._suggestionsBox!.widgetMounted = false;
-    WidgetsBinding.instance?.removeObserver(this);
+    WidgetsBinding.instance.removeObserver(this);
     _keyboardVisibilitySubscription?.cancel();
     _effectiveFocusNode!.removeListener(_focusNodeListener);
     _focusNode?.dispose();
@@ -604,7 +604,7 @@ class _TypeAheadFieldQuickSearchState<T, R> extends State<TypeAheadFieldQuickSea
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance?.addObserver(this);
+    WidgetsBinding.instance.addObserver(this);
 
     if (widget.textFieldConfiguration.controller == null) {
       this._textEditingController = TextEditingController();
@@ -643,7 +643,7 @@ class _TypeAheadFieldQuickSearchState<T, R> extends State<TypeAheadFieldQuickSea
           }
         });
 
-    WidgetsBinding.instance?.addPostFrameCallback((duration) {
+    WidgetsBinding.instance.addPostFrameCallback((duration) {
       if (mounted) {
         this._initOverlayEntry();
         // calculate initial suggestions list size
diff --git a/core/lib/utils/fps_manager.dart b/core/lib/utils/fps_manager.dart
index cf0378229..cdd2229f1 100644
--- a/core/lib/utils/fps_manager.dart
+++ b/core/lib/utils/fps_manager.dart
@@ -49,7 +49,7 @@ class FpsManager {
   void start() async {
     if (BuildUtils.isDebugMode || BuildUtils.isProfileMode) {
       if (!_started) {
-        SchedulerBinding.instance?.addTimingsCallback(_onTimingsCallback);
+        SchedulerBinding.instance.addTimingsCallback(_onTimingsCallback);
         _started = true;
       }
     }
@@ -58,7 +58,7 @@ class FpsManager {
   void stop() {
     if (BuildUtils.isDebugMode || BuildUtils.isProfileMode) {
       if (_started) {
-        SchedulerBinding.instance?.removeTimingsCallback(_onTimingsCallback);
+        SchedulerBinding.instance.removeTimingsCallback(_onTimingsCallback);
         _started = false;
       }
     }
diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index 075174379..298b967d4 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -144,7 +144,7 @@ class ComposerController extends BaseController {
   void onInit() {
     super.onInit();
     if (!BuildUtils.isWeb) {
-      WidgetsBinding.instance?.addPostFrameCallback((timeStamp) async {
+      WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
         await FkUserAgent.init();
       });
     }
diff --git a/lib/features/login/data/network/authentication_client/authentication_client_web.dart b/lib/features/login/data/network/authentication_client/authentication_client_web.dart
index afcab1e12..684380a3a 100644
--- a/lib/features/login/data/network/authentication_client/authentication_client_web.dart
+++ b/lib/features/login/data/network/authentication_client/authentication_client_web.dart
@@ -65,8 +65,6 @@ class AuthenticationClientWeb implements AuthenticationClientBase {
         grantType: 'refresh_token',
         scopes: scopes));
 
-    log('AuthenticationClientMobile::refreshingTokensOIDC(): refreshToken: ${tokenResponse?.accessToken}');
-
     if (tokenResponse != null) {
       final tokenOIDC = tokenResponse.toTokenOIDC();
       if (tokenOIDC.isTokenValid()) {
diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
index bcb989462..71fdf8eda 100644
--- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
+++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
@@ -28,7 +28,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
   Widget build(BuildContext context) {
     if (controller.isDrawerOpen && (responsiveUtils.isDesktop(context)
         || responsiveUtils.isTabletLarge(context))) {
-      WidgetsBinding.instance?.addPostFrameCallback((_) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
         controller.closeMailboxMenuDrawer();
       });
     }
diff --git a/lib/features/manage_account/presentation/manage_account_dashboard_view.dart b/lib/features/manage_account/presentation/manage_account_dashboard_view.dart
index cf9d247b7..ac568a6af 100644
--- a/lib/features/manage_account/presentation/manage_account_dashboard_view.dart
+++ b/lib/features/manage_account/presentation/manage_account_dashboard_view.dart
@@ -22,7 +22,7 @@ class ManageAccountDashBoardView extends GetWidget<ManageAccountDashBoardControl
   @override
   Widget build(BuildContext context) {
     if (controller.isMenuDrawerOpen && _responsiveUtils.isDesktop(context)) {
-      WidgetsBinding.instance?.addPostFrameCallback((_) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
         controller.closeMenuDrawer();
       });
     }