summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt14
1 files changed, 4 insertions, 10 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
index 6a330139eb..0b70f8a98e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
@@ -1,6 +1,5 @@
package net.mullvad.mullvadvpn.ui
-import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
@@ -19,9 +18,7 @@ import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.dataproxy.AccountCache
import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache
-class SettingsFragment : Fragment() {
- private lateinit var parentActivity: MainActivity
-
+class SettingsFragment : ServiceAwareFragment() {
private lateinit var accountCache: AccountCache
private lateinit var versionInfoCache: AppVersionInfoCache
@@ -35,12 +32,9 @@ class SettingsFragment : Fragment() {
private var updateLoggedInStatusJob: Job? = null
private var updateVersionInfoJob: Job? = null
- override fun onAttach(context: Context) {
- super.onAttach(context)
-
- parentActivity = context as MainActivity
- accountCache = parentActivity.accountCache
- versionInfoCache = parentActivity.appVersionInfoCache
+ override fun onNewServiceConnection(serviceConnection: ServiceConnection) {
+ accountCache = serviceConnection.accountCache
+ versionInfoCache = serviceConnection.appVersionInfoCache
}
override fun onCreateView(