Skip to content

Commit f3107e3

Browse files
committed
ui: switch from using launchWhenCreated to using repeatOnLifecycle
Apparently the former is deprecated. Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent caf2cde commit f3107e3

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ package com.wireguard.android.activity
77
import android.os.Bundle
88
import androidx.databinding.CallbackRegistry
99
import androidx.databinding.CallbackRegistry.NotifierCallback
10+
import androidx.lifecycle.Lifecycle
1011
import androidx.lifecycle.lifecycleScope
12+
import androidx.lifecycle.repeatOnLifecycle
1113
import com.wireguard.android.Application
1214
import com.wireguard.android.model.ObservableTunnel
15+
import kotlinx.coroutines.launch
1316

1417
/**
1518
* Base class for activities that need to remember the currently-selected tunnel.
@@ -37,7 +40,11 @@ abstract class BaseActivity : ThemeChangeAwareActivity() {
3740
else -> null
3841
}
3942
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+
}
4148

4249
// The selected tunnel must be set before the superclass method recreates fragments.
4350
super.onCreate(savedInstanceState)

0 commit comments

Comments
 (0)