File tree Expand file tree Collapse file tree 1 file changed +8
-1
lines changed
ui/src/main/java/com/wireguard/android/activity Expand file tree Collapse file tree 1 file changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -7,9 +7,12 @@ package com.wireguard.android.activity
7
7
import android.os.Bundle
8
8
import androidx.databinding.CallbackRegistry
9
9
import androidx.databinding.CallbackRegistry.NotifierCallback
10
+ import androidx.lifecycle.Lifecycle
10
11
import androidx.lifecycle.lifecycleScope
12
+ import androidx.lifecycle.repeatOnLifecycle
11
13
import com.wireguard.android.Application
12
14
import com.wireguard.android.model.ObservableTunnel
15
+ import kotlinx.coroutines.launch
13
16
14
17
/* *
15
18
* Base class for activities that need to remember the currently-selected tunnel.
@@ -37,7 +40,11 @@ abstract class BaseActivity : ThemeChangeAwareActivity() {
37
40
else -> null
38
41
}
39
42
if (savedTunnelName != null )
40
- lifecycleScope.launchWhenCreated { selectedTunnel = Application .getTunnelManager().getTunnels()[savedTunnelName] }
43
+ lifecycleScope.launch {
44
+ repeatOnLifecycle(Lifecycle .State .CREATED ) {
45
+ selectedTunnel = Application .getTunnelManager().getTunnels()[savedTunnelName]
46
+ }
47
+ }
41
48
42
49
// The selected tunnel must be set before the superclass method recreates fragments.
43
50
super .onCreate(savedInstanceState)
You can’t perform that action at this time.
0 commit comments