diff options
| author | Albin <albin@mullvad.net> | 2022-08-29 16:07:23 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-09-01 16:19:13 +0200 |
| commit | 2eff5a26ca2b9e99d5b363748f0e61cf668797eb (patch) | |
| tree | f2428f2d474302186c59da3bd0657836987b8e95 /android/app/src | |
| parent | a65eac93eda03d5e3ab5ad279fd12cda2dd396c7 (diff) | |
| download | mullvadvpn-2eff5a26ca2b9e99d5b363748f0e61cf668797eb.tar.xz mullvadvpn-2eff5a26ca2b9e99d5b363748f0e61cf668797eb.zip | |
Fix view transition crash
Fixes view transition crashes by allowing state loss as view models are
used rather than the instance state.
Diffstat (limited to 'android/app/src')
8 files changed, 13 insertions, 13 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt index 37fb6108a6..79c0783fcd 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt @@ -247,7 +247,7 @@ class ConnectFragment : BaseFragment(), NavigationBarPainter { ) replace(R.id.main_fragment, SelectLocationFragment()) addToBackStack(null) - commit() + commitAllowingStateLoss() } } @@ -255,7 +255,7 @@ class ConnectFragment : BaseFragment(), NavigationBarPainter { jobTracker.newUiJob("openOutOfTimeScreen") { parentFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, OutOfTimeFragment()) - commit() + commitAllowingStateLoss() } } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt index f4cdc8b14f..07e7748935 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt @@ -191,7 +191,7 @@ class LoginFragment : BaseFragment(), NavigationBarPainter { ) replace(R.id.main_fragment, deviceFragment) addToBackStack(null) - commit() + commitAllowingStateLoss() } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt index 9e1448d006..b9391edd0e 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -144,7 +144,7 @@ open class MainActivity : FragmentActivity() { ) replace(R.id.main_fragment, SettingsFragment()) addToBackStack(null) - commit() + commitAllowingStateLoss() } } @@ -188,7 +188,7 @@ open class MainActivity : FragmentActivity() { private fun openLaunchView() { supportFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, LaunchFragment()) - commit() + commitAllowingStateLoss() } } @@ -214,7 +214,7 @@ open class MainActivity : FragmentActivity() { supportFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, fragment) - commit() + commitAllowingStateLoss() } } @@ -231,7 +231,7 @@ open class MainActivity : FragmentActivity() { clearBackStack() supportFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, LoginFragment()) - commit() + commitAllowingStateLoss() } } @@ -244,7 +244,7 @@ open class MainActivity : FragmentActivity() { R.anim.fragment_exit_to_right ) replace(R.id.main_fragment, DeviceRevokedFragment()) - commit() + commitAllowingStateLoss() } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt index ce6c2f690f..d0ded3f4da 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt @@ -196,7 +196,7 @@ class OutOfTimeFragment : BaseFragment() { private fun advanceToConnectScreen() { parentFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, ConnectFragment()) - commit() + commitAllowingStateLoss() } } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt index d97e3a9ac9..e41163486b 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt @@ -153,7 +153,7 @@ class ProblemReportFragment : BaseFragment() { ) replace(R.id.main_fragment, ViewLogsFragment()) addToBackStack(null) - commit() + commitAllowingStateLoss() } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt index 925fe67b43..4d77389dc6 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt @@ -194,7 +194,7 @@ class WelcomeFragment : BaseFragment() { private fun advanceToConnectScreen() { parentFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, ConnectFragment()) - commit() + commitAllowingStateLoss() } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/DeviceListFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/DeviceListFragment.kt index 7c7e3c4658..2b9a60653e 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/DeviceListFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/DeviceListFragment.kt @@ -85,7 +85,7 @@ class DeviceListFragment : Fragment() { } parentFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, loginFragment) - commit() + commitAllowingStateLoss() } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NavigateCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NavigateCell.kt index 31fd5f5095..a334618e3c 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NavigateCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NavigateCell.kt @@ -46,7 +46,7 @@ open class NavigateCell : Cell { ) replace(R.id.main_fragment, fragment) addToBackStack(null) - commit() + commitAllowingStateLoss() } } } |
