diff options
author | Torsten Grote <t@grobox.de> | 2020-08-27 16:42:03 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-08-27 16:42:03 -0300 |
commit | 53d99e46e6b34d4437f46266cb797a65c0736803 (patch) | |
tree | 23f21d022abea280132e3440b3825a71483c7bd2 /cashier/src/main/java/net/taler/cashier/MainActivity.kt | |
parent | ed3f86481a71517e7bf6ffa46dc8d160b508ec38 (diff) | |
download | taler-android-53d99e46e6b34d4437f46266cb797a65c0736803.tar.gz taler-android-53d99e46e6b34d4437f46266cb797a65c0736803.tar.bz2 taler-android-53d99e46e6b34d4437f46266cb797a65c0736803.zip |
[cashier] don't crash on unexpected network input
Diffstat (limited to 'cashier/src/main/java/net/taler/cashier/MainActivity.kt')
-rw-r--r-- | cashier/src/main/java/net/taler/cashier/MainActivity.kt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cashier/src/main/java/net/taler/cashier/MainActivity.kt b/cashier/src/main/java/net/taler/cashier/MainActivity.kt index 0559b38..ae31be5 100644 --- a/cashier/src/main/java/net/taler/cashier/MainActivity.kt +++ b/cashier/src/main/java/net/taler/cashier/MainActivity.kt @@ -30,6 +30,7 @@ import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { private val viewModel: MainViewModel by viewModels() + private val configManager by lazy { viewModel.configManager} private lateinit var nav: NavController override fun onCreate(savedInstanceState: Bundle?) { @@ -43,13 +44,13 @@ class MainActivity : AppCompatActivity() { override fun onStart() { super.onStart() - if (!viewModel.hasConfig()) { - nav.navigate(viewModel.configDestination) + if (!configManager.hasConfig()) { + nav.navigate(configManager.configDestination) } } override fun onBackPressed() { - if (!viewModel.hasConfig() && nav.currentDestination?.id == R.id.configFragment) { + if (!configManager.hasConfig() && nav.currentDestination?.id == R.id.configFragment) { // we are in the configuration screen and need a config to continue val intent = Intent(ACTION_MAIN).apply { addCategory(CATEGORY_HOME) |