diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-09 10:12:50 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-13 11:36:41 +0000 |
| commit | fd442e6c21719b8e3546485818f1a93bf142b46b (patch) | |
| tree | c4ace62e8e5cacd0da31eb73ef9582efbb6de5ee /android/src | |
| parent | 7a7f7e1ac97f94ce291c04afe0f1c1261a6b80db (diff) | |
| download | mullvadvpn-fd442e6c21719b8e3546485818f1a93bf142b46b.tar.xz mullvadvpn-fd442e6c21719b8e3546485818f1a93bf142b46b.zip | |
Rename old `MainActivity.serviceConnection` field
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 6 |
1 files changed, 3 insertions, 3 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 8fc70f34a3..6977e06315 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -53,7 +53,7 @@ class MainActivity : FragmentActivity() { private var serviceToStop: MullvadVpnService.LocalBinder? = null private var waitForDaemonJob: Job? = null - private val serviceConnection = object : ServiceConnection { + private val serviceConnectionManager = object : ServiceConnection { override fun onServiceConnected(className: ComponentName, binder: IBinder) { val localBinder = binder as MullvadVpnService.LocalBinder @@ -99,7 +99,7 @@ class MainActivity : FragmentActivity() { val intent = Intent(this, MullvadVpnService::class.java) startService(intent) - bindService(intent, serviceConnection, 0) + bindService(intent, serviceConnectionManager, 0) } override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) { @@ -110,7 +110,7 @@ class MainActivity : FragmentActivity() { quitJob?.cancel() serviceToStop?.apply { stop() } - unbindService(serviceConnection) + unbindService(serviceConnectionManager) super.onStop() } |
