1 files changed, 33 insertions, 16 deletions

diff --git a/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt b/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt
index bdf0f8d4..56810377 100644
--- a/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt
@@ -1,28 +1,36 @@
 /*
- * Copyright © 2017-2021 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.activity
 
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.CallbackRegistry
 import androidx.databinding.CallbackRegistry.NotifierCallback
 import androidx.lifecycle.lifecycleScope
 import com.wireguard.android.Application
 import com.wireguard.android.model.ObservableTunnel
+import kotlinx.coroutines.launch
 
 /**
  * Base class for activities that need to remember the currently-selected tunnel.
  */
-abstract class BaseActivity : ThemeChangeAwareActivity() {
+abstract class BaseActivity : AppCompatActivity() {
     private val selectionChangeRegistry = SelectionChangeRegistry()
+    private var created = false
     var selectedTunnel: ObservableTunnel? = null
         set(value) {
             val oldTunnel = field
             if (oldTunnel == value) return
             field = value
-            onSelectedTunnelChanged(oldTunnel, value)
-            selectionChangeRegistry.notifyCallbacks(oldTunnel, 0, value)
+            if (created) {
+                if (!onSelectedTunnelChanged(oldTunnel, value)) {
+                    field = oldTunnel
+                } else {
+                    selectionChangeRegistry.notifyCallbacks(oldTunnel, 0, value)
+                }
+            }
         }
 
     fun addOnSelectedTunnelChangedListener(listener: OnSelectedTunnelChangedListener) {
@@ -30,17 +38,25 @@ abstract class BaseActivity : ThemeChangeAwareActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
         // Restore the saved tunnel if there is one; otherwise grab it from the arguments.
         val savedTunnelName = when {
             savedInstanceState != null -> savedInstanceState.getString(KEY_SELECTED_TUNNEL)
             intent != null -> intent.getStringExtra(KEY_SELECTED_TUNNEL)
             else -> null
         }
-        if (savedTunnelName != null)
-            lifecycleScope.launchWhenCreated { selectedTunnel = Application.getTunnelManager().getTunnels()[savedTunnelName] }
-
-        // The selected tunnel must be set before the superclass method recreates fragments.
-        super.onCreate(savedInstanceState)
+        if (savedTunnelName != null) {
+            lifecycleScope.launch {
+                val tunnel = Application.getTunnelManager().getTunnels()[savedTunnelName]
+                if (tunnel == null)
+                    created = true
+                selectedTunnel = tunnel
+                created = true
+            }
+        } else {
+            created = true
+        }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -48,10 +64,11 @@ abstract class BaseActivity : ThemeChangeAwareActivity() {
         super.onSaveInstanceState(outState)
     }
 
-    protected abstract fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, newTunnel: ObservableTunnel?)
+    protected abstract fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, newTunnel: ObservableTunnel?): Boolean
 
     fun removeOnSelectedTunnelChangedListener(
-            listener: OnSelectedTunnelChangedListener) {
+        listener: OnSelectedTunnelChangedListener
+    ) {
         selectionChangeRegistry.remove(listener)
     }
 
@@ -61,17 +78,17 @@ abstract class BaseActivity : ThemeChangeAwareActivity() {
 
     private class SelectionChangeNotifier : NotifierCallback<OnSelectedTunnelChangedListener, ObservableTunnel, ObservableTunnel>() {
         override fun onNotifyCallback(
-                listener: OnSelectedTunnelChangedListener,
-                oldTunnel: ObservableTunnel?,
-                ignored: Int,
-                newTunnel: ObservableTunnel?
+            listener: OnSelectedTunnelChangedListener,
+            oldTunnel: ObservableTunnel?,
+            ignored: Int,
+            newTunnel: ObservableTunnel?
         ) {
             listener.onSelectedTunnelChanged(oldTunnel, newTunnel)
         }
     }
 
     private class SelectionChangeRegistry :
-            CallbackRegistry<OnSelectedTunnelChangedListener, ObservableTunnel, ObservableTunnel>(SelectionChangeNotifier())
+        CallbackRegistry<OnSelectedTunnelChangedListener, ObservableTunnel, ObservableTunnel>(SelectionChangeNotifier())
 
     companion object {
         private const val KEY_SELECTED_TUNNEL = "selected_tunnel"