Merge branch 'dev' into release

Author: goku-kamehameha

ios/Runner.xcodeproj/project.pbxproj

@@ -24,7 +24,7 @@
 		A0CABC282DEF33BC00154A44 /* Tun2SocksKitC in Frameworks */ = {isa = PBXBuildFile; productRef = A0CABC272DEF33BC00154A44 /* Tun2SocksKitC */; };
 		E640D9F7888558C3BD23A668 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = AE9BD0D6942BB307941DBA0D /* GoogleService-Info.plist */; };
 		F1D23AC02E83A529002FF2F6 /* IosDXcore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1D23ABF2E83A528002FF2F6 /* IosDXcore.xcframework */; };
-		F1D584A52E7B5D3B00076143 /* VpnPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1D584A42E7B5D3B00076143 /* VpnPlugin.swift */; };
+		F1D584A52E7B5D3B00076143 /* VPNPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1D584A42E7B5D3B00076143 /* VPNPlugin.swift */; };
 		FE197567FA0C370D7A74D3F4 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCDDE16F3C4844CAA5A11A52 /* Pods_RunnerTests.framework */; };
 /* End PBXBuildFile section */
 
@@ -100,7 +100,7 @@
 		DCDDE16F3C4844CAA5A11A52 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F126793C97B47EFB321481A7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		F1D23ABF2E83A528002FF2F6 /* IosDXcore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = IosDXcore.xcframework; sourceTree = "<group>"; };
-		F1D584A42E7B5D3B00076143 /* VpnPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VpnPlugin.swift; sourceTree = "<group>"; };
+		F1D584A42E7B5D3B00076143 /* VPNPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNPlugin.swift; sourceTree = "<group>"; };
 		F363D13D253BC7A752C07D84 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -234,7 +234,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
-				F1D584A42E7B5D3B00076143 /* VpnPlugin.swift */,
+				F1D584A42E7B5D3B00076143 /* VPNPlugin.swift */,
 				A0CABC202DEF335D00154A44 /* AppDelegate.swift */,
 				A0CABC1C2DEF334C00154A44 /* vpn_service.swift */,
 				A0FE506B2DEF106E0019DB1D /* Runner.entitlements */,
@@ -522,7 +522,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A0CABC212DEF335D00154A44 /* AppDelegate.swift in Sources */,
-				F1D584A52E7B5D3B00076143 /* VpnPlugin.swift in Sources */,
+				F1D584A52E7B5D3B00076143 /* VPNPlugin.swift in Sources */,
 				A0CABC1D2DEF334C00154A44 /* vpn_service.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 			);

lib/app/advertise_director.dart

@@ -2,6 +2,7 @@ import 'package:defyx_vpn/core/data/local/secure_storage/secure_storage.dart';
 import 'package:defyx_vpn/core/data/local/secure_storage/secure_storage_const.dart';
 import 'package:flutter_timezone/flutter_timezone.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter/foundation.dart';
 import 'dart:math';
 
 class AdvertiseDirector {
@@ -11,15 +12,22 @@ class AdvertiseDirector {
 
   static Future<bool> shouldUseInternalAds(WidgetRef ref) async {
     final String currentTimeZone = await FlutterTimezone.getLocalTimezone();
+    debugPrint('📍 Ad Manager - Current Timezone: $currentTimeZone');
 
     final adversies =
         await ref.read(secureStorageProvider).readMap(apiAvertiseKey);
 
     if (adversies['api_advertise'] != null) {
       final advertiseMap = adversies['api_advertise'] as Map<String, dynamic>;
-      return advertiseMap.containsKey(currentTimeZone);
+      final hasInternalAds = advertiseMap.containsKey(currentTimeZone);
+      debugPrint('📍 Ad Manager - Has internal ads for timezone: $hasInternalAds');
+      if (hasInternalAds) {
+        debugPrint('📍 Ad Manager - Available timezones: ${advertiseMap.keys.toList()}');
+      }
+      return hasInternalAds;
     }
 
+    debugPrint('📍 Ad Manager - No advertise data found');
     return false;
   }
 
@@ -35,6 +43,7 @@ class AdvertiseDirector {
 
   static Future<Map<String, String>> getRandomCustomAd(WidgetRef ref) async {
     final String currentTimeZone = await FlutterTimezone.getLocalTimezone();
+    debugPrint('📍 Ad Manager - Getting ad for timezone: $currentTimeZone');
 
     final adversies =
         await ref.read(secureStorageProvider).readMap(apiAvertiseKey);
@@ -43,21 +52,27 @@ class AdvertiseDirector {
       final advertiseMap = adversies['api_advertise'] as Map<String, dynamic>;
       if (advertiseMap.containsKey(currentTimeZone)) {
         final adsData = advertiseMap[currentTimeZone] as List<dynamic>;
+        debugPrint('📍 Ad Manager - Found ${adsData.length} ads for timezone');
         if (adsData.isNotEmpty) {
           final random = Random();
           final randomIndex = random.nextInt(adsData.length);
           final selectedAd = adsData[randomIndex] as List<dynamic>;
 
           if (selectedAd.length >= 2) {
+            debugPrint('📍 Ad Manager - Selected ad #$randomIndex');
             return {
               'imageUrl': selectedAd[0] as String,
               'clickUrl': selectedAd[1] as String,
             };
           }
         }
+      } else {
+        debugPrint('📍 Ad Manager - No ads for timezone: $currentTimeZone');
+        debugPrint('📍 Ad Manager - Available timezones: ${advertiseMap.keys.toList()}');
       }
     }
 
+    debugPrint('📍 Ad Manager - Returning empty ad');
     // Return empty map - UI will handle showing "No ads available"
     return {'imageUrl': '', 'clickUrl': ''};
   }

lib/app/app.dart

@@ -7,6 +7,7 @@ import 'package:defyx_vpn/core/theme/app_theme.dart';
 import 'package:defyx_vpn/modules/core/vpn.dart';
 import 'package:defyx_vpn/modules/core/desktop_platform_handler.dart';
 import 'package:defyx_vpn/modules/main/presentation/widgets/ump_service.dart';
+import 'package:defyx_vpn/shared/providers/language_provider.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -87,9 +88,11 @@ class App extends ConsumerWidget {
 
   Widget _buildApp(BuildContext context, WidgetRef ref) {
     final router = ref.watch(routerProvider);
-
+    final languageState = ref.watch(languageProvider);
     final designSize = _getDesignSize(context);
 
+    debugPrint('🌍 Building app with locale: ${languageState.language.locale}');
+
     return ToastificationWrapper(
         config: ToastificationConfig(
           maxToastLimit: 1,
@@ -109,8 +112,7 @@ class App extends ConsumerWidget {
               routerConfig: router,
               builder: _appBuilder,
               debugShowCheckedModeBanner: false,
-              // Force English locale (comment out to enable device language detection)
-              locale: const Locale('en'),
+              locale: languageState.language.locale,
               localizationsDelegates: const [
                 AppLocalizations.delegate,
                 GlobalMaterialLocalizations.delegate,
@@ -119,9 +121,7 @@ class App extends ConsumerWidget {
               ],
               supportedLocales: const [
                 Locale('en'),
-                Locale('fa'),
                 Locale('zh'),
-                Locale('ru'),
               ],
             );
           },