Add Local Subscription

code3-dev · code3-dev · commit 2969b333f228 · 2025-10-01T11:38:55.000+03:30
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -42,8 +42,8 @@ android {
         applicationId = "com.cloud.pira"
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
-        versionCode = 38
-        versionName = "3.6.0"
+        versionCode = 39
+        versionName = "3.6.5"
 
         manifestPlaceholders.put("io.flutter.embedding.android.EnableImpeller", "false")
     }
diff --git a/assets/languages/ar.json b/assets/languages/ar.json
@@ -486,6 +486,7 @@
     "supports": "يدعم vless:// و vmess:// و ss:// وغيرها",
     "unique_name_for_sub": "أدخل اسمًا فريدًا للاشتراك الخاص بك",
     "url_with_configs": "أدخل الرابط الذي يحتوي على تكوينات V2Ray",
+    "import_from_file": "اختر ملف",
     "ago": "مضت",
     "reset_default_url": "إعادة تعيين الرابط",
     "reset_default_url_title": "إعادة تعيين رابط الاشتراك الافتراضي",
diff --git a/assets/languages/en.json b/assets/languages/en.json
@@ -484,6 +484,7 @@
         "steps": "Steps:",
         "unique_name_step": "1. Give your subscription a unique name",
         "url_with_configs": "2. Enter a URL that contains V2Ray configurations",
+        "import_from_file": "Select file",
         "got_it": "Got it",
         "no_subscriptions": "No subscriptions added yet",
         "last_updated": "Last updated: ",
diff --git a/assets/languages/es.json b/assets/languages/es.json
@@ -464,6 +464,7 @@
     "steps": "Pasos:",
     "unique_name_step": "1. Asigne un nombre único a su suscripción",
     "url_with_configs": "2. Ingrese una URL que contenga configuraciones V2Ray",
+    "import_from_file": "Seleccionar archivo",
     "got_it": "Entendido",
     "no_subscriptions": "Aún no se han agregado suscripciones",
     "last_updated": "Última actualización: ",
diff --git a/assets/languages/fa.json b/assets/languages/fa.json
@@ -464,6 +464,7 @@
         "steps": "مراحل:",
         "unique_name_step": "1. برای اشتراک خود نامی منحصر به فرد انتخاب کنید",
         "url_with_configs": "2. لینکی وارد کنید که شامل پیکربندی‌های V2Ray باشد",
+        "import_from_file": "انتخاب فایل",
         "got_it": "متوجه شدم",
         "no_subscriptions": "هنوز اشتراکی اضافه نشده است",
         "last_updated": "آخرین به‌روزرسانی: ",
@@ -489,7 +490,7 @@
         "title": "تنظیمات VPN",
         "save": "ذخیره تنظیمات",
         "bypass_subnets": "زیرشبکه‌های دور زدن",
-        "bypass_subnets_desc": "آدرس‌های زیرشبکه را وارد کنید (یکی در هر خط) که باید از VPN عبور کنند",
+        "bypass_subnets_desc": "آدرس‌های زیرشبکه را وارد کنید (یکی در هر خط) که نباید از VPN عبور کنند",
         "bypass_subnets_hint": "آدرس‌های زیرشبکه را وارد کنید...",
         "reset_default": "بازنشانی به پیش‌فرض",
         "clear_all": "پاک کردن همه",
@@ -513,4 +514,4 @@
     "ircf": {
         "channel": "IRCF"
     }
-}
+}
diff --git a/assets/languages/fr.json b/assets/languages/fr.json
@@ -464,6 +464,7 @@
     "steps": "Étapes :",
     "unique_name_step": "1. Donnez un nom unique à votre abonnement",
     "url_with_configs": "2. Entrez une URL contenant des configurations V2Ray",
+    "import_from_file": "Sélectionner un fichier",
     "got_it": "Compris",
     "no_subscriptions": "Aucun abonnement ajouté pour le moment",
     "last_updated": "Dernière mise à jour : ",
@@ -513,4 +514,4 @@
   "ircf": {
     "channel": "IRCF"
   }
-}
+}
diff --git a/assets/languages/ru.json b/assets/languages/ru.json
@@ -464,6 +464,7 @@
     "steps": "Шаги:",
     "unique_name_step": "1. Дайте вашей подписке уникальное название",
     "url_with_configs": "2. Введите URL, содержащий конфигурации V2Ray",
+    "import_from_file": "Выбрать файл",
     "got_it": "Понятно",
     "no_subscriptions": "Пока не добавлено ни одной подписки",
     "last_updated": "Последнее обновление: ",
diff --git a/assets/languages/tr.json b/assets/languages/tr.json
@@ -484,6 +484,7 @@
         "steps": "Adımlar:",
         "unique_name_step": "1. Aboneliğinize benzersiz bir ad verin",
         "url_with_configs": "2. V2Ray yapılandırmaları içeren bir URL girin",
+        "import_from_file": "Dosya seç",
         "got_it": "Anladım",
         "no_subscriptions": "Henüz abonelik eklenmedi",
         "last_updated": "Son güncelleme: ",
diff --git a/assets/languages/zh.json b/assets/languages/zh.json
@@ -464,6 +464,7 @@
     "steps": "步骤：",
     "unique_name_step": "1. 为您的订阅指定一个唯一名称",
     "url_with_configs": "2. 输入包含V2Ray配置的URL",
+    "import_from_file": "选择文件",
     "got_it": "知道了",
     "no_subscriptions": "尚未添加订阅",
     "last_updated": "最后更新：",
diff --git a/lib/models/app_update.dart b/lib/models/app_update.dart
@@ -6,7 +6,7 @@ class AppUpdate {
   final String messText;
 
   // Current app version - manually set
-  static const String currentAppVersion = '3.6.0';
+  static const String currentAppVersion = '3.6.5';
 
   AppUpdate({required this.version, required this.url, required this.messText});
 
diff --git a/lib/providers/v2ray_provider.dart b/lib/providers/v2ray_provider.dart
@@ -361,6 +361,27 @@ class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
     }
   }
 
+  Future<List<V2RayConfig>> importConfigsFromText(String configText) async {
+    try {
+      // Parse multiple configurations from text (similar to subscription parsing)
+      final configs = await _v2rayService.parseSubscriptionContent(configText);
+      
+      if (configs.isEmpty) {
+        throw Exception('No valid configurations found');
+      }
+
+      // Add all configs to the list
+      for (var config in configs) {
+        await addConfig(config);
+      }
+
+      return configs;
+    } catch (e) {
+      _setError('Failed to import configurations: $e');
+      return [];
+    }
+  }
+
   @override
   void dispose() {
     WidgetsBinding.instance.removeObserver(this);
@@ -926,4 +947,50 @@ class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
       // Don't change connection state on errors
     }
   }
+
+  Future<List<V2RayConfig>> parseSubscriptionContent(String content) async {
+    return await _v2rayService.parseSubscriptionContent(content);
+  }
+
+  Future<void> addSubscriptionFromFile(String name, List<V2RayConfig> configs) async {
+    _setLoading(true);
+    _errorMessage = '';
+    try {
+      // Add configs and display them immediately
+      _configs.addAll(configs);
+
+      final newConfigIds = configs.map((c) => c.id).toList();
+
+      // Create subscription with a special indicator for file-based subscriptions
+      final subscription = Subscription(
+        id: DateTime.now().millisecondsSinceEpoch.toString(),
+        name: name,
+        url: 'file://subscription', // Special indicator for file-based subscriptions
+        lastUpdated: DateTime.now(),
+        configIds: newConfigIds,
+      );
+
+      _subscriptions.add(subscription);
+
+      // Save both configs and subscription
+      await _v2rayService.saveConfigs(_configs);
+      await _v2rayService.saveSubscriptions(_subscriptions);
+
+      // Update UI after everything is saved
+      notifyListeners();
+    } catch (e) {
+      String errorMsg = 'Failed to add subscription from file';
+
+      // Provide more specific error messages
+      if (e.toString().contains('No valid servers')) {
+        errorMsg = 'No valid servers found in file';
+      } else {
+        errorMsg = 'Failed to add subscription from file: ${e.toString()}';
+      }
+
+      _setError(errorMsg);
+    } finally {
+      _setLoading(false);
+    }
+  }
 }
diff --git a/lib/screens/about_screen.dart b/lib/screens/about_screen.dart
@@ -64,7 +64,7 @@ class AboutScreen extends StatelessWidget {
             Text(
               context.tr(
                 TranslationKeys.aboutVersion,
-                parameters: {'version': '3.6.0'},
+                parameters: {'version': '3.6.5'},
               ),
               style: const TextStyle(fontSize: 16, color: Colors.grey),
             ),
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
@@ -158,7 +158,16 @@ class _HomeScreenState extends State<HomeScreen> {
 
     try {
       final startTime = DateTime.now();
-      final response = await http.get(Uri.parse('https://www.google.com'));
+      final response = await http
+          .get(Uri.parse('https://www.google.com'))
+          .timeout(
+            const Duration(seconds: 60),
+            onTimeout: () {
+              throw Exception(
+                'Network timeout: Check your internet connection',
+              );
+            },
+          );
       final endTime = DateTime.now();
       final duration = endTime.difference(startTime);
 
diff --git a/lib/screens/host_checker_screen.dart b/lib/screens/host_checker_screen.dart
@@ -294,7 +294,11 @@ class _HostCheckerScreenState extends State<HostCheckerScreen> {
           children: [
             Row(
               children: [
-                const Icon(Icons.timer, color: AppTheme.connectedGreen, size: 20),
+                const Icon(
+                  Icons.timer,
+                  color: AppTheme.connectedGreen,
+                  size: 20,
+                ),
                 const SizedBox(width: 8),
                 Text(
                   context.tr(TranslationKeys.hostCheckerTimeoutSettings),
@@ -591,10 +595,6 @@ class _HostCheckerScreenState extends State<HostCheckerScreen> {
               context.tr(TranslationKeys.hostCheckerUrl),
               _urlController.text,
             ),
-            _buildInfoRow(
-              context.tr(TranslationKeys.hostCheckerTimeoutUsed),
-              '${timeoutUsed}s',
-            ),
             if (contentLength != null && contentLength > 0)
               _buildInfoRow(
                 context.tr(TranslationKeys.hostCheckerContentLength),
diff --git a/lib/screens/ip_info_screen.dart b/lib/screens/ip_info_screen.dart
@@ -60,7 +60,16 @@ class _IpInfoScreenState extends State<IpInfoScreen> {
 
   Future<Map<String, dynamic>> _fetchFullIpDetails() async {
     try {
-      final response = await http.get(Uri.parse('https://ipleak.net/json/'));
+      final response = await http
+          .get(Uri.parse('https://ipleak.net/json/'))
+          .timeout(
+            const Duration(seconds: 60),
+            onTimeout: () {
+              throw Exception(
+                'Network timeout: Check your internet connection',
+              );
+            },
+          );
 
       if (response.statusCode == 200) {
         return jsonDecode(response.body);
diff --git a/lib/screens/server_selection_screen.dart b/lib/screens/server_selection_screen.dart
@@ -85,6 +85,55 @@ class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
     }
   }
 
+  Future<void> _importMultipleFromClipboard() async {
+    try {
+      final clipboardData = await Clipboard.getData(Clipboard.kTextPlain);
+      if (clipboardData == null ||
+          clipboardData.text == null ||
+          clipboardData.text!.isEmpty) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              context.tr(TranslationKeys.serverSelectionClipboardEmpty),
+            ),
+          ),
+        );
+        return;
+      }
+
+      final provider = Provider.of<V2RayProvider>(context, listen: false);
+      final configs = await provider.importConfigsFromText(clipboardData.text!);
+
+      if (configs.isNotEmpty) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              '${configs.length} ${context.tr(TranslationKeys.serverSelectionImportSuccess)}',
+            ),
+          ),
+        );
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              context.tr(TranslationKeys.serverSelectionImportFailed),
+            ),
+            backgroundColor: Colors.red,
+          ),
+        );
+      }
+    } catch (e) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(
+            context.tr(TranslationKeys.serverSelectionImportFailed),
+          ),
+          backgroundColor: Colors.red,
+        ),
+      );
+    }
+  }
+
   Future<void> _deleteLocalConfig(V2RayConfig config) async {
     try {
       await Provider.of<V2RayProvider>(
@@ -778,7 +827,7 @@ class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
       backgroundColor: AppTheme.primaryDark,
       floatingActionButton: _selectedFilter == 'Local'
           ? FloatingActionButton(
-              onPressed: _importFromClipboard,
+              onPressed: _importMultipleFromClipboard,
               backgroundColor: AppTheme.primaryGreen,
               child: const Icon(Icons.paste),
             )
diff --git a/lib/screens/store_screen.dart b/lib/screens/store_screen.dart
@@ -42,7 +42,7 @@ class _StoreScreenState extends State<StoreScreen> {
       final response = await http
           .get(Uri.parse(_storeUrl))
           .timeout(
-            const Duration(seconds: 10),
+            const Duration(seconds: 60),
             onTimeout: () {
               throw Exception(
                 context.tr(TranslationKeys.errorConnectionTimeout),
diff --git a/lib/screens/subscription_management_screen.dart b/lib/screens/subscription_management_screen.dart
diff --git a/lib/services/server_service.dart b/lib/services/server_service.dart
diff --git a/lib/services/telegram_proxy_service.dart b/lib/services/telegram_proxy_service.dart
diff --git a/lib/services/update_service.dart b/lib/services/update_service.dart
diff --git a/lib/services/v2ray_service.dart b/lib/services/v2ray_service.dart
diff --git a/lib/utils/app_localizations.dart b/lib/utils/app_localizations.dart
