diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-09 11:49:43 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-17 15:54:36 +0000 |
| commit | bec34b3dd3c1bdcf70b8cfb4ddb88bd3fa14dadd (patch) | |
| tree | be8d80719cda13359eb691e0a87318f7fa1c8cfe /android/src | |
| parent | f6fc57c709fe4c07109fb5b0cc3d781b7856f2be (diff) | |
| download | mullvadvpn-bec34b3dd3c1bdcf70b8cfb4ddb88bd3fa14dadd.tar.xz mullvadvpn-bec34b3dd3c1bdcf70b8cfb4ddb88bd3fa14dadd.zip | |
Make `WireguardKeyFragment` service dependent
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt index 49537c7d75..7bf8174ebe 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt @@ -6,7 +6,6 @@ import android.content.Context import android.content.Intent import android.net.Uri import android.os.Bundle -import android.support.v4.app.Fragment import android.util.Base64 import android.view.LayoutInflater import android.view.View @@ -21,9 +20,6 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.Job import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.dataproxy.ConnectionProxy -import net.mullvad.mullvadvpn.dataproxy.KeyStatusListener -import net.mullvad.mullvadvpn.dataproxy.WwwAuthTokenRetriever import net.mullvad.mullvadvpn.model.KeygenEvent import net.mullvad.mullvadvpn.model.KeygenFailure import net.mullvad.mullvadvpn.model.TunnelState @@ -34,15 +30,11 @@ import org.joda.time.format.DateTimeFormat val RFC3339_FORMAT = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm:ss.SSSSSSSSSS z") val KEY_AGE_FORMAT = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm") -class WireguardKeyFragment : Fragment() { +class WireguardKeyFragment : ServiceDependentFragment() { private var currentJob: Job? = null private var updateViewsJob: Job? = null private var tunnelStateListener: Int? = null private var tunnelState: TunnelState = TunnelState.Disconnected() - private lateinit var connectionProxy: ConnectionProxy - private lateinit var keyStatusListener: KeyStatusListener - private lateinit var parentActivity: MainActivity - private lateinit var wwwTokenRetriever: WwwAuthTokenRetriever private lateinit var urlController: BlockingController private var generatingKey = false private var validatingKey = false @@ -56,14 +48,6 @@ class WireguardKeyFragment : Fragment() { private lateinit var verifyButton: Button private lateinit var verifySpinner: ProgressBar - override fun onAttach(context: Context) { - super.onAttach(context) - parentActivity = context as MainActivity - keyStatusListener = parentActivity.keyStatusListener - connectionProxy = parentActivity.connectionProxy - wwwTokenRetriever = parentActivity.wwwAuthTokenRetriever - } - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -101,7 +85,7 @@ class WireguardKeyFragment : Fragment() { override fun onClick(): Job { return GlobalScope.launch(Dispatchers.Default) { - val token = wwwTokenRetriever.getAuthToken() + val token = wwwAuthTokenRetriever.getAuthToken() val intent = Intent(Intent.ACTION_VIEW, Uri.parse(keyUrl + "?token=" + token)) startActivity(intent) |