diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-30 15:06:26 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-30 16:08:05 +0000 |
| commit | d830c52b8f38234c24b9b6106bcd50fc89fea999 (patch) | |
| tree | 8f154675090c3ff50c71d31a212f159854ac50ff /android | |
| parent | a304161878399dcd249e32043975c9ce89859a70 (diff) | |
| download | mullvadvpn-d830c52b8f38234c24b9b6106bcd50fc89fea999.tar.xz mullvadvpn-d830c52b8f38234c24b9b6106bcd50fc89fea999.zip | |
Don't advance screen after leaving launch screen
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt index 67043b6162..ccc20cbd07 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt @@ -23,7 +23,6 @@ class LaunchFragment : Fragment() { super.onAttach(context) parentActivity = context as MainActivity accountTokenCheckJob = checkForAccountToken() - advanceToNextScreenJob = advanceToNextScreen() } override fun onCreateView( @@ -40,9 +39,18 @@ class LaunchFragment : Fragment() { return view } + override fun onResume() { + super.onResume() + advanceToNextScreenJob = advanceToNextScreen() + } + + override fun onPause() { + advanceToNextScreenJob.cancel() + super.onPause() + } + override fun onDestroy() { accountTokenCheckJob.cancel() - advanceToNextScreenJob.cancel() super.onDestroy() } |
