Stop VPN service when minimized (#70)

Author: vertexodessa

app/src/main/java/com/openipc/pixelpilot/VideoActivity.java

@@ -1110,6 +1110,9 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
                 Log.e(TAG, "VPN permission was not granted by the user.");
             }
         }
+        else {
+            Log.w(TAG, "onActivityResult: unknown request code " + requestCode);
+        }
     }
 
     public void setDefaultGsKey() {
@@ -1193,6 +1196,12 @@ protected void onPause() {
         videoPlayer.stop();
         videoPlayer.stopAudio();
         wfbLinkManager.stopAdapters();
+
+        // Stop VPN service
+        Log.w(TAG, "onPause: stopping service");
+        Intent intent = new Intent(this, WfbNgVpnService.class);
+        intent.setAction("STOP_SERVICE");
+        startService(intent);
     }
 
     @Override
@@ -1222,6 +1231,7 @@ protected void onResume() {
 
         osdManager.restoreOSDConfig();
 
+        startVpnService();
 
         super.onResume();
     }

app/src/main/java/com/openipc/pixelpilot/WfbNgVpnService.java

@@ -34,6 +34,31 @@ public class WfbNgVpnService extends VpnService {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        if (intent != null && "STOP_SERVICE".equals(intent.getAction())) {
+            Log.i(TAG, "VPN Service stopping");
+            // Stop threads
+            isRunning = false;
+
+            if (udpToVpnThread != null) {
+                udpToVpnThread.interrupt();
+            }
+            if (vpnToUdpThread != null) {
+                vpnToUdpThread.interrupt();
+            }
+
+            // Close the interface
+            if (vpnInterface != null) {
+                try {
+                    vpnInterface.close();
+                } catch (IOException e) {
+                    Log.e(TAG, "Failed to close VPN interface", e);
+                }
+                vpnInterface = null;
+            }
+            stopSelf();
+            return START_NOT_STICKY;
+        }
+
         Log.i(TAG, "VPN Service started");
 
         // If already running, don't start again
@@ -98,13 +123,14 @@ private void startVpnThreads(final ParcelFileDescriptor vpnInterfacePfd) {
         udpToVpnThread = new Thread(new Runnable() {
             @Override
             public void run() {
-                Log.i(TAG, "UDP → VPN thread started");
+                Log.i(TAG, "UDP (WFB) → VPN thread started");
                 byte[] buffer = new byte[4024];
 
-                try (DatagramSocket socket = new DatagramSocket(new InetSocketAddress(8000))) {
-                    // Bind to local UDP port 8000 on all interfaces
+                try (DatagramSocket socket = new DatagramSocket(null)) {
+                    // Set reuse address before binding
                     socket.setReuseAddress(true);
-                    //socket.bind(new InetSocketAddress(8000));
+                    // Bind to local UDP port 8000 on all interfaces
+                    socket.bind(new InetSocketAddress(8000));
 
                     while (isRunning) {
                         // Read data from UDP into buffer
@@ -134,7 +160,7 @@ public void run() {
         vpnToUdpThread = new Thread(new Runnable() {
             @Override
             public void run() {
-                Log.i(TAG, "VPN → UDP thread started");
+                Log.i(TAG, "VPN → UDP (WFB) thread started");
                 byte[] buffer = new byte[1024];
 
                 try (DatagramSocket socket = new DatagramSocket()) {