Merge remote-tracking branch 'origin/dev' into release

# Conflicts:
#	pubspec.yaml

Author: goku-kamehameha

lib/core/data/local/remote/api/flowline_service.dart

@@ -33,6 +33,7 @@ class FlowlineService implements IFlowlineService {
   Future<String> getCachedFlowLine() => _vpnBridge.getCachedFlowLine();
 
   @override
+
   Future<void> saveFlowline(bool offlineMode) async {
     final prefs = await SharedPreferences.getInstance();
     final lastFlowlineUpdate = prefs.getInt(lastFlowlineUpdateKey) ?? 0;

lib/modules/main/presentation/widgets/connection_state_widgets.dart

@@ -1,3 +1,4 @@
+import 'package:defyx_vpn/modules/settings/providers/settings_provider.dart';
 import 'package:defyx_vpn/shared/providers/group_provider.dart';
 import 'package:defyx_vpn/shared/services/animation_service.dart';
 import 'package:flutter/material.dart';
@@ -239,6 +240,22 @@ class AnalyzingContent extends ConsumerWidget {
     return Row(
       children: [
         Consumer(builder: (context, ref, child) {
+          final deepScanEnabled =
+              ref.read(settingsProvider.notifier).isDeepScanEnabled();
+          if (deepScanEnabled) {
+            return Container(
+                margin: const EdgeInsets.only(bottom: 3.0),
+                child: Text(
+                  "∞",
+                  style: TextStyle(
+                    color: const Color(0xFFA7A7A7),
+                    fontSize: 24.sp,
+                    fontFamily: 'Lato',
+                    fontWeight: FontWeight.w400,
+                  ),
+                ));
+          }
+
           final flowLineState = ref.watch(flowLineStepProvider);
           final currentStep = flowLineState.step;
           final totalSteps = flowLineState.totalSteps;

lib/modules/settings/providers/settings_provider.dart

@@ -48,6 +48,7 @@ class SettingsNotifier extends StateNotifier<SettingsState> {
   // ============== Initialization ==============
 
   Future<void> _initializeSettings() async {
+    await _loadSettingsFromStorage();  
     await _updateConnectionMethodFromFlowLine();
     _ensureStaticGroups();
     _isInitialized = true;
@@ -109,16 +110,20 @@ class SettingsNotifier extends StateNotifier<SettingsState> {
     final savedGroup = state.groups[SettingsGroupId.trafficControl];
 
     return SettingsFactory.createTrafficControlGroup(
-      splitTunnelEnabled: SettingsFactory.getSavedItemState(
-        savedGroup?.items,
-        SettingsItemId.splitTunnel,
-      ),
-      killSwitchEnabled: SettingsFactory.getSavedItemState(
-        savedGroup?.items,
-        SettingsItemId.killSwitch,
-      ),
-    );
+        splitTunnelEnabled: SettingsFactory.getSavedItemState(
+          savedGroup?.items,
+          SettingsItemId.splitTunnel,
+        ),
+        killSwitchEnabled: SettingsFactory.getSavedItemState(
+          savedGroup?.items,
+          SettingsItemId.killSwitch,
+        ),
+        deepScanEnabled: SettingsFactory.getSavedItemState(
+          savedGroup?.items,
+          SettingsItemId.deepScan,
+        ));
   }
+
   bool isDeepScanEnabled() {
     final savedGroup = state.groups[SettingsGroupId.trafficControl];
     return SettingsFactory.getSavedItemState(
@@ -225,9 +230,33 @@ class SettingsNotifier extends StateNotifier<SettingsState> {
     }
   }
 
+  Future<void> _loadSettingsFromStorage() async {
+    final jsonString =
+        await _secureStorage?.read(SettingsStorageKey.appSettings);
+
+    if (jsonString == null) return;
+
+    try {
+      final Map<String, dynamic> decoded = jsonDecode(jsonString);
+
+      final groups = decoded.map(
+        (key, value) => MapEntry(
+          key,
+          SettingsGroup.fromJson(value),
+        ),
+      );
+
+      state = state.copyWith(groups: groups);
+      debugPrint('Settings loaded from storage');
+    } catch (e) {
+      debugPrint('Failed to load settings: $e');
+    }
+  }
+
   // ============== Public Actions ==============
 
   void toggleSetting(String groupId, String itemId, [BuildContext? context]) {
+    print('Toggling setting: $groupId - $itemId');
     final group = state.groups[groupId];
     if (group == null) return;
 

lib/shared/global_vars.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 class GlobalVars {
-  static const String appBuildType = 'github';
+  static const String appBuildType = 'appStore';
 
   static String get appStore => dotenv.env['LINK_APP_STORE'] ?? '';
   static String get testFlight => dotenv.env['LINK_TEST_FLIGHT'] ?? '';

pubspec.yaml

@@ -1,7 +1,7 @@
 name: defyx_vpn
 description: "A new Vpn app"
 publish_to: "none"
-version: 3.8.2+234
+version: 3.8.3+235
 
 environment:
   sdk: ^3.5.3
@@ -100,7 +100,7 @@ msix_config:
   display_name: Defyx VPN
   publisher_display_name: UnboundTech UG
   identity_name: UnboundTechUG.6065AEC5A207
-  msix_version: 3.8.2.0
+  msix_version: 3.8.3.0
   publisher: "CN=62937938-2AE2-4C12-9ED8-4C418C0CADF2"
   logo_path: assets/images/logo.png
   capabilities: runFullTrust,internetClientServer,privateNetworkClientServer,unvirtualizedResources

windows/flutter/generated_plugin_registrant.cc

@@ -9,6 +9,7 @@
 #include <audioplayers_windows/audioplayers_windows_plugin.h>
 #include <battery_plus/battery_plus_windows_plugin.h>
 #include <connectivity_plus/connectivity_plus_windows_plugin.h>
+#include <firebase_core/firebase_core_plugin_c_api.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <flutter_timezone/flutter_timezone_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
@@ -20,6 +21,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("BatteryPlusWindowsPlugin"));
   ConnectivityPlusWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
+  FirebaseCorePluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
   FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
   FlutterTimezonePluginCApiRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -6,6 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   audioplayers_windows
   battery_plus
   connectivity_plus
+  firebase_core
   flutter_secure_storage_windows
   flutter_timezone
   url_launcher_windows