From 18f07e27128c6e027f22c670e40751eec9715953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Tue, 2 Aug 2022 16:33:17 +0200
Subject: [PATCH] Rename bundle variable name and value
---
.../briarproject/mailbox/android/ui/MainActivity.kt | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt b/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt
index 6f291f8f..3bc57c2a 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/MainActivity.kt
@@ -64,7 +64,7 @@ class MainActivity : AppCompatActivity(), ActivityResultCallback<ActivityResult>
companion object {
private val LOG = getLogger(MainActivity::class.java)
- const val BUNDLE_LIFECYCLE_BEYOND_NOT_STARTED = "LIFECYCLE_BEYOND_NOT_STARTED"
+ const val BUNDLE_LIFECYCLE_HAS_STARTED = "LIFECYCLE_HAS_STARTED"
}
private val viewModel: MailboxViewModel by viewModels()
@@ -84,8 +84,7 @@ class MainActivity : AppCompatActivity(), ActivityResultCallback<ActivityResult>
// Check if the app has been restored with a UI from an old lifecycle while the app has been
// restarted with a new process and lifecycle. In that case, go back to the init fragment.
if (savedInstanceState != null) {
- val hadBeenStartedOnSave =
- savedInstanceState.getBoolean(BUNDLE_LIFECYCLE_BEYOND_NOT_STARTED)
+ val hadBeenStartedOnSave = savedInstanceState.getBoolean(BUNDLE_LIFECYCLE_HAS_STARTED)
if (viewModel.lifecycleState.value == NOT_STARTED && hadBeenStartedOnSave) {
nav.navigate(actionGlobalInitFragment())
}
@@ -144,9 +143,8 @@ class MainActivity : AppCompatActivity(), ActivityResultCallback<ActivityResult>
// in the background and gets restored from the recent app list after wiping and
// stopping has already completed. In this case onSaveInstanceState() has written
// true to the bundle.
- val savedBeyondNotStarted =
- savedInstanceState.getBoolean(BUNDLE_LIFECYCLE_BEYOND_NOT_STARTED)
- if (!hasDb && savedBeyondNotStarted) {
+ val hadBeenStartedOnSave = savedInstanceState.getBoolean(BUNDLE_LIFECYCLE_HAS_STARTED)
+ if (!hasDb && hadBeenStartedOnSave) {
finish()
startActivity(Intent(this, WipeCompleteActivity::class.java))
return
@@ -170,7 +168,7 @@ class MainActivity : AppCompatActivity(), ActivityResultCallback<ActivityResult>
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
outState.putBoolean(
- BUNDLE_LIFECYCLE_BEYOND_NOT_STARTED,
+ BUNDLE_LIFECYCLE_HAS_STARTED,
viewModel.lifecycleState.value != NOT_STARTED
)
}
--
GitLab