From e4b404a2aa19f6b5b9457d7a5943610c92c2a06d Mon Sep 17 00:00:00 2001
From: AceDroidX <15519693+AceDroidX@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=9C=BA=E7=9B=B4=E6=8E=A5=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=9C=8D=E5=8A=A1=E8=80=8C=E4=B8=8D=E6=98=AF=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                    |  1 -
 .../github/acedroidx/frp/AutoStartBroadReceiver.kt  | 13 ++++++++-----
 .../java/io/github/acedroidx/frp/MainActivity.kt    |  1 -
 .../java/io/github/acedroidx/frp/ShellService.kt    |  4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e792e1f..beabc18 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
diff --git a/app/src/main/java/io/github/acedroidx/frp/AutoStartBroadReceiver.kt b/app/src/main/java/io/github/acedroidx/frp/AutoStartBroadReceiver.kt
index d776918..aaa2605 100644
--- a/app/src/main/java/io/github/acedroidx/frp/AutoStartBroadReceiver.kt
+++ b/app/src/main/java/io/github/acedroidx/frp/AutoStartBroadReceiver.kt
@@ -3,6 +3,7 @@ package io.github.acedroidx.frp
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
 
 class AutoStartBroadReceiver : BroadcastReceiver() {
@@ -13,11 +14,13 @@ class AutoStartBroadReceiver : BroadcastReceiver() {
         val auto_start = editor.getBoolean("auto_start", false)
         if (ACTION == intent.action && auto_start) {
             //开机启动
-            val mainIntent = Intent(context, MainActivity::class.java)
-            mainIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            context.startActivity(mainIntent)
+            val mainIntent = Intent(context, ShellService::class.java)
+            mainIntent.putExtra("filename", BuildConfig.FrpcFileName)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                context.startForegroundService(mainIntent)
+            }else{
+                context.startService(mainIntent)
+            }
         }
     }
-
-
 }
\ No newline at end of file
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 a464b54..1faf1df 100644
--- a/app/src/main/java/io/github/acedroidx/frp/MainActivity.kt
+++ b/app/src/main/java/io/github/acedroidx/frp/MainActivity.kt
@@ -66,7 +66,6 @@ class MainActivity : AppCompatActivity() {
         val editor = getSharedPreferences("data", AppCompatActivity.MODE_PRIVATE)
         auto_start_switch = findViewById<SwitchCompat>(R.id.auto_start_switch)
         auto_start_switch.isChecked = editor.getBoolean("auto_start", false)
-        if (auto_start_switch.isChecked) (startShell())
         auto_start_switch.setOnCheckedChangeListener { buttonView, isChecked ->
             val editor = editor.edit()
             editor.putBoolean("auto_start", isChecked)
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 4e5b2a5..64cad25 100644
--- a/app/src/main/java/io/github/acedroidx/frp/ShellService.kt
+++ b/app/src/main/java/io/github/acedroidx/frp/ShellService.kt
@@ -70,7 +70,7 @@ class ShellService : Service() {
             stopSelf()
             return START_NOT_STICKY
         }
-        Toast.makeText(this, "已启动服务", Toast.LENGTH_SHORT).show()
+        Toast.makeText(this, "已启动frp服务", Toast.LENGTH_SHORT).show()
         startForeground(1, showMotification());
         return START_NOT_STICKY
     }
@@ -78,7 +78,7 @@ class ShellService : Service() {
     override fun onDestroy() {
         p?.destroy()
         p = null
-        Toast.makeText(this, "已关闭服务", Toast.LENGTH_SHORT).show()
+        Toast.makeText(this, "已关闭frp服务", Toast.LENGTH_SHORT).show()
     }
 
     private fun showMotification(): Notification {