Merge branch '333-fix_coroutine_blocker' into 'main' (6fe33655) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/ui/MainActivity.kt

+25 −11

Original line number	Diff line number	Diff line
		@@ -26,9 +26,11 @@ import android.os.StatFs
		import android.os.storage.StorageManager
		import android.view.View
		import androidx.appcompat.app.AppCompatActivity
		import androidx.lifecycle.Lifecycle
		import androidx.lifecycle.ViewModelProvider
		import androidx.lifecycle.distinctUntilChanged
		import androidx.lifecycle.lifecycleScope
		import androidx.lifecycle.repeatOnLifecycle
		import androidx.navigation.NavController
		import androidx.navigation.NavOptions
		import androidx.navigation.findNavController
		@@ -124,6 +126,7 @@ class MainActivity : AppCompatActivity() {
		navController.popBackStack()
		navController.navigate(R.id.signInFragment)
		}

		else -> {}
		}

		@@ -154,6 +157,7 @@ class MainActivity : AppCompatActivity() {
		R.id.signInFragment -> {
		bottomNavigationView.visibility = View.GONE
		}

		else -> {
		bottomNavigationView.visibility = View.VISIBLE
		}
		@@ -217,9 +221,20 @@ class MainActivity : AppCompatActivity() {

		viewModel.updateAppWarningList()

		lifecycleScope.launchWhenResumed {
		lifecycleScope.launch {
		repeatOnLifecycle(Lifecycle.State.STARTED) {
		launch {
		observeInvalidAuth()
		}

		launch {
		observeSignatureMissMatchError()
		}
		}
		}
		}

		private suspend fun observeSignatureMissMatchError() {
		EventBus.events.filter { appEvent ->
		appEvent is AppEvent.SignatureMissMatchError
		}.collectLatest {
		@@ -231,7 +246,6 @@ class MainActivity : AppCompatActivity() {
		).show(supportFragmentManager, TAG)
		}
		}
		}

		private suspend fun observeInvalidAuth() {
		EventBus.events.filter { appEvent ->