| ... |
... |
@@ -2739,10 +2739,7 @@ class Settings( |
|
2739
|
2739
|
/**
|
|
2740
|
2740
|
* Indicates whether or not to show the entry point for the DNS over HTTPS settings
|
|
2741
|
2741
|
*/
|
|
2742
|
|
- val showDohEntryPoint by booleanPreference(
|
|
2743
|
|
- key = appContext.getPreferenceKey(R.string.pref_key_doh_settings_enabled),
|
|
2744
|
|
- default = { FxNimbus.features.doh.value().showUi },
|
|
2745
|
|
- )
|
|
|
2742
|
+ val showDohEntryPoint = false
|
|
2746
|
2743
|
|
|
2747
|
2744
|
/**
|
|
2748
|
2745
|
* Stores the current DoH mode as an integer preference.
|
| ... |
... |
@@ -2751,28 +2748,19 @@ class Settings( |
|
2751
|
2748
|
* - 3: Maximum protection
|
|
2752
|
2749
|
* - 5: DoH is disabled
|
|
2753
|
2750
|
*/
|
|
2754
|
|
- private var trrMode by intPreference(
|
|
2755
|
|
- key = appContext.getPreferenceKey(R.string.pref_key_doh_settings_mode),
|
|
2756
|
|
- default = DOH_SETTINGS_DEFAULT,
|
|
2757
|
|
- )
|
|
|
2751
|
+ private var trrMode = DOH_SETTINGS_OFF
|
|
2758
|
2752
|
|
|
2759
|
2753
|
/**
|
|
2760
|
2754
|
* Stores the URI of the custom DoH provider selected by the user.
|
|
2761
|
2755
|
* Defaults to an empty string if no provider is set.
|
|
2762
|
2756
|
*/
|
|
2763
|
|
- var dohProviderUrl by stringPreference(
|
|
2764
|
|
- key = appContext.getPreferenceKey(R.string.pref_key_doh_provider_uri),
|
|
2765
|
|
- default = "",
|
|
2766
|
|
- )
|
|
|
2757
|
+ var dohProviderUrl = ""
|
|
2767
|
2758
|
|
|
2768
|
2759
|
/**
|
|
2769
|
2760
|
* Stores the URI of the default DoH provider.
|
|
2770
|
2761
|
* Bug 1946867 - Currently "hardcoded" to "https://mozilla.cloudflare-dns.com/dns-query"
|
|
2771
|
2762
|
*/
|
|
2772
|
|
- val dohDefaultProviderUrl by stringPreference(
|
|
2773
|
|
- key = appContext.getPreferenceKey(R.string.pref_key_doh_default_provider_uri),
|
|
2774
|
|
- default = CLOUDFLARE_URI,
|
|
2775
|
|
- )
|
|
|
2763
|
+ val dohDefaultProviderUrl = ""
|
|
2776
|
2764
|
|
|
2777
|
2765
|
/**
|
|
2778
|
2766
|
* Stores a set of domains that are excluded from using DNS over HTTPS.
|