diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 21 |
2 files changed, 0 insertions, 22 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt index 494a5989ec..b92dab3f98 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt @@ -30,7 +30,6 @@ class VpnPermission(private val context: Context, private val endpoint: ServiceE val activityIntent = Intent(context, MainActivity::class.java).apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - putExtra(MainActivity.KEY_SHOULD_CONNECT, true) } isGranted.update(null) 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 ee471da787..6915edfe9f 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -22,17 +22,12 @@ import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnection import net.mullvad.talpid.util.EventNotifier open class MainActivity : FragmentActivity() { - companion object { - const val KEY_SHOULD_CONNECT = "should_connect" - } - val problemReport = MullvadProblemReport() val serviceNotifier = EventNotifier<ServiceConnection?>(null) private var isUiVisible = false private var service: MullvadVpnService.LocalBinder? = null private var serviceConnection: ServiceConnection? = null - private var shouldConnect = false private var visibleSecureScreens = HashSet<Fragment>() private val deviceIsTv by lazy { @@ -63,10 +58,6 @@ open class MainActivity : FragmentActivity() { if (service == null) { serviceNotifier.notify(null) } - - if (shouldConnect) { - tryToConnect() - } } } @@ -99,11 +90,6 @@ open class MainActivity : FragmentActivity() { if (savedInstanceState == null) { addInitialFragment() } - - if (intent.getBooleanExtra(KEY_SHOULD_CONNECT, false)) { - shouldConnect = true - tryToConnect() - } } override fun onStart() { @@ -208,13 +194,6 @@ open class MainActivity : FragmentActivity() { startActivityForResult(intent, 0) } - private fun tryToConnect() { - serviceConnection?.apply { - connectionProxy.connect() - shouldConnect = false - } - } - private fun addInitialFragment() { supportFragmentManager.beginTransaction().apply { add(R.id.main_fragment, LaunchFragment()) |