Commit afff8547 authored by Daniel Wolf's avatar Daniel Wolf
Browse files

Add option to not automatically append "/dns-query" to new DoH servers

parent 99fefa8f
......@@ -182,6 +182,7 @@ class NewServerDialog(
setHintAndTitle(view, title)
primaryServer.text = primaryServer.text
secondaryServer.text = secondaryServer.text
avoidAutomaticPath.visibility = if(type == ServerType.DOH) View.VISIBLE else View.GONE
}
}
if(server != null) {
......@@ -390,6 +391,7 @@ class NewServerDialog(
}.firstOrNull()?.servers?.firstOrNull {
it.address.host == host
}?.address ?: if (path != null) HttpsUpstreamAddress(host, port, path)
else if(avoidAutomaticPath.isChecked) HttpsUpstreamAddress(host, port, null)
else HttpsUpstreamAddress(host, port)
}
......
......@@ -86,5 +86,13 @@
android:nextFocusDown="@id/primaryServer"
android:layout_height="wrap_content"/>
</com.google.android.material.textfield.TextInputLayout>
<CheckBox
android:layout_width="match_parent"
android:id="@+id/avoidAutomaticPath"
android:textColor="?android:textColor"
android:visibility="gone"
android:text="@string/dialog_newserver_avoid_querypath"
android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>
......@@ -225,4 +225,5 @@
<string name="dialog_newdnsrule_block_host">منع هذا المضيف</string>
<string name="dialog_serverimport_servertype_doq">النوع: DNS-over-QUIC (DoQ)</string>
<string name="dialog_newserver_title_quic">اضف سيرفر (DoQ)</string>
<string name="dialog_newserver_avoid_querypath">لا تقم بإلحاق مسار الاستعلام تلقائيًا (/ dns-query)</string>
</resources>
\ No newline at end of file
......@@ -217,4 +217,5 @@
\n
\nNach dem Einstellen starte einfach beide Apps.</string>
<string name="dialog_serverimport_servertype_doq">Typ: DNS-over-QUIC (DoQ)</string>
<string name="dialog_newserver_avoid_querypath">Abfragepfad nicht automatisch anhängen (/dns-query)</string>
</resources>
\ No newline at end of file
......@@ -217,4 +217,5 @@
\n - Inicie Nebulo (en modo no-VPN) e inicie NetGuard</string>
<string name="dialog_serverimport_servertype_doq">Escriba: DNS-over-QUIC (DoQ)</string>
<string name="dialog_newserver_title_quic">Añadir un servidor (DoQ)</string>
<string name="dialog_newserver_avoid_querypath">No añadir automáticamente la ruta de consulta (/dns-query)</string>
</resources>
\ No newline at end of file
......@@ -217,4 +217,5 @@
\nAprès avoir configuré les applications, il suffit de lancer les deux.</string>
<string name="dialog_serverimport_servertype_doq">Tapez : DNS-over-QUIC (DoQ)</string>
<string name="dialog_newserver_title_quic">Ajouter un serveur (DoQ)</string>
<string name="dialog_newserver_avoid_querypath">Ne pas ajouter automatiquement le chemin de la requête (/dns-query)</string>
</resources>
\ No newline at end of file
......@@ -175,4 +175,5 @@
<string name="dialog_share_title"></string>
<string name="dialog_serverimport_servertype_doq"></string>
<string name="dialog_newserver_title_quic"></string>
<string name="dialog_newserver_avoid_querypath">क्वेरी पथ को स्वचालित रूप से न जोड़ें (/dns-query)</string>
</resources>
\ No newline at end of file
......@@ -185,4 +185,5 @@
<string name="dialog_share_title"></string>
<string name="dialog_serverimport_servertype_doq"></string>
<string name="dialog_newserver_title_quic"></string>
<string name="dialog_newserver_avoid_querypath">Jangan menambahkan jalur kueri secara otomatis (/dns-query)</string>
</resources>
\ No newline at end of file
......@@ -221,4 +221,5 @@
\nNon tutte le app VPN ti permettono di cambiare le impostazioni DNS. Se la tua lo fa, imposta il server DNS a \'%1$s:%2$d\' (puoi configurare la porta qua sopra).
\n
\nUna volta configurate le app, avviale entrambe.</string>
<string name="dialog_newserver_avoid_querypath">Non aggiungere automaticamente il percorso della query (/dns-query)</string>
</resources>
\ No newline at end of file
......@@ -222,4 +222,5 @@
\n但しすべてのVPNアプリがDNS設定を変更できるとは限りません。可能な場合は、DNSサーバーを \" %1$s : %2$d \"に設定して下さい(上記のポートを設定します)。
\n
\nアプリを設定したら、両方を起動してください。</string>
<string name="dialog_newserver_avoid_querypath">クエリーパス(/dns-query)を自動的に追加しない。</string>
</resources>
\ No newline at end of file
......@@ -217,4 +217,5 @@
<string name="dialog_newdnsrule_block_host">Blokkeer deze host</string>
<string name="dialog_serverimport_servertype_doq">Type: DNS-over-QUIC (DoQ)</string>
<string name="dialog_newserver_title_quic">Voeg een server toe (DoQ)</string>
<string name="dialog_newserver_avoid_querypath">Voeg niet automatisch query pad toe (/dns-query)</string>
</resources>
\ No newline at end of file
......@@ -221,4 +221,5 @@
<string name="dialog_newdnsrule_block_host">Zablokuj tego host</string>
<string name="dialog_serverimport_servertype_doq">Typ: DNS-over-QUIC (DoQ)</string>
<string name="dialog_newserver_title_quic">Dodaj serwer (DoQ)</string>
<string name="dialog_newserver_avoid_querypath">Nie dołączaj automatycznie ścieżki zapytania (/dns-query)</string>
</resources>
\ No newline at end of file
......@@ -229,4 +229,5 @@
<string name="dialog_serverconfiguration_quic" translatable="false">DNS-sobre-QUIC (DoQ)</string>
<string name="dialog_serverconfiguration_tls" translatable="false">DNS-sobre-TLS (DoT)</string>
<string name="dialog_serverconfiguration_https" translatable="false">DNS-sobre-HTTPS (DoH)</string>
<string name="dialog_newserver_avoid_querypath">Não anexar automaticamente o caminho de consulta (/dns-query)</string>
</resources>
\ No newline at end of file
......@@ -217,4 +217,5 @@
\nDepois de configurar os aplicativos simplesmente inicie ambos.</string>
<string name="dialog_serverimport_servertype_doq">Tipo: DNS-over-QUIC (DoQ)</string>
<string name="dialog_newserver_title_quic">Adicionar um servidor (DoQ)</string>
<string name="dialog_newserver_avoid_querypath">Não anexar automaticamente o caminho de consulta (/dns-query)</string>
</resources>
\ No newline at end of file
......@@ -224,4 +224,5 @@
<string name="dialog_newdnsrule_block_host">Блокировать этот host</string>
<string name="dialog_serverimport_servertype_doq">Тип: DNS-over-QUIC (DoQ)</string>
<string name="dialog_newserver_title_quic">Добавить сервер (DoQ)</string>
<string name="dialog_newserver_avoid_querypath">Не добавлять автоматически путь запроса (/dns-query)</string>
</resources>
\ No newline at end of file
......@@ -172,4 +172,5 @@
<string name="dialog_share_title"></string>
<string name="dialog_serverimport_servertype_doq"></string>
<string name="dialog_newserver_title_quic"></string>
<string name="dialog_newserver_avoid_querypath">Sorgu yolunu (/dns-query) otomatik olarak ekleme</string>
</resources>
\ No newline at end of file
......@@ -8,4 +8,5 @@
<string name="dialog_speedtestpasses_message"></string>
<string name="dialog_serverimport_servertype_doq"></string>
<string name="dialog_newserver_title_quic"></string>
<string name="dialog_newserver_avoid_querypath">Không tự động nối thêm đường dẫn truy vấn (/ dns-query)</string>
</resources>
\ No newline at end of file
......@@ -217,4 +217,5 @@
<string name="dialog_newdnsrule_block_host">屏蔽该host</string>
<string name="dialog_serverimport_servertype_doq">类型:DNS-over-TLS(DoQ)</string>
<string name="dialog_newserver_title_quic">添加服务器(DoQ)</string>
<string name="dialog_newserver_avoid_querypath">不要自动附加查询路径(/dns-query)。</string>
</resources>
\ No newline at end of file
......@@ -19,6 +19,7 @@
<string name="dialog_newserver_secondaryserver_hint" translatable="false">example-doh.com[/dns-query]</string>
<string name="dialog_newserver_secondaryserver_hint_dot" translatable="false">example-dot.com[:443]</string>
<string name="dialog_newserver_secondaryserver_hint_doq" translatable="false">example-doq.com[/dns-query]</string>
<string name="dialog_newserver_avoid_querypath">Do not automatically append query path (/dns-query)</string>
<string name="dialog_deleteconfig_title">Delete configuration?</string>
<string name="dialog_deleteconfig_text">Do you want to delete the configuration %1$s?</string>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment