summaryrefslogtreecommitdiffhomepage
path: root/android/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'android/app/src/main')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt13
1 files changed, 1 insertions, 12 deletions
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 e8c8cefb81..2ff152707d 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
@@ -73,8 +73,6 @@ open class MainActivity : FragmentActivity() {
uiModeManager.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION
}
- var backButtonHandler: (() -> Boolean)? = null
-
private lateinit var accountRepository: AccountRepository
private lateinit var deviceRepository: DeviceRepository
private lateinit var privacyDisclaimerRepository: PrivacyDisclaimerRepository
@@ -135,14 +133,6 @@ open class MainActivity : FragmentActivity() {
serviceConnectionManager.onVpnPermissionResult(resultCode == Activity.RESULT_OK)
}
- override fun onBackPressed() {
- val handled = backButtonHandler?.invoke() ?: false
-
- if (!handled) {
- super.onBackPressed()
- }
- }
-
override fun onStop() {
Log.d("mullvad", "Stopping main activity")
super.onStop()
@@ -317,8 +307,7 @@ open class MainActivity : FragmentActivity() {
.filter { it is AccountExpiry.Available }
.map { it.date()?.isBeforeNow }
.first()
- }
- ?: false
+ } ?: false
}
private fun openLoginView() {