Add dns settings screen

Author: Pururun

android/app/build.gradle.kts

@@ -397,11 +397,13 @@ dependencies {
     implementation(projects.lib.feature.applisting.api)
     implementation(projects.lib.feature.appearance.impl)
     implementation(projects.lib.feature.autoconnect.impl)
-    implementation(projects.lib.feature.customlist.impl)
     implementation(projects.lib.feature.customlist.api)
+    implementation(projects.lib.feature.customlist.impl)
+    implementation(projects.lib.feature.daita.api)
     implementation(projects.lib.feature.daita.impl)
     implementation(projects.lib.feature.deleteaccount.impl)
-    implementation(projects.lib.feature.daita.api)
+    implementation(projects.lib.feature.dns.impl)
+    implementation(projects.lib.feature.dns.api)
     implementation(projects.lib.feature.filter.impl)
     implementation(projects.lib.feature.home.impl)
     implementation(projects.lib.feature.home.api)

android/app/src/main/kotlin/net/mullvad/mullvadvpn/app/MullvadApp.kt

@@ -55,6 +55,7 @@ import net.mullvad.mullvadvpn.feature.autoconnect.impl.navigation.autoConnectEnt
 import net.mullvad.mullvadvpn.feature.customlist.impl.navigation.customListEntry
 import net.mullvad.mullvadvpn.feature.daita.impl.navigation.daitaEntry
 import net.mullvad.mullvadvpn.feature.deleteaccount.impl.navigation.deleteAccountEntry
+import net.mullvad.mullvadvpn.feature.dns.impl.navigation.dnsSettingsEntry
 import net.mullvad.mullvadvpn.feature.filter.impl.navigation.filterEntry
 import net.mullvad.mullvadvpn.feature.home.impl.navigation.homeEntry
 import net.mullvad.mullvadvpn.feature.language.impl.navigation.languageEntry
@@ -152,6 +153,7 @@ fun MullvadApp(serviceConnectionManager: ServiceConnectionManager) {
         splashEntry(nav3)
         splitTunnelingEntry(nav3)
         vpnSettingsEntry(nav3)
+        dnsSettingsEntry(nav3)
     }
 
     SharedTransitionLayout {

android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt

@@ -33,6 +33,8 @@ import net.mullvad.mullvadvpn.feature.customlist.impl.screen.editname.EditCustom
 import net.mullvad.mullvadvpn.feature.customlist.impl.screen.lists.CustomListsViewModel
 import net.mullvad.mullvadvpn.feature.daita.impl.DaitaViewModel
 import net.mullvad.mullvadvpn.feature.deleteaccount.impl.deleteaccountconfirmation.DeleteAccountConfirmationViewModel
+import net.mullvad.mullvadvpn.feature.dns.impl.CustomDnsDialogViewModel
+import net.mullvad.mullvadvpn.feature.dns.impl.DnsSettingsViewModel
 import net.mullvad.mullvadvpn.feature.filter.impl.FilterViewModel
 import net.mullvad.mullvadvpn.feature.home.impl.connect.ConnectViewModel
 import net.mullvad.mullvadvpn.feature.home.impl.connect.notificationbanner.InAppNotificationController
@@ -63,7 +65,6 @@ import net.mullvad.mullvadvpn.feature.splittunneling.impl.applist.ApplicationsPr
 import net.mullvad.mullvadvpn.feature.splittunneling.impl.applist.SplitTunnelingUseCase
 import net.mullvad.mullvadvpn.feature.splittunneling.impl.search.SearchSplitTunnelingViewModel
 import net.mullvad.mullvadvpn.feature.vpnsettings.impl.VpnSettingsViewModel
-import net.mullvad.mullvadvpn.feature.vpnsettings.impl.dns.DnsDialogViewModel
 import net.mullvad.mullvadvpn.feature.vpnsettings.impl.mtu.MtuDialogViewModel
 import net.mullvad.mullvadvpn.lib.common.constant.BillingTypes
 import net.mullvad.mullvadvpn.lib.model.PackageName
@@ -303,7 +304,7 @@ val uiModule = module {
     }
     viewModel { DeviceRevokedViewModel(get(), get(), get(), get()) }
     viewModel { params -> MtuDialogViewModel(navArgs = params.get(), get()) }
-    viewModel { params -> DnsDialogViewModel(navArgs = params.get(), get(), get(), get()) }
+    viewModel { params -> CustomDnsDialogViewModel(navArgs = params.get(), get(), get(), get()) }
     viewModel { params -> CustomPortDialogViewModel(navArgs = params.get()) }
     viewModel { LoginViewModel(get(), get(), get(), get(), get()) }
     viewModel { PrivacyDisclaimerViewModel(get(), IS_PLAY_BUILD) }
@@ -430,8 +431,14 @@ val uiModule = module {
     viewModel { params ->
         SplitTunnelingViewModel(isModal = params.get(), get(), get(), get(), Dispatchers.IO)
     }
-
     viewModel { SearchSplitTunnelingViewModel(get(), get(), Dispatchers.IO) }
+    viewModel { params ->
+        DnsSettingsViewModel(
+            isModal = params.get(),
+            settingsRepository = get(),
+            dispatcher = Dispatchers.IO,
+        )
+    }
 
     // This view model must be single so we correctly attach lifecycle and share it with activity
     single { MullvadAppViewModel(get(), get()) }

android/lib/feature/dns/api/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins { alias(libs.plugins.mullvad.android.library.feature.api) }
+
+android { namespace = "net.mullvad.mullvadvpn.feature.dns.api" }
+
+dependencies { implementation(projects.lib.model) }

android/lib/feature/dns/api/src/main/kotlin/net/mullvad/mullvadvpn/feature/dns/api/ContentBlockersInfoNavKey.kt

@@ -0,0 +1,7 @@
+package net.mullvad.mullvadvpn.feature.dns.api
+
+import kotlinx.parcelize.Parcelize
+import net.mullvad.mullvadvpn.core.NavKey2
+
+@Parcelize
+data object ContentBlockersInfoNavKey : NavKey2

android/lib/feature/dns/api/src/main/kotlin/net/mullvad/mullvadvpn/feature/dns/api/CustomDnsInfoNavKey.kt

@@ -0,0 +1,6 @@
+package net.mullvad.mullvadvpn.feature.dns.api
+
+import kotlinx.parcelize.Parcelize
+import net.mullvad.mullvadvpn.core.NavKey2
+
+@Parcelize data object CustomDnsInfoNavKey : NavKey2

android/lib/feature/dns/api/src/main/kotlin/net/mullvad/mullvadvpn/feature/dns/api/CustomDnsNavKey.kt

@@ -0,0 +1,13 @@
+package net.mullvad.mullvadvpn.feature.dns.api
+
+import kotlinx.parcelize.Parcelize
+import net.mullvad.mullvadvpn.core.NavKey2
+import net.mullvad.mullvadvpn.core.NavResult
+
+@Parcelize data class CustomDnsNavKey(val index: Int? = null, val initialValue: String? = null) : NavKey2
+
+sealed interface CustomDnsNavResult : NavResult {
+    @Parcelize data class Success(val isDnsListEmpty: Boolean) : CustomDnsNavResult
+
+    @Parcelize data object Error : CustomDnsNavResult
+}

android/lib/feature/dns/api/src/main/kotlin/net/mullvad/mullvadvpn/feature/dns/api/DnsSettingsNavKey.kt

@@ -0,0 +1,9 @@
+package net.mullvad.mullvadvpn.feature.dns.api
+
+import kotlinx.parcelize.Parcelize
+import net.mullvad.mullvadvpn.core.NavKey2
+import net.mullvad.mullvadvpn.lib.model.FeatureIndicator
+
+@Parcelize
+data class DnsSettingsNavKey(val selectedFeature: FeatureIndicator? = null, val isModal: Boolean = false) :
+    NavKey2

android/lib/feature/dns/api/src/main/kotlin/net/mullvad/mullvadvpn/feature/dns/api/MalwareInfoNavKey.kt

@@ -0,0 +1,7 @@
+package net.mullvad.mullvadvpn.feature.dns.api
+
+import kotlinx.parcelize.Parcelize
+import net.mullvad.mullvadvpn.core.NavKey2
+
+@Parcelize
+data object MalwareInfoNavKey : NavKey2

android/lib/feature/dns/impl/build.gradle.kts

@@ -0,0 +1,29 @@
+plugins {
+    alias(libs.plugins.mullvad.android.library)
+    alias(libs.plugins.mullvad.android.library.feature.impl)
+    alias(libs.plugins.mullvad.android.library.compose)
+    alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.kotlin.ksp)
+}
+
+android { namespace = "net.mullvad.mullvadvpn.feature.dns.impl" }
+
+dependencies {
+    implementation(projects.lib.feature.dns.api)
+    implementation(projects.lib.repository)
+    implementation(projects.lib.usecase)
+    implementation(projects.lib.ui.util)
+
+    implementation(libs.koin.compose)
+    implementation(libs.arrow)
+    // This dependency can be replaced when minimum SDK is 29 or higher.
+    // It can then be replaced with InetAddress.isNumericAddress
+    implementation(libs.commons.validator) {
+        // This dependency has a known vulnerability
+        // https://osv.dev/vulnerability/GHSA-wxr5-93ph-8wr9
+        // It is not used so let's exclude it.
+        // Unfortunately, this is not possible to do using libs.version.toml
+        // https://github.com/gradle/gradle/issues/26367#issuecomment-2120830998
+        exclude("commons-beanutils", "commons-beanutils")
+    }
+}