Make `ConnectFragment` service dependent

1 files changed, 3 insertions, 30 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
index 336f3507aa..0bd1fff0d2 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
@@ -1,8 +1,6 @@
 package net.mullvad.mullvadvpn.ui
 
-import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -12,17 +10,12 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache
-import net.mullvad.mullvadvpn.dataproxy.ConnectionProxy
-import net.mullvad.mullvadvpn.dataproxy.KeyStatusListener
-import net.mullvad.mullvadvpn.dataproxy.LocationInfoCache
-import net.mullvad.mullvadvpn.dataproxy.RelayListListener
 import net.mullvad.mullvadvpn.model.KeygenEvent
 import net.mullvad.mullvadvpn.model.TunnelState
 
 val KEY_IS_TUNNEL_INFO_EXPANDED = "is_tunnel_info_expanded"
 
-class ConnectFragment : Fragment() {
+class ConnectFragment : ServiceDependentFragment() {
     private lateinit var actionButton: ConnectActionButton
     private lateinit var switchLocationButton: SwitchLocationButton
     private lateinit var headerBar: HeaderBar
@@ -30,30 +23,12 @@ class ConnectFragment : Fragment() {
     private lateinit var status: ConnectionStatus
     private lateinit var locationInfo: LocationInfo
 
-    private lateinit var parentActivity: MainActivity
-    private lateinit var connectionProxy: ConnectionProxy
-    private lateinit var keyStatusListener: KeyStatusListener
-    private lateinit var locationInfoCache: LocationInfoCache
-    private lateinit var relayListListener: RelayListListener
-    private lateinit var versionInfoCache: AppVersionInfoCache
-
     private lateinit var updateKeyStatusJob: Job
     private var updateTunnelStateJob: Job? = null
 
     private var isTunnelInfoExpanded = false
     private var tunnelStateListener: Int? = null
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-
-        parentActivity = context as MainActivity
-        connectionProxy = parentActivity.connectionProxy
-        keyStatusListener = parentActivity.keyStatusListener
-        locationInfoCache = parentActivity.locationInfoCache
-        relayListListener = parentActivity.relayListListener
-        versionInfoCache = parentActivity.appVersionInfoCache
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -74,10 +49,8 @@ class ConnectFragment : Fragment() {
         }
 
         headerBar = HeaderBar(view, resources)
-        notificationBanner = NotificationBanner(view,
-                                                context!!,
-                                                versionInfoCache,
-                                                parentActivity.wwwAuthTokenRetriever)
+        notificationBanner =
+            NotificationBanner(view, parentActivity, appVersionInfoCache, wwwAuthTokenRetriever)
         status = ConnectionStatus(view, resources)
 
         locationInfo = LocationInfo(view, context!!)