Merge branch 'remove-public-custom-dns-warning-dialog-on-android'

23 files changed, 7 insertions, 36 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 97e82aa8ca..a045986ca8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
@@ -129,22 +129,19 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
     }
 
     private suspend fun confirmAddAddress(address: InetAddress): Boolean {
-        return when {
-            address.isLinkLocalAddress() || address.isSiteLocalAddress() -> {
-                isAllowLanEnabled || showConfirmDnsServerDialog(R.string.confirm_local_dns)
-            }
-            else -> showConfirmDnsServerDialog(R.string.confirm_public_dns)
-        }
+        val isLocalAddress = address.isLinkLocalAddress() || address.isSiteLocalAddress()
+
+        return !isLocalAddress || isAllowLanEnabled || showConfirmDnsServerDialog()
     }
 
-    private suspend fun showConfirmDnsServerDialog(message: Int): Boolean {
+    private suspend fun showConfirmDnsServerDialog(): Boolean {
         val confirmation = CompletableDeferred<Boolean>()
         val transaction = parentFragmentManager.beginTransaction()
 
         detachBackButtonHandler()
         transaction.addToBackStack(null)
 
-        ConfirmDnsDialogFragment(message, confirmation)
+        ConfirmDnsDialogFragment(confirmation)
             .show(transaction, null)
 
         val result = confirmation.await()
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt
index 054323a314..ef2aa1667b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt
@@ -9,13 +9,11 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams
 import android.widget.Button
-import android.widget.TextView
 import androidx.fragment.app.DialogFragment
 import kotlinx.coroutines.CompletableDeferred
 import net.mullvad.mullvadvpn.R
 
 class ConfirmDnsDialogFragment @JvmOverloads constructor(
-    private val message: Int = R.string.confirm_public_dns,
     private var confirmation: CompletableDeferred<Boolean>? = null
 ) : DialogFragment() {
     override fun onCreateView(
@@ -25,8 +23,6 @@ class ConfirmDnsDialogFragment @JvmOverloads constructor(
     ): View {
         val view = inflater.inflate(R.layout.confirm_dns, container, false)
 
-        view.findViewById<TextView>(R.id.message).setText(message)
-
         view.findViewById<Button>(R.id.back_button).setOnClickListener {
             activity?.onBackPressed()
         }
diff --git a/android/src/main/res/layout/confirm_dns.xml b/android/src/main/res/layout/confirm_dns.xml
index f271d1aa6e..6c7266eae9 100644
--- a/android/src/main/res/layout/confirm_dns.xml
+++ b/android/src/main/res/layout/confirm_dns.xml
@@ -13,14 +13,13 @@
                    android:layout_marginTop="8dp"
                    android:layout_gravity="center"
                    android:src="@drawable/icon_alert" />
-        <TextView android:id="@+id/message"
-                  android:layout_width="wrap_content"
+        <TextView android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:layout_weight="0"
                   android:layout_marginTop="16dp"
                   android:textColor="@color/white80"
                   android:textSize="@dimen/text_small"
-                  android:text="" />
+                  android:text="@string/confirm_local_dns" />
         <Button android:id="@+id/confirm_button"
                 android:layout_marginVertical="@dimen/button_separation"
                 android:text="@string/add_anyway"
diff --git a/android/src/main/res/values-da/strings.xml b/android/src/main/res/values-da/strings.xml
index ab5d62c02c..3f19a5cd06 100644
--- a/android/src/main/res/values-da/strings.xml
+++ b/android/src/main/res/values-da/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">Annuller</string>
     <string name="confirm_local_dns">Den lokale DNS-server fungerer ikke, medmindre du aktiverer \"Lokal netværksdeling\" under Indstillinger.</string>
     <string name="confirm_no_email">Du er ved at sende rapporten om problemet, men har ikke angivet hvordan vi kan kontakte dig. Hvis du ønsker et svar på din rapport, skal du indtaste en e-mail-adresse.</string>
-    <string name="confirm_public_dns">Den DNS-server, du prøver at tilføje, fungerer muligvis ikke, fordi den er offentlig. I øjeblikket understøtter vi kun lokale DNS-servere.</string>
     <string name="congrats">Tillykke!</string>
     <string name="connect">Gør min forbindelse sikker</string>
     <string name="connecting">Tilslutter</string>
diff --git a/android/src/main/res/values-de/strings.xml b/android/src/main/res/values-de/strings.xml
index b66b16b89e..ef80914ed0 100644
--- a/android/src/main/res/values-de/strings.xml
+++ b/android/src/main/res/values-de/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">Abbrechen</string>
     <string name="confirm_local_dns">Der lokale DNS-Server wird nicht funktionieren, solange „Teilen im lokalen Netzwerk“ nicht in den Einstellungen aktiviert ist.</string>
     <string name="confirm_no_email">Sie wollen einen Problembericht senden, ohne uns die Möglichkeit zu geben, Sie zu erreichen. Wenn Sie sich eine Antwort zu Ihrem Problem wünschen, müssen Sie eine E-Mail-Adresse eingeben.</string>
-    <string name="confirm_public_dns">Der DNS-Server, den Sie hinzufügen möchten, könnte ggf. nicht funktionieren, da er öffentlich ist. Aktuell unterstützen wir nur lokale DNS-Server.</string>
     <string name="congrats">Glückwunsch!</string>
     <string name="connect">Meine Verbindung sichern</string>
     <string name="connecting">Verbinden</string>
diff --git a/android/src/main/res/values-es/strings.xml b/android/src/main/res/values-es/strings.xml
index a8590b80da..421cc1acea 100644
--- a/android/src/main/res/values-es/strings.xml
+++ b/android/src/main/res/values-es/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">Cancelar</string>
     <string name="confirm_local_dns">El servidor DNS local no funcionará a no ser que habilite la opción «Uso compartido de red local» en Preferencias.</string>
     <string name="confirm_no_email">Va a enviar el informe de problemas sin indicar una forma de contacto. Para obtener una respuesta sobre el informe, necesita especificar su dirección de correo electrónico.</string>
-    <string name="confirm_public_dns">Es posible que el servidor DNS que intenta agregar no funcione porque es público. Actualmente, solo admitimos servidores DNS locales.</string>
     <string name="congrats">¡Enhorabuena!</string>
     <string name="connect">Proteger mi conexión</string>
     <string name="connecting">Conectando</string>
diff --git a/android/src/main/res/values-fi/strings.xml b/android/src/main/res/values-fi/strings.xml
index 0c736a909c..be5cf41cf5 100644
--- a/android/src/main/res/values-fi/strings.xml
+++ b/android/src/main/res/values-fi/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">Peruuta</string>
     <string name="confirm_local_dns">Paikallinen DNS-palvelin ei toimi, ellet ota paikallisen verkon jakamisasetusta käyttöön Asetuksissa.</string>
     <string name="confirm_no_email">Olet aikeissa lähettää ongelmaraportin ilman yhteystietojasi. Mikäli haluat vastauksen raporttiisi, anna sähköpostosoite.</string>
-    <string name="confirm_public_dns">DNS-palvelin jota yrität lisätä ei ehkä toimi, sillä se on julkinen. Tällä hetkellä tuemme vain paikallisia DNS-palvelimia.</string>
     <string name="congrats">Onnittelut!</string>
     <string name="connect">Suojaa yhteyteni</string>
     <string name="connecting">Yhdistetään</string>
diff --git a/android/src/main/res/values-fr/strings.xml b/android/src/main/res/values-fr/strings.xml
index c9c525e21f..7f8760d755 100644
--- a/android/src/main/res/values-fr/strings.xml
+++ b/android/src/main/res/values-fr/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">Annuler</string>
     <string name="confirm_local_dns">Le serveur DNS local ne fonctionnera pas si vous n\'activez pas le « Partage du réseau local » dans les préférences.</string>
     <string name="confirm_no_email">Vous êtes sur le point d\'envoyer un signalement de problème sans nous fournir un moyen de vous contacter. Si vous désirez une réponse à votre signalement, vous devez saisir une adresse e-mail.</string>
-    <string name="confirm_public_dns">Le serveur DNS que vous essayez d\'ajouter pourrait ne pas fonctionner car il est public. Nous ne prenons actuellement en charge que les serveurs DNS locaux.</string>
     <string name="congrats">Félicitations !</string>
     <string name="connect">Sécuriser ma connexion</string>
     <string name="connecting">Connexion</string>
diff --git a/android/src/main/res/values-it/strings.xml b/android/src/main/res/values-it/strings.xml
index f0f67ebc53..c67410a052 100644
--- a/android/src/main/res/values-it/strings.xml
+++ b/android/src/main/res/values-it/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">Annulla</string>
     <string name="confirm_local_dns">Il server DNS locale non funzionerà a meno che non si abiliti \"Condivisione rete locale\" in Preferenze.</string>
     <string name="confirm_no_email">Stai inviando la segnalazione di un problema senza averci indicato un modo per ricontattarti. Se desideri ricevere risposta, inserisci un indirizzo e-mail.</string>
-    <string name="confirm_public_dns">Il server DNS che stai tentando di aggiungere potrebbe non funzionare poiché è pubblico. Attualmente supportiamo solo server DNS locali.</string>
     <string name="congrats">Complimenti!</string>
     <string name="connect">Proteggi mia connessione</string>
     <string name="connecting">Connessione</string>
diff --git a/android/src/main/res/values-ja/strings.xml b/android/src/main/res/values-ja/strings.xml
index d02642015e..6e5d04a572 100644
--- a/android/src/main/res/values-ja/strings.xml
+++ b/android/src/main/res/values-ja/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">キャンセル</string>
     <string name="confirm_local_dns">環境設定で「ローカルネットワーク共有」を有効にしない限り、ローカルDNSサーバーは機能しません。</string>
     <string name="confirm_no_email">お客様への返信先を入力せずに問題の報告を送信しようとしています。ご報告に対する返信が必要な場合は、返信先のメールアドレスを入力する必要があります。</string>
-    <string name="confirm_public_dns">追加しようとしているDNSサーバーはパブリックのため、機能しない可能性があります。現在はローカルDNSサーバーのみをサポートしています。</string>
     <string name="congrats">おめでとうございます！</string>
     <string name="connect">接続を保護する</string>
     <string name="connecting">接続中</string>
diff --git a/android/src/main/res/values-ko/strings.xml b/android/src/main/res/values-ko/strings.xml
index c213690401..c4e54aadac 100644
--- a/android/src/main/res/values-ko/strings.xml
+++ b/android/src/main/res/values-ko/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">취소</string>
     <string name="confirm_local_dns">환경 설정에서 ”로컬 네트워크 공유”를 활성화하지 않으면 로컬 DNS 서버가 작동하지 않습니다.</string>
     <string name="confirm_no_email">연락처 없이 문제 보고서를 보내려고 합니다. 보고서에 대한 답변을 원하면 이메일 주소를 입력해야 합니다.</string>
-    <string name="confirm_public_dns">추가하려는 DNS 서버가 공용이므로 작동하지 않을 수 있습니다. 현재, 로컬 DNS 서버만 지원됩니다.</string>
     <string name="congrats">축하합니다!</string>
     <string name="connect">내 연결 보안 유지</string>
     <string name="connecting">연결 중</string>
diff --git a/android/src/main/res/values-my/strings.xml b/android/src/main/res/values-my/strings.xml
index 9e2209500a..7187f0c32e 100644
--- a/android/src/main/res/values-my/strings.xml
+++ b/android/src/main/res/values-my/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">မလုပ်တော့ပါ</string>
     <string name="confirm_local_dns">လိုကယ် DNS ဆာဗာသည် လိုလားမှုများအောက်ရှိ \"လိုကယ် ကွန်ရက် ဝေမျှမှု\"ကို မဖွင့်မချင်း အလုပ်လုပ်မည် မဟုတ်ပါ။</string>
     <string name="confirm_no_email">သင်သည် သင့်ထံ ကျွန်ုပ်တို့ ပြန်ဆက်သွယ်နိုင်မည့် နည်းလမ်း မပါဘဲ ပြဿနာ ရီပို့တ်ကို ပေးပို့တော့မည် ဖြစ်ပါသည်။ သင့်ရီပို့တ်အတွက် အဖြေ ရရှိလိုပါက အီမေးလိပ်စာ ဖြည့်သွင်းပေးရပါမည်။</string>
-    <string name="confirm_public_dns">ပေါင်းထည့်ရန် ကြိုးစားနေသည့် DNS ဆာဗာသည် အများသုံးဖြစ်သောကြောင့် အလုပ်မလုပ်နိုင်ပါ။ လက်ရှိ၌ လိုကယ် DNS ဆာဗာများဖြင့်သာ တွဲဖက်လုပ်ဆောင်နိုင်ပါသည်။</string>
     <string name="congrats">ဝမ်းသာပါတယ်။</string>
     <string name="connect">ကျွန်ုပ်၏ ချိတ်ဆက်မှုကို ကာကွယ်ရန်</string>
     <string name="connecting">ချိတ်ဆက်နေပါသည်</string>
diff --git a/android/src/main/res/values-nb/strings.xml b/android/src/main/res/values-nb/strings.xml
index 3dc45a2eff..b9630bf50c 100644
--- a/android/src/main/res/values-nb/strings.xml
+++ b/android/src/main/res/values-nb/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">Avbryt</string>
     <string name="confirm_local_dns">Den lokale DNS-serveren fungerer ikke med mindre du aktiverer «Deling av lokalt nettverk» under Innstillinger.</string>
     <string name="confirm_no_email">Problemrapporten blir nå sendt uten en måte for oss å kontakte deg på. Hvis du ønsker svar på rapporten, må du oppgi en e-postadresse.</string>
-    <string name="confirm_public_dns">DNS-serveren du prøver å legge til fungerer kanskje ikke fordi den er offentlig. Vi støtter for øyeblikket bare lokale DNS-servere.</string>
     <string name="congrats">Gratulerer!</string>
     <string name="connect">Gjør tilkoblingen sikker</string>
     <string name="connecting">Kobler til</string>
diff --git a/android/src/main/res/values-nl/strings.xml b/android/src/main/res/values-nl/strings.xml
index cab79e8986..f597d0246a 100644
--- a/android/src/main/res/values-nl/strings.xml
+++ b/android/src/main/res/values-nl/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">Annuleren</string>
     <string name="confirm_local_dns">De lokale DNS-server werkt niet tenzij u \"Lokale netwerken delen\" inschakelt onder Voorkeuren.</string>
     <string name="confirm_no_email">U staat op het punt om het probleemrapport te verzenden zonder een contactmethode op te geven. Voer een e-mailadres in als u een antwoord wenst op het rapport.</string>
-    <string name="confirm_public_dns">De DNS-server die u probeert toe te voegen, werkt mogelijk niet omdat deze openbaar is. Momenteel ondersteunen we alleen lokale DNS-servers.</string>
     <string name="congrats">Gefeliciteerd!</string>
     <string name="connect">Mijn verbinding beveiligen</string>
     <string name="connecting">Verbinden</string>
diff --git a/android/src/main/res/values-pl/strings.xml b/android/src/main/res/values-pl/strings.xml
index d108f0477d..f75b2a6b7b 100644
--- a/android/src/main/res/values-pl/strings.xml
+++ b/android/src/main/res/values-pl/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">Anuluj</string>
     <string name="confirm_local_dns">Lokalny serwer DNS nie będzie działał, dopóki nie włączysz opcji „Udostępnianie sieci lokalnej” w Preferencjach.</string>
     <string name="confirm_no_email">Za chwilę wyślesz zgłoszenie problemu, nie umożliwiając nam skontaktowania się z Tobą. Aby uzyskać odpowiedź na zgłoszenie, musisz podać adres e-mail.</string>
-    <string name="confirm_public_dns">Dodawany serwer DNS może nie działać, ponieważ jest publiczny. Obecnie obsługujemy wyłącznie lokalne serwery DNS.</string>
     <string name="congrats">Gratulacje!</string>
     <string name="connect">Zabezpiecz moje połączenie</string>
     <string name="connecting">Łączenie</string>
diff --git a/android/src/main/res/values-pt/strings.xml b/android/src/main/res/values-pt/strings.xml
index 201e234894..7ebe9e1125 100644
--- a/android/src/main/res/values-pt/strings.xml
+++ b/android/src/main/res/values-pt/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">Cancelar</string>
     <string name="confirm_local_dns">O servidor DNS local não funcionará exceto se ativar \"Partilha de rede local\" em Preferências.</string>
     <string name="confirm_no_email">Está prestes a enviar o relatório de problema sem que tenhamos uma forma de lhe responder. Se pretender uma resposta ao seu relatório, tem de introduzir um endereço de email.</string>
-    <string name="confirm_public_dns">O servidor DNS que está a tentar adicionar pode não funcionar porque é público. De momento suportamos apenas servidores DNS locais.</string>
     <string name="congrats">Parabéns!</string>
     <string name="connect">Tornar a minha ligação segura</string>
     <string name="connecting">A ligar</string>
diff --git a/android/src/main/res/values-ru/strings.xml b/android/src/main/res/values-ru/strings.xml
index b641b7909b..6dc0e53697 100644
--- a/android/src/main/res/values-ru/strings.xml
+++ b/android/src/main/res/values-ru/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">Отмена</string>
     <string name="confirm_local_dns">Локальный DNS-сервер не будет работать, пока вы не включите «Обмен данными в локальной сети» в разделе «Параметры».</string>
     <string name="confirm_no_email">Вы собираетесь отправить отчет о проблеме, не оставив контакты. Если вы хотите получить ответ, введите свой адрес электронной почты.</string>
-    <string name="confirm_public_dns">Возможно, тот DNS-сервер, что вы пытаетесь добавить, не подходит, так как является общедоступным. В настоящее время мы поддерживаем только локальные DNS-серверы.</string>
     <string name="congrats">Поздравляем!</string>
     <string name="connect">Защитить мое подключение</string>
     <string name="connecting">Идет подключение</string>
diff --git a/android/src/main/res/values-sv/strings.xml b/android/src/main/res/values-sv/strings.xml
index a7ee171470..99a2a0727c 100644
--- a/android/src/main/res/values-sv/strings.xml
+++ b/android/src/main/res/values-sv/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">Avbryt</string>
     <string name="confirm_local_dns">Den lokala DNS-servern fungerar inte om du inte aktiverar \"Lokal nätverksdelning\" under Inställningar.</string>
     <string name="confirm_no_email">Du är på väg att skicka problemrapporten utan att vi har möjlighet att besvara dig. Om du vill ha svar på din rapport måste du ange en e-postadress.</string>
-    <string name="confirm_public_dns">DNS-servern du försöker lägga till kanske inte fungerar eftersom den är offentlig. För närvarande stöder vi bara lokala DNS-servrar.</string>
     <string name="congrats">Grattis!</string>
     <string name="connect">Skydda min anslutning</string>
     <string name="connecting">Ansluter</string>
diff --git a/android/src/main/res/values-th/strings.xml b/android/src/main/res/values-th/strings.xml
index 28aac325b2..043e80dec5 100644
--- a/android/src/main/res/values-th/strings.xml
+++ b/android/src/main/res/values-th/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">ยกเลิก</string>
     <string name="confirm_local_dns">เซิร์ฟเวอร์ DNS ในท้องถิ่นจะไม่ทำงาน เว้นแต่คุณจะเปิดใช้ \"การแชร์ในเครือข่ายท้องถิ่น\" ซึ่งอยู่ในส่วนการกำหนดค่า</string>
     <string name="confirm_no_email">คุณกำลังจะส่งรายงานปัญหา โดยไม่มีการระบุวิธีการติดต่อกลับให้กับเรา และคุณจำเป็นต้องป้อนที่อยู่อีเมลของคุณ หากคุณอยากให้เราตอบกลับการรายงานของคุณ</string>
-    <string name="confirm_public_dns">เซิร์ฟเวอร์ DNS ที่คุณกำลังพยายามเพิ่มอาจไม่สามารถใช้งานได้ เนื่องจากนี่เป็นเซิร์ฟเวอร์สาธารณะ เพราะในปัจจุบัน เรารองรับเซิร์ฟเวอร์ DNS ท้องถิ่นเท่านั้น</string>
     <string name="congrats">ยินดีด้วย!</string>
     <string name="connect">รักษาความปลอดภัยในการเชื่อมต่อ</string>
     <string name="connecting">กำลังเชื่อมต่อ</string>
diff --git a/android/src/main/res/values-tr/strings.xml b/android/src/main/res/values-tr/strings.xml
index 23aa1c7c9c..8b74906032 100644
--- a/android/src/main/res/values-tr/strings.xml
+++ b/android/src/main/res/values-tr/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">İptal et</string>
     <string name="confirm_local_dns">Tercihler sekmesinin altındaki \"Yerel Ağ Paylaşımı\" seçeneğini etkinleştirmediğiniz sürece yerel DNS sunucusu çalışmaz.</string>
     <string name="confirm_no_email">Sorun raporunu, size geri dönüş yapmamıza imkan vermeyen bir şekilde göndermek üzeresiniz. Sorununuz için yanıt almak istiyorsanız bir e-posta adresi girmelisiniz.</string>
-    <string name="confirm_public_dns">Eklemeye çalıştığınız DNS sunucusu genel olduğu için çalışmayabilir. Şu anda sadece yerel DNS sunucularını destekliyoruz.</string>
     <string name="congrats">Tebrikler!</string>
     <string name="connect">Bağlantımı güvenceye al</string>
     <string name="connecting">Bağlanılıyor</string>
diff --git a/android/src/main/res/values-zh-rCN/strings.xml b/android/src/main/res/values-zh-rCN/strings.xml
index 8fc003a443..6b5adf9ddb 100644
--- a/android/src/main/res/values-zh-rCN/strings.xml
+++ b/android/src/main/res/values-zh-rCN/strings.xml
@@ -25,7 +25,6 @@
     <string name="cancel">取消</string>
     <string name="confirm_local_dns">除非您在“偏好设置”下启用“本地网络共享”，否则本地 DNS 服务器将不会运行。</string>
     <string name="confirm_no_email">您即将发送问题报告，但没有提供让我们可以联系到您的方式。如果您希望获得回复，必须输入您的电子邮件地址。</string>
-    <string name="confirm_public_dns">您尝试添加的 DNS 服务器可能无效，因为它是公共 DNS 服务器。目前我们仅支持本地 DNS 服务器。</string>
     <string name="congrats">恭喜！</string>
     <string name="connect">保护我的连接</string>
     <string name="connecting">正在连接</string>
diff --git a/android/src/main/res/values-zh-rTW/strings.xml b/android/src/main/res/values-zh-rTW/strings.xml
index 99a5e5b58d..7076beab4e 100644
--- a/android/src/main/res/values-zh-rTW/strings.xml
+++ b/android/src/main/res/values-zh-rTW/strings.xml
@@ -26,7 +26,6 @@
     <string name="cancel">取消</string>
     <string name="confirm_local_dns">若要使本機 DNS 伺服器運作，需先在「偏好設定」下啟用「本機網路共用」。</string>
     <string name="confirm_no_email">您即將傳送的問題報告未包含回覆方式資訊。如果想收到您這份報告的回覆，請輸入您的電子郵件位址。</string>
-    <string name="confirm_public_dns">您嘗試新增的是公共 DNS 伺服器，因此可能無效。目前我們僅支援本機 DNS 伺服器。</string>
     <string name="congrats">恭喜！</string>
     <string name="connect">保護我的連線</string>
     <string name="connecting">連線中</string>
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index b3a41d876c..6202fe7bbb 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -172,8 +172,6 @@
     <string name="custom_dns_footer">Enable to add at least one DNS server.</string>
     <string name="confirm_local_dns">The local DNS server will not work unless you enable \"Local
     Network Sharing\" under Preferences.</string>
-    <string name="confirm_public_dns">The DNS server you are trying to add might not work because
-    it is public. Currently we only support local DNS servers.</string>
     <string name="add_anyway">Add anyway</string>
     <string name="exclude_applications">Excluded applications</string>
     <string name="all_applications">All applications</string>