From 37af353cdaca5dd4322f53c46942f200dd79c0b0 Mon Sep 17 00:00:00 2001
From: Juan Gilsanz Polo <juangilsanz@gmail.com>
Date: Sat, 15 Apr 2023 02:19:33 +0200
Subject: [PATCH] Small fixes

---
 lib/screens/clients/added_list.dart     |  2 +-
 lib/screens/clients/client_screen.dart  | 20 +++++++++++++-------
 lib/screens/clients/search_clients.dart |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/screens/clients/added_list.dart b/lib/screens/clients/added_list.dart
index dc9c974..922d2de 100644
--- a/lib/screens/clients/added_list.dart
+++ b/lib/screens/clients/added_list.dart
@@ -274,7 +274,7 @@ class _AddedListState extends State<AddedList> {
                     referenceVersion: 'v0.107.28',
                     referenceVersionBeta: 'v0.108.0-b.33'
                   ) == true 
-                    ? widget.data[index].safeSearch!.enabled == true 
+                    ? widget.data[index].safeSearch != null && widget.data[index].safeSearch!.enabled == true 
                       ? appConfigProvider.useThemeColorForStatus == true
                         ? Theme.of(context).colorScheme.primary
                         : Colors.green
diff --git a/lib/screens/clients/client_screen.dart b/lib/screens/clients/client_screen.dart
index e9093a7..461ba42 100644
--- a/lib/screens/clients/client_screen.dart
+++ b/lib/screens/clients/client_screen.dart
@@ -54,7 +54,9 @@ class _ClientScreenState extends State<ClientScreen> {
   bool? enableSafeBrowsing;
   bool? enableParentalControl;
   bool? enableSafeSearch;
-  SafeSearch safeSearch = SafeSearch(
+  SafeSearch? safeSearch;
+
+  final SafeSearch defaultSafeSearch = SafeSearch(
     enabled: false,
     bing: false,
     duckduckgo: false,
@@ -109,7 +111,7 @@ class _ClientScreenState extends State<ClientScreen> {
       enableParentalControl = widget.client!.parentalEnabled;
       enableSafeBrowsing = widget.client!.safebrowsingEnabled;
       if (version == true) {
-        safeSearch = widget.client!.safeSearch!;
+        safeSearch = widget.client!.safeSearch;
       }
       else {
         enableSafeSearch = widget.client!.safesearchEnabled ?? false;
@@ -175,7 +177,7 @@ class _ClientScreenState extends State<ClientScreen> {
           enableSafeBrowsing = false;
           enableParentalControl = false;
           enableSafeSearch = false;
-          safeSearch.enabled = false;
+          safeSearch = defaultSafeSearch;
         });
       }
       else if (useGlobalSettingsFiltering == false) {
@@ -186,7 +188,7 @@ class _ClientScreenState extends State<ClientScreen> {
           enableSafeBrowsing = null;
           enableParentalControl = null;
           enableSafeSearch = null;
-          safeSearch.enabled = false;
+          safeSearch = null;
         });
       }
     }
@@ -242,7 +244,7 @@ class _ClientScreenState extends State<ClientScreen> {
       showDialog(
         context: context, 
         builder: (context) => SafeSearchModal(
-          safeSearch: safeSearch, 
+          safeSearch: safeSearch ?? defaultSafeSearch, 
           disabled: !editMode,
           onConfirm: (s) => setState(() => safeSearch = s)
         )
@@ -554,10 +556,14 @@ class _ClientScreenState extends State<ClientScreen> {
               padding: const EdgeInsets.only(right: 16),
               child: Icon(
                 Icons.chevron_right_rounded,
-                color: Theme.of(context).colorScheme.onSurfaceVariant,
+                color: useGlobalSettingsFiltering == true
+                  ? Colors.grey
+                  : Theme.of(context).colorScheme.onSurfaceVariant,
               ),
             ),
-            onTap: openSafeSearchModal,
+            onTap: useGlobalSettingsFiltering == false
+              ? () => openSafeSearchModal()
+              : null,
           ),
           if (
             serverVersionIsAhead(
diff --git a/lib/screens/clients/search_clients.dart b/lib/screens/clients/search_clients.dart
index 32fc0b4..ce5d2bf 100644
--- a/lib/screens/clients/search_clients.dart
+++ b/lib/screens/clients/search_clients.dart
@@ -344,7 +344,7 @@ class _SearchClientsWidgetState extends State<SearchClientsWidget> {
                                 referenceVersion: 'v0.107.28',
                                 referenceVersionBeta: 'v0.108.0-b.33'
                               ) == true 
-                                ? clientsScreen[index].safeSearch!.enabled == true 
+                                ? clientsScreen[index].safeSearch != null && clientsScreen[index].safeSearch!.enabled == true 
                                   ? appConfigProvider.useThemeColorForStatus == true
                                     ? Theme.of(context).colorScheme.primary
                                     : Colors.green