Add DoH back

JSDelivr is no longer China friendly

app/src/main/java/com/topjohnwu/magisk/core/Config.kt

@@ -60,6 +60,7 @@ object Config : PreferenceModel, DBConfig {
         const val THEME_ORDINAL = "theme_ordinal"
         const val BOOT_ID = "boot_id"
         const val ASKED_HOME = "asked_home"
+        const val DOH = "doh"
     }
 
     object Value {
@@ -131,6 +132,7 @@ object Config : PreferenceModel, DBConfig {
     var suReAuth by preference(Key.SU_REAUTH, false)
     var suTapjack by preference(Key.SU_TAPJACK, true)
     var checkUpdate by preference(Key.CHECK_UPDATES, true)
+    var doh by preference(Key.DOH, false)
     var showSystemApp by preference(Key.SHOW_SYSTEM_APP, false)
 
     var customChannelUrl by preference(Key.CUSTOM_CHANNEL, "")

app/src/main/java/com/topjohnwu/magisk/di/Networking.kt

@@ -4,18 +4,53 @@ import android.content.Context
 import com.squareup.moshi.Moshi
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.ProviderInstaller
+import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.ktx.precomputedText
 import com.topjohnwu.magisk.utils.MarkwonImagePlugin
 import io.noties.markwon.Markwon
 import io.noties.markwon.html.HtmlPlugin
 import okhttp3.Cache
+import okhttp3.Dns
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
+import okhttp3.dnsoverhttps.DnsOverHttps
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import java.io.File
+import java.net.InetAddress
+import java.net.UnknownHostException
+
+private class DnsResolver(client: OkHttpClient) : Dns {
+
+    private val doh by lazy {
+        DnsOverHttps.Builder().client(client)
+            .url("https://cloudflare-dns.com/dns-query".toHttpUrl())
+            .bootstrapDnsHosts(listOf(
+                InetAddress.getByName("162.159.36.1"),
+                InetAddress.getByName("162.159.46.1"),
+                InetAddress.getByName("1.1.1.1"),
+                InetAddress.getByName("1.0.0.1"),
+                InetAddress.getByName("2606:4700:4700::1111"),
+                InetAddress.getByName("2606:4700:4700::1001"),
+                InetAddress.getByName("2606:4700:4700::0064"),
+                InetAddress.getByName("2606:4700:4700::6400")
+            ))
+            .resolvePrivateAddresses(true)  /* To make PublicSuffixDatabase never used */
+            .build()
+    }
+
+    override fun lookup(hostname: String): List<InetAddress> {
+        if (Config.doh) {
+            try {
+                return doh.lookup(hostname)
+            } catch (e: UnknownHostException) {}
+        }
+        return Dns.SYSTEM.lookup(hostname)
+    }
+}
 
 
 fun createOkHttpClient(context: Context): OkHttpClient {
@@ -32,6 +67,7 @@ fun createOkHttpClient(context: Context): OkHttpClient {
         Info.hasGMS = false
     }
 
+    builder.dns(DnsResolver(builder.build()))
     return builder.build()
 }
 

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt

@@ -189,6 +189,15 @@ object UpdateChecker : BaseSettingsItem.Toggle() {
         }
 }
 
+object DoHToggle : BaseSettingsItem.Toggle() {
+    override val title = R.string.settings_doh_title.asText()
+    override val description = R.string.settings_doh_description.asText()
+    override var value = Config.doh
+        set(value) = setV(value, field, { field = it }) {
+            Config.doh = it
+        }
+}
+
 // check whether is module already installed beforehand?
 object SystemlessHosts : BaseSettingsItem.Blank() {
     override val title = R.string.settings_hosts_title.asText()

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt

@@ -52,7 +52,7 @@ class SettingsViewModel : BaseViewModel(), BaseSettingsItem.Callback {
         // Manager
         list.addAll(listOf(
             AppSettings,
-            UpdateChannel, UpdateChannelUrl, UpdateChecker, DownloadPath
+            UpdateChannel, UpdateChannelUrl, DoHToggle, UpdateChecker, DownloadPath
         ))
         if (Info.env.isActive) {
             if (Const.USER_ID == 0) {