Ensure MainActivity restores using active proxy details after restart

Author: pimterry

app/src/main/AndroidManifest.xml

@@ -38,7 +38,6 @@
         <activity
                 android:name=".MainActivity"
                 android:label="@string/app_name"
-                android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
                 android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/tech/httptoolkit/android/MainActivity.kt

@@ -63,8 +63,9 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
     }
 
     private var mainState: MainState = if (isVpnActive()) MainState.CONNECTED else MainState.DISCONNECTED
+
     // If connected/late-stage connecting, the proxy we're connected/trying to connect to. Otherwise null.
-    private var currentProxyConfig: ProxyConfig? = null
+    private var currentProxyConfig: ProxyConfig? = activeVpnConfig()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -106,12 +107,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
         }
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        setContentView(R.layout.main_layout)
-        updateUi()
-    }
-
     override fun onResume() {
         super.onResume()
         Log.d(TAG, "onResume")
@@ -182,12 +177,16 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
                 disconnect()
             }
 
-            else -> Log.w(TAG, "Unknown intent. Action ${
+            intent.action == "android.intent.action.MAIN" -> {
+                // The app is being opened - nothing to do here
+            }
+
+            else -> Log.w(TAG, "Ignoring unknown intent. Action ${
                 intent.action
             }, data: ${
                 intent.data
-            }, ${
-                if (isRCIntent) "sent as RC intent" else "non-RC"
+            }${
+                if (isRCIntent) " (RC)" else ""
             }")
         }
     }

app/src/main/java/tech/httptoolkit/android/ProxyVpnService.kt

@@ -37,12 +37,19 @@ fun isVpnActive(): Boolean {
         currentService?.isActive() ?: false
 }
 
+fun activeVpnConfig(): ProxyConfig? {
+    return currentService?.proxyConfig
+}
+
 class ProxyVpnService : VpnService(), IProtectSocket {
 
     private var app: HttpToolkitApplication? = null
 
     private var localBroadcastManager: LocalBroadcastManager? = null
 
+    var proxyConfig: ProxyConfig? = null
+        private set
+
     private var vpnInterface: ParcelFileDescriptor? = null
     private var vpnRunnable: ProxyVpnRunnable? = null
 
@@ -125,6 +132,7 @@ class ProxyVpnService : VpnService(), IProtectSocket {
     }
 
     private fun startVpn(proxyConfig: ProxyConfig) {
+        this.proxyConfig = proxyConfig
         val packages = packageManager.getInstalledApplications(PackageManager.GET_META_DATA)
 
         val packageNames = packages.map { pkg -> pkg.packageName }
@@ -189,7 +197,9 @@ class ProxyVpnService : VpnService(), IProtectSocket {
         stopForeground(true)
         localBroadcastManager!!.sendBroadcast(Intent(VPN_STOPPED_BROADCAST))
         stopSelf()
+
         currentService = null
+        this.proxyConfig = null
     }
 
     fun isActive(): Boolean {