fix http service error

SkyDynamic · Dec 15, 2024 · b087384 · b087384
1 parent e89269b
commit b087384
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/app/src/main/java/io/github/skydynamic/maiproberplus/Application.kt b/app/src/main/java/io/github/skydynamic/maiproberplus/Application.kt
@@ -69,7 +69,6 @@ class Application : Application() {
         application = this
         configManager = ConfigManager(this)
         db = Room.databaseBuilder(this, AppDatabase::class.java, "maiproberplus").build()
-        startService(Intent(this, HttpServerService::class.java))
         this.initProberContext()
     }
 
@@ -117,6 +116,18 @@ class Application : Application() {
         }
     }
 
+    fun startHttpServer() {
+        val intent = Intent(this, HttpServerService::class.java)
+        startService(intent)
+    }
+
+    fun stopHttpServer() {
+        val intent = Intent(this, HttpServerService::class.java).apply {
+            action = HttpServerService.STOP_HTTP_SERVICE_INTENT
+        }
+        startService(intent)
+    }
+
     fun initProberContext() {
         proberContext = object : ProberContext {
             override fun requireConfig(): ConfigStorage {

diff --git a/app/src/main/java/io/github/skydynamic/maiproberplus/core/proxy/HttpServerService.java b/app/src/main/java/io/github/skydynamic/maiproberplus/core/proxy/HttpServerService.java
@@ -6,8 +6,10 @@
 import android.util.Log;
 
 import java.io.IOException;
+import java.util.Objects;
 
 public class HttpServerService extends Service {
+    public static final String STOP_HTTP_SERVICE_INTENT = "io.github.skkydynamic.service.vpn.DISCONNECT";
     private static final String TAG = "HttpServerService";
     private HttpServer httpServer;
     private HttpRedirectServer httpRedirectServer;
@@ -34,7 +36,13 @@ public IBinder onBind(Intent intent) {
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         super.onStartCommand(intent, flags, startId);
-        Log.d("HttpService", "Http service on start command");
+        if (Objects.equals(intent.getAction(), STOP_HTTP_SERVICE_INTENT)) {
+            this.httpServer.stop();
+            this.httpRedirectServer.stop();
+            Log.d(TAG, "Stop http service");
+            return START_NOT_STICKY;
+        }
+
         try {
             this.httpServer.start();
             this.httpRedirectServer.start();
@@ -49,5 +57,6 @@ public void onDestroy() {
         super.onDestroy();
         this.httpServer.stop();
         this.httpRedirectServer.stop();
+        Log.d(TAG, "Stop http service");
     }
 }
diff --git a/app/src/main/java/io/github/skydynamic/maiproberplus/ui/compose/sync/SyncCompose.kt b/app/src/main/java/io/github/skydynamic/maiproberplus/ui/compose/sync/SyncCompose.kt
@@ -194,11 +194,14 @@ fun SyncCompose() {
                             } else {
                                 startVpnService(context as Activity)
                             }
+                            application.startHttpServer()
                         } else {
                             stopVpnService(context as Activity)
+                            application.stopHttpServer()
                         }
                     }
-                }
+                },
+                enabled = !GlobalViewModel.maimaiHooking || !GlobalViewModel.chuniHooking
             ) {
                 if (!globalViewModel.isVpnServiceRunning)
                     Text("开启劫持")
@@ -328,10 +331,13 @@ private fun startVpnService(activity: Activity) {
 }
 
 private fun stopVpnService(activity: Activity) {
-    val intent = Intent(activity, LocalVpnService::class.java).apply { action = LocalVpnService.DISCONNECT_INTENT }
+    val intent = Intent(activity, LocalVpnService::class.java).apply {
+        action = LocalVpnService.DISCONNECT_INTENT
+    }
     activity.startService(intent)
 }
 
 private fun checkResourceComplate(context: Context): Boolean {
-    return context.filesDir.resolve("maimai_song_list.json").exists() || context.filesDir.resolve("chuni_song_list.json").exists()
+    return context.filesDir.resolve("maimai_song_list.json").exists()
+            || context.filesDir.resolve("chuni_song_list.json").exists()
 }