From e7a750dd7774493991e6fd82af9da7961c1ec384 Mon Sep 17 00:00:00 2001
From: ospab <gvoprgrg@gmail.com>
Date: Sat, 29 Aug 2026 00:36:20 +0300
Subject: [PATCH] fix(android): request battery-optimization exemption so Doze
 can't freeze the VPN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On phones the tunnel dropped quickly and never reconnected. Root cause: the app
had a foreground service and a wake lock but never asked to be exempt from
battery optimization, so Doze / App Standby froze the whole VPN process when the
screen went off. A frozen process means not just a dead socket but that the
in-process reconnect logic — wall-clock suspend detection, the NetworkChanged
handler, keepalive — never runs at all, which is exactly "reconnect doesn't
work."

Adds the REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission and, on VPN start,
prompts for the exemption when it isn't already granted (checked via
isIgnoringBatteryOptimizations, so it asks once). Fired after the VPN consent so
the two system dialogs don't stack. Socket protection on reconnect was already
correct (try_connect_transport protects every new socket), so this targets the
process-freeze, which is the part that stopped recovery.
---
 .../android/app/src/main/AndroidManifest.xml  |  4 ++++
 .../com/ospab/ostp_client/MainActivity.kt     | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/ostp-flutter/android/app/src/main/AndroidManifest.xml b/ostp-flutter/android/app/src/main/AndroidManifest.xml
index 54f4f4f..7008153 100644
--- a/ostp-flutter/android/app/src/main/AndroidManifest.xml
+++ b/ostp-flutter/android/app/src/main/AndroidManifest.xml
@@ -7,6 +7,10 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <!-- Without a battery-optimization exemption, Doze freezes the VPN service
+         when the screen is off: the connection drops and the in-process
+         reconnect logic never runs because the whole process is suspended. -->
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <application
         android:label="ostp_client"
         android:name="${applicationName}"
diff --git a/ostp-flutter/android/app/src/main/kotlin/com/ospab/ostp_client/MainActivity.kt b/ostp-flutter/android/app/src/main/kotlin/com/ospab/ostp_client/MainActivity.kt
index 0d042d6..2efe391 100644
--- a/ostp-flutter/android/app/src/main/kotlin/com/ospab/ostp_client/MainActivity.kt
+++ b/ostp-flutter/android/app/src/main/kotlin/com/ospab/ostp_client/MainActivity.kt
@@ -152,5 +152,24 @@ class MainActivity : FlutterActivity() {
             intent.putExtra("configJson", pendingConfigJson)
         }
         androidx.core.content.ContextCompat.startForegroundService(this, intent)
+        // Ask to be exempt from battery optimization so Doze does not freeze the
+        // service (which drops the tunnel AND stops the in-process reconnect from
+        // ever running). Only prompts if not already exempt; runs after the VPN
+        // consent so the two system dialogs do not stack.
+        requestBatteryExemptionIfNeeded()
+    }
+
+    private fun requestBatteryExemptionIfNeeded() {
+        try {
+            val pm = getSystemService(android.content.Context.POWER_SERVICE) as android.os.PowerManager
+            if (!pm.isIgnoringBatteryOptimizations(packageName)) {
+                val intent = Intent(android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
+                intent.data = android.net.Uri.parse("package:$packageName")
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                startActivity(intent)
+            }
+        } catch (e: Throwable) {
+            android.util.Log.e("MainActivity", "Battery exemption request failed", e)
+        }
     }
 }