summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-09-16 20:59:19 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-09-22 11:59:21 +0000
commitc742d394cdcf2efa60645d148b665af0ee6d9a37 (patch)
tree8e2727a22707ebd87ec0bf02e18713c26b17e71f
parent3e552cfc0fd2d9ac1756db6b4cf3e3fed2135b5b (diff)
downloadmullvadvpn-c742d394cdcf2efa60645d148b665af0ee6d9a37.tar.xz
mullvadvpn-c742d394cdcf2efa60645d148b665af0ee6d9a37.zip
Remove quit tracking
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt20
1 files changed, 7 insertions, 13 deletions
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 12f9ef6ecc..8b626eafca 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -27,7 +27,6 @@ class MainActivity : FragmentActivity() {
val problemReport = MullvadProblemReport()
val serviceNotifier = EventNotifier<ServiceConnection?>(null)
- private var quitting = false
private var service: MullvadVpnService.LocalBinder? = null
private var serviceConnection: ServiceConnection? = null
private var shouldConnect = false
@@ -68,8 +67,6 @@ class MainActivity : FragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- quitting = false
-
problemReport.logDirectory.complete(filesDir)
setContentView(R.layout.main)
@@ -88,18 +85,15 @@ class MainActivity : FragmentActivity() {
android.util.Log.d("mullvad", "Starting main activity")
super.onStart()
- if (!quitting) {
- android.util.Log.d("mullvad", "Starting background service")
- val intent = Intent(this, MullvadVpnService::class.java)
-
- if (Build.VERSION.SDK_INT >= 26) {
- startForegroundService(intent)
- } else {
- startService(intent)
- }
+ val intent = Intent(this, MullvadVpnService::class.java)
- bindService(intent, serviceConnectionManager, 0)
+ if (Build.VERSION.SDK_INT >= 26) {
+ startForegroundService(intent)
+ } else {
+ startService(intent)
}
+
+ bindService(intent, serviceConnectionManager, 0)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {