diff options
Diffstat (limited to 'android')
10 files changed, 19 insertions, 17 deletions
diff --git a/android/build.gradle b/android/build.gradle index 1c12f86150..4fc1512444 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -100,8 +100,9 @@ repositories { dependencies { implementation 'androidx.appcompat:appcompat:1.2.0' + implementation "androidx.fragment:fragment-ktx:1.3.0" implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.3.0' implementation 'commons-validator:commons-validator:1.7' implementation 'joda-time:joda-time:2.10.2' implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.10' diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt index b2da9f9f2f..5cb2da2152 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt @@ -74,7 +74,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) { } redeemVoucherButton = view.findViewById<RedeemVoucherButton>(R.id.redeem_voucher).apply { - prepare(fragmentManager, jobTracker) + prepare(parentFragmentManager, jobTracker) } view.findViewById<Button>(R.id.logout).setOnClickAction("logout", jobTracker) { @@ -147,7 +147,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) { } private fun showRedeemVoucherDialog() { - val transaction = requireFragmentManager().beginTransaction() + val transaction = parentFragmentManager.beginTransaction() transaction.addToBackStack(null) @@ -167,7 +167,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) { } private fun clearBackStack() { - fragmentManager?.apply { + parentFragmentManager.apply { val firstEntry = getBackStackEntryAt(0) popBackStack(firstEntry.id, FragmentManager.POP_BACK_STACK_INCLUSIVE) @@ -175,7 +175,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) { } private fun goToLoginScreen() { - fragmentManager?.beginTransaction()?.apply { + parentFragmentManager.beginTransaction().apply { setCustomAnimations( R.anim.do_nothing, R.anim.fragment_exit_to_bottom, diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt index b7b9445cbe..4f4210be70 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt @@ -124,7 +124,7 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) { } private fun showConfirmPublicDnsServerDialog(confirmation: CompletableDeferred<Boolean>) { - val transaction = requireFragmentManager().beginTransaction() + val transaction = parentFragmentManager.beginTransaction() detachBackButtonHandler() transaction.addToBackStack(null) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt index c4b06ebd95..1a5ecf51d8 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt @@ -140,7 +140,7 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { } private fun openSwitchLocationScreen() { - fragmentManager?.beginTransaction()?.apply { + parentFragmentManager.beginTransaction().apply { setCustomAnimations( R.anim.fragment_enter_from_bottom, R.anim.do_nothing, @@ -155,7 +155,7 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { private fun openOutOfTimeScreen() { jobTracker.newUiJob("openOutOfTimeScreen") { - fragmentManager?.beginTransaction()?.apply { + parentFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, OutOfTimeFragment()) commit() } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt index ac4470520f..8e665dad01 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt @@ -52,14 +52,14 @@ class LaunchFragment : ServiceAwareFragment() { } private fun advanceToLoginScreen() { - fragmentManager?.beginTransaction()?.apply { + parentFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, LoginFragment()) commit() } } private fun advanceToConnectScreen() { - fragmentManager?.beginTransaction()?.apply { + parentFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, ConnectFragment()) commit() } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt index 528524ac23..b893b6406c 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt @@ -208,7 +208,7 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { } private fun openNextScreen(fragment: Fragment) { - fragmentManager?.beginTransaction()?.apply { + parentFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, fragment) commit() } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt index c1be537c71..89df0bbedb 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -204,6 +204,7 @@ open class MainActivity : FragmentActivity() { } } + @Suppress("DEPRECATION") fun requestVpnPermission(intent: Intent) { startActivityForResult(intent, 0) } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt index fe70519db1..8443d7c530 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt @@ -57,7 +57,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) } redeemButton = view.findViewById<RedeemVoucherButton>(R.id.redeem_voucher).apply { - prepare(fragmentManager, jobTracker) + prepare(parentFragmentManager, jobTracker) } connectionProxy.onStateChange.subscribe(this) { newState -> @@ -135,7 +135,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) } private fun advanceToConnectScreen() { - fragmentManager?.beginTransaction()?.apply { + parentFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, ConnectFragment()) commit() } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt index cd1a64e5ad..d97e3a9ac9 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt @@ -144,7 +144,7 @@ class ProblemReportFragment : BaseFragment() { } private fun showLogs() { - fragmentManager?.beginTransaction()?.apply { + parentFragmentManager.beginTransaction().apply { setCustomAnimations( R.anim.fragment_enter_from_right, R.anim.fragment_half_exit_to_left, @@ -197,7 +197,7 @@ class ProblemReportFragment : BaseFragment() { } private fun showConfirmNoEmailDialog() { - val transaction = requireFragmentManager().beginTransaction() + val transaction = parentFragmentManager.beginTransaction() transaction.addToBackStack(null) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt index a498922911..8d4500c6f2 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt @@ -47,7 +47,7 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { } view.findViewById<RedeemVoucherButton>(R.id.redeem_voucher).apply { - prepare(fragmentManager, jobTracker) + prepare(parentFragmentManager, jobTracker) } return view @@ -119,7 +119,7 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { } private fun advanceToConnectScreen() { - fragmentManager?.beginTransaction()?.apply { + parentFragmentManager.beginTransaction().apply { replace(R.id.main_fragment, ConnectFragment()) commit() } |