Ensure code only run when created

shadowsocks · Jan 19, 2020 · e9dc275 · e9dc275
1 parent 3d079f2
commit e9dc275
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt b/mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
@@ -32,6 +32,7 @@ import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.whenCreated
 import androidx.preference.*
 import com.github.shadowsocks.database.Profile
 import com.github.shadowsocks.database.ProfileManager
@@ -171,7 +172,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
  super.onAttach(context)
  receiver = context.listenForPackageChanges(false) {
  lifecycleScope.launch(Dispatchers.Main) { // wait until changes were flushed
- lifecycleScope.launchWhenCreated { initPlugins() }
+ whenCreated { initPlugins() }
  }
  }
  }

diff --git a/mobile/src/main/java/com/github/shadowsocks/widget/StatsBar.kt b/mobile/src/main/java/com/github/shadowsocks/widget/StatsBar.kt
@@ -30,12 +30,14 @@ import androidx.appcompat.widget.TooltipCompat
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.observe
+import androidx.lifecycle.whenStarted
 import com.github.shadowsocks.MainActivity
 import com.github.shadowsocks.R
 import com.github.shadowsocks.bg.BaseService
 import com.github.shadowsocks.net.HttpsTest
 import com.google.android.material.bottomappbar.BottomAppBar
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 class StatsBar @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null,
@@ -76,8 +78,8 @@ class StatsBar @JvmOverloads constructor(context: Context, attrs: AttributeSet?
 
  fun changeState(state: BaseService.State) {
  val activity = context as MainActivity
- fun postWhenStarted(what: () -> Unit) = activity.lifecycleScope.launchWhenStarted {
- withContext(Dispatchers.Main) { what() }
+ fun postWhenStarted(what: () -> Unit) = activity.lifecycleScope.launch {
+ withContext(Dispatchers.Main) { activity.whenStarted { what() } }
  }
  if ((state == BaseService.State.Connected).also { hideOnScroll = it }) {
  postWhenStarted { performShow() }