add sdk 36

Author: code3-dev

.github/workflows/build-and-release.yml

@@ -30,6 +30,19 @@ jobs:
           flutter-version: '3.32.8'
           channel: 'stable'
 
+      - name: Create keystore properties file
+        run: |
+          echo storePassword=${{ secrets.KEY_STORE_PASSWORD }} > android/key.properties
+          echo keyPassword=${{ secrets.KEY_PASSWORD }} >> android/key.properties
+          echo keyAlias=${{ secrets.KEY_ALIAS }} >> android/key.properties
+          echo storeFile=../keystore.jks >> android/key.properties
+        shell: bash
+
+      - name: Decode Keystore
+        run: |
+          echo "${{ secrets.KEY_STORE }}" | certutil -decode - > keystore.jks
+        shell: cmd
+
       - name: Get dependencies
         run: flutter pub get
 
@@ -78,7 +91,7 @@ jobs:
             
             | Architecture | Download Link |
             |-------------|---------------|
-            | Universal   | <a href="https://github.com/code3-dev/ProxyCloud/releases/latest/download/proxycloud-universal.apk"><img src="https://img.shields.io/badge/Android-Universal-3DDC84?style=for-the-badge&logo=android&logoColor=white" alt="Android Universal"></a> |
-            | armeabi-v7a | <a href="https://github.com/code3-dev/ProxyCloud/releases/latest/download/proxycloud-armeabi-v7a.apk"><img src="https://img.shields.io/badge/Android-armeabi--v7a-3DDC84?style=for-the-badge&logo=android&logoColor=white" alt="Android armeabi-v7a"></a> |
-            | arm64-v8a   | <a href="https://github.com/code3-dev/ProxyCloud/releases/latest/download/proxycloud-arm64-v8a.apk"><img src="https://img.shields.io/badge/Android-arm64--v8a-3DDC84?style=for-the-badge&logo=android&logoColor=white" alt="Android arm64-v8a"></a> |
-            | x86_64      | <a href="https://github.com/code3-dev/ProxyCloud/releases/latest/download/proxycloud-x86_64.apk"><img src="https://img.shields.io/badge/Android-x86_64-3DDC84?style=for-the-badge&logo=android&logoColor=white" alt="Android x86_64"></a> |
+            | Universal   | <a href="https://github.com/code3-dev/ProxyCloud/releases/download/${{ env.TAG_NAME }}/proxycloud-universal.apk"><img src="https://img.shields.io/badge/Android-Universal-3DDC84?style=for-the-badge&logo=android&logoColor=white" alt="Android Universal"></a> |
+            | armeabi-v7a | <a href="https://github.com/code3-dev/ProxyCloud/releases/download/${{ env.TAG_NAME }}/proxycloud-armeabi-v7a.apk"><img src="https://img.shields.io/badge/Android-armeabi--v7a-3DDC84?style=for-the-badge&logo=android&logoColor=white" alt="Android armeabi-v7a"></a> |
+            | arm64-v8a   | <a href="https://github.com/code3-dev/ProxyCloud/releases/download/${{ env.TAG_NAME }}/proxycloud-arm64-v8a.apk"><img src="https://img.shields.io/badge/Android-arm64--v8a-3DDC84?style=for-the-badge&logo=android&logoColor=white" alt="Android arm64-v8a"></a> |
+            | x86_64      | <a href="https://github.com/code3-dev/ProxyCloud/releases/download/${{ env.TAG_NAME }}/proxycloud-x86_64.apk"><img src="https://img.shields.io/badge/Android-x86_64-3DDC84?style=for-the-badge&logo=android&logoColor=white" alt="Android x86_64"></a> |

PING_USAGE_EXAMPLES.md

@@ -351,7 +351,7 @@ If you're currently using the V2Ray library's ping functionality, migration is s
 
 ```dart
 // Old way (V2Ray library)
-final delay = await flutterV2ray.getServerDelay(config: config);
+final delay = await V2ray.getServerDelay(config: config);
 
 // New way (maintains compatibility)
 final delay = await v2rayService.getServerDelay(config);

android/app/build.gradle.kts

@@ -1,13 +1,23 @@
+import java.io.FileInputStream
+import java.util.Properties
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+// Load keystore properties
+val keystorePropertiesFile = rootProject.file("key.properties")
+val keystoreProperties = Properties()
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
 android {
     namespace = "com.cloud.pira"
-    compileSdk = flutter.compileSdkVersion
+    compileSdk = 36
     ndkVersion = "27.0.12077973"
 
     compileOptions {
@@ -19,22 +29,49 @@ android {
         jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
+    signingConfigs {
+        create("release") {
+            keyAlias = keystoreProperties.getProperty("keyAlias") ?: "androiddebugkey"
+            keyPassword = keystoreProperties.getProperty("keyPassword") ?: "android"
+            storeFile = file(keystoreProperties.getProperty("storeFile") ?: "keystore/debug.keystore")
+            storePassword = keystoreProperties.getProperty("storePassword") ?: "android"
+        }
+    }
+
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "com.cloud.pira"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
-        versionCode = 34
-        versionName = "3.4.0"
+        versionCode = 35
+        versionName = "3.4.5"
+
+        manifestPlaceholders.put("io.flutter.embedding.android.EnableImpeller", "false")
+    }
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
+
+    splits {
+        abi {
+            isEnable = true
+            reset()
+            include("x86_64", "armeabi-v7a", "arm64-v8a")
+            isUniversalApk = true
+        }
     }
 
     buildTypes {
-        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig = signingConfigs.getByName("debug")
+        getByName("release") {
+            signingConfig = signingConfigs.getByName("release")
+            isMinifyEnabled = false
+            isShrinkResources = false
+            ndk {
+                abiFilters.addAll(listOf("x86_64", "armeabi-v7a", "arm64-v8a"))
+                debugSymbolLevel = "FULL"
+            }
         }
     }
 }
@@ -45,4 +82,4 @@ flutter {
 
 dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
-}
+}

android/app/src/main/AndroidManifest.xml

@@ -1,20 +1,22 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <!-- VPN permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" tools:targetApi="34" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" tools:targetApi="33" />
     <!-- Battery optimization permission -->
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <application
         android:label="Proxy Cloud"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:enableOnBackInvokedCallback="true"
+        android:networkSecurityConfig="@xml/network_security_config">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -50,6 +52,9 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableImpeller"
+            android:value="false" />
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and

android/app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <!-- Default: disallow cleartext traffic -->
+    <base-config cleartextTrafficPermitted="false" />
+</network-security-config>

lib/models/app_update.dart

@@ -6,7 +6,7 @@ class AppUpdate {
   final String messText;
 
   // Current app version - manually set
-  static const String currentAppVersion = '3.4.0';
+  static const String currentAppVersion = '3.4.5';
 
   AppUpdate({required this.version, required this.url, required this.messText});
 

lib/providers/v2ray_provider.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/widgets.dart';
-import 'package:flutter_v2ray/flutter_v2ray.dart';
+import 'package:flutter_v2ray_client/flutter_v2ray.dart';
 import '../models/v2ray_config.dart';
 import '../models/subscription.dart';
 import '../services/v2ray_service.dart';

lib/screens/about_screen.dart

@@ -64,7 +64,7 @@ class AboutScreen extends StatelessWidget {
             Text(
               context.tr(
                 TranslationKeys.aboutVersion,
-                parameters: {'version': '3.4.0'},
+                parameters: {'version': '3.4.5'},
               ),
               style: const TextStyle(fontSize: 16, color: Colors.grey),
             ),

lib/services/server_service.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;
 import '../models/v2ray_config.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter_v2ray/flutter_v2ray.dart';
+import 'package:flutter_v2ray_client/flutter_v2ray.dart';
 
 class ServerService {
   // Default GitHub URL for server configurations
@@ -100,13 +100,13 @@ class ServerService {
         'Parsing URI: ${uri.substring(0, uri.length > 30 ? 30 : uri.length)}...',
       );
 
-      // Use FlutterV2ray to parse the URL
+      // Use V2ray to parse the URL
       if (uri.startsWith('vmess://') ||
           uri.startsWith('vless://') ||
           uri.startsWith('trojan://') ||
           uri.startsWith('ss://')) {
         try {
-          V2RayURL parser = FlutterV2ray.parseFromURL(uri);
+          V2RayURL parser = V2ray.parseFromURL(uri);
           String configType = '';
 
           if (uri.startsWith('vmess://')) {
@@ -124,7 +124,7 @@ class ServerService {
           int port = parser.port;
 
           debugPrint(
-            'Parsed URI with FlutterV2ray: remark=${parser.remark}, address=$address, port=$port',
+            'Parsed URI with V2ray: remark=${parser.remark}, address=$address, port=$port',
           );
 
           return V2RayConfig(
@@ -136,7 +136,7 @@ class ServerService {
             fullConfig: uri,
           );
         } catch (e) {
-          debugPrint('Error parsing with FlutterV2ray: $e');
+          debugPrint('Error parsing with V2ray: $e');
           return null;
         }
       }

lib/services/v2ray_service.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:async';
 import 'dart:math';
-import 'package:flutter_v2ray/flutter_v2ray.dart';
+import 'package:flutter_v2ray_client/flutter_v2ray.dart';
 import 'package:http/http.dart' as http;
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:proxycloud/models/v2ray_config.dart';
@@ -123,14 +123,14 @@ class V2RayService extends ChangeNotifier {
   static final V2RayService _instance = V2RayService._internal();
   factory V2RayService() => _instance;
 
-  late final FlutterV2ray _flutterV2ray;
+  late final V2ray _flutterV2ray;
 
   // Current V2Ray status from the callback
   V2RayStatus? _currentStatus;
   V2RayStatus? get currentStatus => _currentStatus;
 
   V2RayService._internal() {
-    _flutterV2ray = FlutterV2ray(
+    _flutterV2ray = V2ray(
       onStatusChanged: (status) {
         print('V2Ray status changed: $status');
         _currentStatus = status;
@@ -174,7 +174,7 @@ class V2RayService extends ChangeNotifier {
 
   Future<void> initialize() async {
     if (!_isInitialized) {
-      await _flutterV2ray.initializeV2Ray(
+      await _flutterV2ray.initialize(
         notificationIconResourceType: "mipmap",
         notificationIconResourceName: "ic_launcher",
       );
@@ -190,7 +190,7 @@ class V2RayService extends ChangeNotifier {
       await initialize();
 
       // Parse the configuration
-      V2RayURL parser = FlutterV2ray.parseFromURL(config.fullConfig);
+      V2RayURL parser = V2ray.parseFromURL(config.fullConfig);
 
       // Request permission if needed (for VPN mode)
       bool hasPermission = await _flutterV2ray.requestPermission();
@@ -520,7 +520,7 @@ class V2RayService extends ChangeNotifier {
         try {
           await initialize();
 
-          final parser = FlutterV2ray.parseFromURL(config.fullConfig);
+          final parser = V2ray.parseFromURL(config.fullConfig);
           final delay = await _flutterV2ray
               .getServerDelay(config: parser.getFullConfiguration())
               .timeout(
@@ -605,7 +605,7 @@ class V2RayService extends ChangeNotifier {
               line.startsWith('vless://') ||
               line.startsWith('trojan://') ||
               line.startsWith('ss://')) {
-            V2RayURL parser = FlutterV2ray.parseFromURL(line);
+            V2RayURL parser = V2ray.parseFromURL(line);
             String configType = '';
 
             if (line.startsWith('vmess://')) {
@@ -939,7 +939,7 @@ class V2RayService extends ChangeNotifier {
   Future<V2RayConfig?> parseSubscriptionConfig(String configText) async {
     try {
       // Try to parse as a V2Ray URL
-      final parser = FlutterV2ray.parseFromURL(configText);
+      final parser = V2ray.parseFromURL(configText);
 
       // Determine the protocol type from the URL prefix
       String configType = '';