From 010860ddcdf249465bfe047c0ed43969eb6c41d9 Mon Sep 17 00:00:00 2001
From: AceDroidX <15519693+AceDroidX@users.noreply.github.com>
Date: Mon, 1 Apr 2024 15:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=85=A8=E5=B1=80=E5=B8=B8?=
 =?UTF-8?q?=E9=87=8F=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  5 +++++
 .../io/github/acedroidx/frp/ConfigActivity.kt |  8 +++----
 .../io/github/acedroidx/frp/MainActivity.kt   | 21 +++++++------------
 .../io/github/acedroidx/frp/ShellService.kt   |  2 +-
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a6d3eff..ccc24ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,6 +32,11 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         signingConfig signingConfigs.AceKeystore
+
+        buildConfigField("String", "FrpVersion", '"0.56.0"')
+        buildConfigField("String", "FrpcFileName", '"libfrpc.so"')
+        buildConfigField("String", "LogFileName", '"frpc.log"')
+        buildConfigField("String", "ConfigFileName", '"config.ini"')
     }
 
     buildTypes {
diff --git a/app/src/main/java/io/github/acedroidx/frp/ConfigActivity.kt b/app/src/main/java/io/github/acedroidx/frp/ConfigActivity.kt
index 4236f8e..056b874 100644
--- a/app/src/main/java/io/github/acedroidx/frp/ConfigActivity.kt
+++ b/app/src/main/java/io/github/acedroidx/frp/ConfigActivity.kt
@@ -8,8 +8,6 @@ import android.widget.Button
 import android.widget.EditText
 
 class ConfigActivity : AppCompatActivity() {
-    val configname = "config.ini"
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_config)
@@ -25,8 +23,8 @@ class ConfigActivity : AppCompatActivity() {
     fun readConfig() {
         val files: Array<String> = this.fileList()
         val configEditText = findViewById<EditText>(R.id.configEditText)
-        if (files.contains(configname)) {
-            val mReader = this.openFileInput(configname).bufferedReader()
+        if (files.contains(BuildConfig.ConfigFileName)) {
+            val mReader = this.openFileInput(BuildConfig.ConfigFileName).bufferedReader()
             val mRespBuff = StringBuffer()
             val buff = CharArray(1024)
             var ch = 0
@@ -42,7 +40,7 @@ class ConfigActivity : AppCompatActivity() {
 
     fun saveConfig() {
         val configEditText = findViewById<EditText>(R.id.configEditText)
-        this.openFileOutput(configname, Context.MODE_PRIVATE).use {
+        this.openFileOutput(BuildConfig.ConfigFileName, Context.MODE_PRIVATE).use {
             it.write(configEditText.text.toString().toByteArray())
 //            Log.d("adx",configEditText.text.toString())
         }
diff --git a/app/src/main/java/io/github/acedroidx/frp/MainActivity.kt b/app/src/main/java/io/github/acedroidx/frp/MainActivity.kt
index 4a10346..a464b54 100644
--- a/app/src/main/java/io/github/acedroidx/frp/MainActivity.kt
+++ b/app/src/main/java/io/github/acedroidx/frp/MainActivity.kt
@@ -23,11 +23,6 @@ import java.io.File
 
 
 class MainActivity : AppCompatActivity() {
-    val filename = "libfrpc.so"
-    val frpver = "0.56.0"
-    val logname = "frpc.log"
-    val configname = "config.ini"
-
     private lateinit var state_switch: SwitchCompat
     private lateinit var auto_start_switch: SwitchCompat
 
@@ -58,7 +53,7 @@ class MainActivity : AppCompatActivity() {
 
         val versionName = packageManager.getPackageInfo(packageName, 0).versionName
         val titleText = findViewById<TextView>(R.id.titleText)
-        titleText.text = "frp for Android - ${versionName}/${frpver}"
+        titleText.text = "frp for Android - ${versionName}/${BuildConfig.FrpVersion}"
 
         checkConfig()
         checkNotificationPermission()
@@ -100,7 +95,7 @@ class MainActivity : AppCompatActivity() {
         }
         val deleteButton = findViewById<Button>(R.id.deleteButton)
         deleteButton.setOnClickListener {
-            val logfile = File(this.filesDir.toString() + "/$logname")
+            val logfile = File(this.filesDir.toString() + "/${BuildConfig.LogFileName}")
             Log.d("adx", logfile.absoluteFile.toString())
             logfile.delete()
             readLog()
@@ -110,8 +105,8 @@ class MainActivity : AppCompatActivity() {
     fun readLog() {
         val files: Array<String> = this.fileList()
         val logTextView = findViewById<TextView>(R.id.logTextView)
-        if (files.contains(logname)) {
-            val mReader = this.openFileInput(logname).bufferedReader()
+        if (files.contains(BuildConfig.LogFileName)) {
+            val mReader = this.openFileInput(BuildConfig.LogFileName).bufferedReader()
             val mRespBuff = StringBuffer()
             val buff = CharArray(1024)
             var ch = 0
@@ -128,17 +123,17 @@ class MainActivity : AppCompatActivity() {
     fun checkConfig() {
         val files: Array<String> = this.fileList()
         Log.d("adx", files.joinToString(","))
-        if (!files.contains(configname)) {
+        if (!files.contains(BuildConfig.ConfigFileName)) {
             val assetmanager = resources.assets
-            this.openFileOutput(configname, Context.MODE_PRIVATE).use {
-                it.write(assetmanager.open((configname)).readBytes())
+            this.openFileOutput(BuildConfig.ConfigFileName, Context.MODE_PRIVATE).use {
+                it.write(assetmanager.open((BuildConfig.ConfigFileName)).readBytes())
             }
         }
     }
 
     private fun startShell() {
         val intent = Intent(this, ShellService::class.java)
-        intent.putExtra("filename", filename)
+        intent.putExtra("filename", BuildConfig.FrpcFileName)
         startService(intent)
         // Bind to LocalService
         bindService(intent, connection, Context.BIND_AUTO_CREATE)
diff --git a/app/src/main/java/io/github/acedroidx/frp/ShellService.kt b/app/src/main/java/io/github/acedroidx/frp/ShellService.kt
index 3d21da2..4e5b2a5 100644
--- a/app/src/main/java/io/github/acedroidx/frp/ShellService.kt
+++ b/app/src/main/java/io/github/acedroidx/frp/ShellService.kt
@@ -62,7 +62,7 @@ class ShellService : Service() {
         Log.d("adx", "native library dir ${ainfo.nativeLibraryDir}")
         try {
             p = Runtime.getRuntime().exec(
-                "${ainfo.nativeLibraryDir}/${filename} -c config.ini", arrayOf(""), this.filesDir
+                "${ainfo.nativeLibraryDir}/${filename} -c ${BuildConfig.ConfigFileName}", arrayOf(""), this.filesDir
             )
         } catch (e: Exception) {
             Log.e("adx", e.stackTraceToString())