fix: remove reinitialization of SettingsModel

Author: abhinavs1920

lib/models/settings_model.dart

@@ -17,7 +17,7 @@ class SettingsModel {
     this.historyRetentionPeriod = HistoryRetentionPeriod.oneWeek,
     this.workspaceFolderPath,
     this.isSSLDisabled = false,
-    this.isProxyEnabled = false,
+    this.proxySettings = const ProxySettings(),
   });
 
   final bool isDark;
@@ -34,7 +34,7 @@ class SettingsModel {
   final bool isSSLDisabled;
 
   // Proxy settings
-  final bool isProxyEnabled;
+  final ProxySettings proxySettings;
 
   SettingsModel copyWith({
     bool? isDark,
@@ -49,7 +49,7 @@ class SettingsModel {
     HistoryRetentionPeriod? historyRetentionPeriod,
     String? workspaceFolderPath,
     bool? isSSLDisabled,
-    bool? isProxyEnabled,
+    ProxySettings? proxySettings,
   }) {
     return SettingsModel(
       isDark: isDark ?? this.isDark,
@@ -66,7 +66,7 @@ class SettingsModel {
           historyRetentionPeriod ?? this.historyRetentionPeriod,
       workspaceFolderPath: workspaceFolderPath ?? this.workspaceFolderPath,
       isSSLDisabled: isSSLDisabled ?? this.isSSLDisabled,
-      isProxyEnabled: isProxyEnabled ?? this.isProxyEnabled,
+      proxySettings: proxySettings ?? this.proxySettings,
     );
   }
 
@@ -86,7 +86,7 @@ class SettingsModel {
       historyRetentionPeriod: historyRetentionPeriod,
       workspaceFolderPath: workspaceFolderPath,
       isSSLDisabled: isSSLDisabled,
-      isProxyEnabled: isProxyEnabled,
+      proxySettings: proxySettings,
     );
   }
 
@@ -141,7 +141,6 @@ class SettingsModel {
     }
     final workspaceFolderPath = data["workspaceFolderPath"] as String?;
     final isSSLDisabled = data["isSSLDisabled"] as bool?;
-    final isProxyEnabled = data["isProxyEnabled"] as bool?;
 
     const sm = SettingsModel();
 
@@ -159,7 +158,7 @@ class SettingsModel {
           historyRetentionPeriod ?? HistoryRetentionPeriod.oneWeek,
       workspaceFolderPath: workspaceFolderPath,
       isSSLDisabled: isSSLDisabled,
-      isProxyEnabled: isProxyEnabled,
+      proxySettings: ProxySettings.fromJson(data["proxySettings"]),
     );
   }
 
@@ -179,7 +178,7 @@ class SettingsModel {
       "historyRetentionPeriod": historyRetentionPeriod.name,
       "workspaceFolderPath": workspaceFolderPath,
       "isSSLDisabled": isSSLDisabled,
-      "isProxyEnabled": isProxyEnabled,
+      "proxySettings": proxySettings,
     };
   }
 
@@ -205,7 +204,7 @@ class SettingsModel {
         other.historyRetentionPeriod == historyRetentionPeriod &&
         other.workspaceFolderPath == workspaceFolderPath &&
         other.isSSLDisabled == isSSLDisabled &&
-        other.isProxyEnabled == isProxyEnabled;
+        other.proxySettings == proxySettings;
   }
 
   @override
@@ -224,7 +223,7 @@ class SettingsModel {
       historyRetentionPeriod,
       workspaceFolderPath,
       isSSLDisabled,
-      isProxyEnabled,
+      proxySettings,
     );
   }
 }

lib/providers/collection_providers.dart

@@ -295,11 +295,7 @@ class CollectionStateNotifier
       substitutedHttpRequestModel,
       defaultUriScheme: defaultUriScheme,
       noSSL: noSSL,
-      isProxyEnabled: ref.read(settingsProvider).isProxyEnabled,
-      proxyHost: ref.read(settingsProvider).proxyHost,
-      proxyPort: ref.read(settingsProvider).proxyPort,
-      proxyUsername: ref.read(settingsProvider).proxyUsername,
-      proxyPassword: ref.read(settingsProvider).proxyPassword,
+      proxySettings: ref.read(settingsProvider).proxySettings,
     );
 
     late final RequestModel newRequestModel;

lib/providers/settings_providers.dart

@@ -33,15 +33,9 @@ class ThemeStateNotifier extends StateNotifier<SettingsModel> {
     HistoryRetentionPeriod? historyRetentionPeriod,
     String? workspaceFolderPath,
     bool? isSSLDisabled,
-    bool? isProxyEnabled,
-    String? proxyHost,
-    String? proxyPort,
-    String? proxyUsername,
-    String? proxyPassword,
-    bool? useSystemProxy,
-    String? proxyBypassRules,
+    ProxySettings? proxySettings,
   }) async {
-    state = SettingsModel(
+    state = state.copyWith(
       isDark: isDark ?? state.isDark,
       alwaysShowCollectionPaneScrollbar: alwaysShowCollectionPaneScrollbar ?? state.alwaysShowCollectionPaneScrollbar,
       size: size ?? state.size,
@@ -54,11 +48,7 @@ class ThemeStateNotifier extends StateNotifier<SettingsModel> {
       historyRetentionPeriod: historyRetentionPeriod ?? state.historyRetentionPeriod,
       workspaceFolderPath: workspaceFolderPath ?? state.workspaceFolderPath,
       isSSLDisabled: isSSLDisabled ?? state.isSSLDisabled,
-      isProxyEnabled: isProxyEnabled ?? state.isProxyEnabled,
-      proxyHost: proxyHost ?? state.proxyHost,
-      proxyPort: proxyPort ?? state.proxyPort,
-      proxyUsername: proxyUsername ?? state.proxyUsername,
-      proxyPassword: proxyPassword ?? state.proxyPassword,
+      proxySettings: proxySettings ?? state.proxySettings,
     );
     await setSettingsToSharedPrefs(state);
   }