diff options
| author | Torsten Grote <t@grobox.de> | 2023-04-11 12:13:26 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2023-04-11 12:13:26 -0300 |
| commit | 92045c93baf45e627254246db4ea21f1eee11ce0 (patch) | |
| tree | 04bd2b4dd092db064dc5c006f372577d1d40c104 /merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt | |
| parent | f5aced13fda3132d5ee3a6947fe95f7b7b22b98a (diff) | |
| download | taler-android-92045c93baf45e627254246db4ea21f1eee11ce0.tar.gz taler-android-92045c93baf45e627254246db4ea21f1eee11ce0.tar.bz2 taler-android-92045c93baf45e627254246db4ea21f1eee11ce0.zip | |
[pos] Ask for config on first start
prevents connection to demo URL without user confirmation
Diffstat (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt')
| -rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt index 5609429..4a46b27 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt @@ -75,8 +75,8 @@ class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener { override fun onStart() { super.onStart() - if (!model.configManager.config.isValid() && nav.currentDestination?.id != R.id.nav_settings) { - nav.navigate(R.id.action_global_merchantSettings) + if (!model.configManager.config.isValid()) { + if (nav.currentDestination?.id != R.id.nav_settings) nav.navigate(R.id.action_global_merchantSettings) } else if (model.configManager.merchantConfig == null && nav.currentDestination?.id != R.id.configFetcher) { nav.navigate(R.id.action_global_configFetcher) } |