cache

Author: chen08209

android/app/proguard-rules.pro

@@ -1,2 +1,4 @@
 
--keep class com.follow.clash.models.**{ *; }
+-keep class com.follow.clash.models.**{ *; }
+
+-keep class com.follow.clash.service.models.**{ *; }

…in/kotlin/com/follow/clash/common/Ext.kt …/src/main/kotlin/com/follow/clash/Ext.ktandroid/app/src/main/kotlin/com/follow/clash/common/Ext.kt renamed to android/app/src/main/kotlin/com/follow/clash/Ext.kt android/app/src/main/kotlin/com/follow/clash/common/Ext.kt renamed to android/app/src/main/kotlin/com/follow/clash/Ext.kt

@@ -1,4 +1,4 @@
-package com.follow.clash.common
+package com.follow.clash
 
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable

android/app/src/main/kotlin/com/follow/clash/State.kt

@@ -3,7 +3,6 @@ package com.follow.clash
 import android.content.Intent
 import com.follow.clash.common.GlobalState
 import com.follow.clash.common.intent
-import com.follow.clash.common.plugin
 import com.follow.clash.common.startForegroundServiceCompat
 import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.ServicePlugin

android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt

@@ -21,8 +21,8 @@ import com.follow.clash.R
 import com.follow.clash.common.Components
 import com.follow.clash.common.GlobalState
 import com.follow.clash.common.QuickAction
-import com.follow.clash.common.getBase64
 import com.follow.clash.common.quickIntent
+import com.follow.clash.getBase64
 import com.follow.clash.models.Package
 import com.google.gson.Gson
 import io.flutter.embedding.android.FlutterActivity

android/app/src/main/kotlin/com/follow/clash/plugins/ServicePlugin.kt

@@ -2,9 +2,9 @@ package com.follow.clash.plugins
 
 import com.follow.clash.Service
 import com.follow.clash.State
+import com.follow.clash.awaitResult
 import com.follow.clash.common.Components
 import com.follow.clash.common.GlobalState
-import com.follow.clash.common.awaitResult
 import com.follow.clash.service.models.VpnOptions
 import com.google.gson.Gson
 import io.flutter.embedding.engine.plugins.FlutterPlugin

android/common/build.gradle.kts

@@ -15,12 +15,6 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-        create("profile") {
         }
     }
     compileOptions {

android/common/consumer-rules.pro

@@ -60,8 +60,8 @@ static void call_tun_interface_protect_impl(void *tun_interface, const int fd) {
                         fd);
 }
 
-static const char *
-call_tun_interface_resolve_process_impl(void *tun_interface, int protocol,
+static char *
+call_tun_interface_resolve_process_impl(void *tun_interface, const int protocol,
                                         const char *source,
                                         const char *target,
                                         const int uid) {
@@ -72,17 +72,17 @@ call_tun_interface_resolve_process_impl(void *tun_interface, int protocol,
                                                                              new_string(source),
                                                                              new_string(target),
                                                                              uid));
-    scoped_const_string sp = get_string(packageName);
+    scoped_string sp = get_string(packageName);
     return sp;
 }
 
-static const char *
+static char *
 call_invoke_interface_result_impl(void *invoke_interface, const char *data) {
     ATTACH_JNI();
     const auto res = reinterpret_cast<jstring>(env->CallObjectMethod(static_cast<jobject>(invoke_interface),
                                                                      m_invoke_interface_result,
                                                                      new_string(data)));
-    scoped_const_string sr = get_string(res);
+    scoped_string sr = get_string(res);
     return sr;
 }