Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: switch from using launchWhenCreated to using repeatOnLifecycle

Browse Source 
Apparently the former is deprecated.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2023-03-23 15:01:09 +01:00
parent caf2cded6e
commit f3107e349c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,9 +7,12 @@ package com.wireguard.android.activity
import android.os.Bundle import android.os.Bundle
import androidx.databinding.CallbackRegistry import androidx.databinding.CallbackRegistry
import androidx.databinding.CallbackRegistry.NotifierCallback import androidx.databinding.CallbackRegistry.NotifierCallback
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import com.wireguard.android.Application import com.wireguard.android.Application
import com.wireguard.android.model.ObservableTunnel import com.wireguard.android.model.ObservableTunnel
import kotlinx.coroutines.launch
/** /**
* Base class for activities that need to remember the currently-selected tunnel. * Base class for activities that need to remember the currently-selected tunnel.
@ -37,7 +40,11 @@ abstract class BaseActivity : ThemeChangeAwareActivity() {
else -> null else -> null
} }
if (savedTunnelName != null) if (savedTunnelName != null)
lifecycleScope.launchWhenCreated { selectedTunnel = Application.getTunnelManager().getTunnels()[savedTunnelName] } lifecycleScope.launch {
repeatOnLifecycle(Lifecycle.State.CREATED) {
selectedTunnel = Application.getTunnelManager().getTunnels()[savedTunnelName]
}
}
// The selected tunnel must be set before the superclass method recreates fragments. // The selected tunnel must be set before the superclass method recreates fragments.
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)