diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-02 16:18:16 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-10 12:55:06 +0000 |
| commit | a0ee968ac308b360d50bb3ec0924293dd35486b8 (patch) | |
| tree | 1717adb28dc85de61a20d810dc769d4e66212bf8 /android/src/main | |
| parent | e5f799d41f4c5138f3218cc24725bc54d6458100 (diff) | |
| download | mullvadvpn-a0ee968ac308b360d50bb3ec0924293dd35486b8.tar.xz mullvadvpn-a0ee968ac308b360d50bb3ec0924293dd35486b8.zip | |
Require `CustomDns` helper instance in the adapter
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt | 5 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt index b7b374c4dc..f50f65e410 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt @@ -14,8 +14,7 @@ import net.mullvad.mullvadvpn.ui.widget.NavigateCell import net.mullvad.mullvadvpn.util.AdapterWithHeader class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) { - private val customDnsAdapter = CustomDnsAdapter() - + private lateinit var customDnsAdapter: CustomDnsAdapter private lateinit var wireguardMtuInput: MtuCell private lateinit var titleController: CollapsibleTitleController @@ -32,6 +31,8 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) { titleController = CollapsibleTitleController(view, R.id.contents) + customDnsAdapter = CustomDnsAdapter(customDns) + view.findViewById<CustomRecyclerView>(R.id.contents).apply { layoutManager = LinearLayoutManager(parentActivity) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt index 139730d4b7..3abe3c59f5 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt @@ -4,8 +4,9 @@ import android.support.v7.widget.RecyclerView.Adapter import android.view.LayoutInflater import android.view.ViewGroup import net.mullvad.mullvadvpn.R +import net.mullvad.mullvadvpn.service.CustomDns -class CustomDnsAdapter : Adapter<CustomDnsItemHolder>() { +class CustomDnsAdapter(val customDns: CustomDns) : Adapter<CustomDnsItemHolder>() { override fun getItemCount() = 1 override fun onCreateViewHolder(parentView: ViewGroup, type: Int): CustomDnsItemHolder { |