From 270183b19d8a58def27ff1d1a2db4dde904a388e Mon Sep 17 00:00:00 2001 From: ukanth Date: Mon, 4 Mar 2024 22:24:21 +0530 Subject: [PATCH 1/2] Removed dns proxy changes introduced in android 4.1 --- app/build.gradle | 6 ++-- .../main/java/dev/ukanth/ufirewall/Api.java | 34 ++++++++----------- .../java/dev/ukanth/ufirewall/util/G.java | 4 --- app/src/main/res/values-af/strings.xml | 2 -- app/src/main/res/values-ar/strings.xml | 2 -- app/src/main/res/values-ast-rES/strings.xml | 2 -- app/src/main/res/values-az/strings.xml | 2 -- app/src/main/res/values-bg/strings.xml | 2 -- app/src/main/res/values-bi/strings.xml | 2 -- app/src/main/res/values-bn/strings.xml | 2 -- app/src/main/res/values-bs/strings.xml | 2 -- app/src/main/res/values-ca/strings.xml | 2 -- app/src/main/res/values-cs/strings.xml | 2 -- app/src/main/res/values-da/strings.xml | 2 -- app/src/main/res/values-de/strings.xml | 2 -- app/src/main/res/values-el/strings.xml | 2 -- app/src/main/res/values-es/strings.xml | 2 -- app/src/main/res/values-eu/strings.xml | 2 -- app/src/main/res/values-fa/strings.xml | 2 -- app/src/main/res/values-fi/strings.xml | 2 -- app/src/main/res/values-fr/strings.xml | 2 -- app/src/main/res/values-he/strings.xml | 2 -- app/src/main/res/values-hi/strings.xml | 2 -- app/src/main/res/values-hr/strings.xml | 2 -- app/src/main/res/values-hu/strings.xml | 2 -- app/src/main/res/values-in/strings.xml | 2 -- app/src/main/res/values-it/strings.xml | 2 -- app/src/main/res/values-ja/strings.xml | 2 -- app/src/main/res/values-kn/strings.xml | 2 -- app/src/main/res/values-ko/strings.xml | 2 -- app/src/main/res/values-ku/strings.xml | 2 -- app/src/main/res/values-ky/strings.xml | 2 -- app/src/main/res/values-ml-rIN/strings.xml | 2 -- app/src/main/res/values-ms/strings.xml | 2 -- app/src/main/res/values-nb/strings.xml | 2 -- app/src/main/res/values-nl/strings.xml | 2 -- app/src/main/res/values-pl/strings.xml | 2 -- app/src/main/res/values-pt-rBR/strings.xml | 2 -- app/src/main/res/values-pt/strings.xml | 2 -- app/src/main/res/values-ro/strings.xml | 2 -- app/src/main/res/values-ru/strings.xml | 2 -- app/src/main/res/values-si/strings.xml | 2 -- app/src/main/res/values-sk/strings.xml | 2 -- app/src/main/res/values-sl/strings.xml | 2 -- app/src/main/res/values-sr-rCS/strings.xml | 2 -- app/src/main/res/values-sr/strings.xml | 2 -- app/src/main/res/values-sv/strings.xml | 2 -- app/src/main/res/values-ta/strings.xml | 2 -- app/src/main/res/values-th/strings.xml | 2 -- app/src/main/res/values-tr/strings.xml | 2 -- app/src/main/res/values-uk/strings.xml | 2 -- app/src/main/res/values-ur-rPK/strings.xml | 2 -- app/src/main/res/values-vi/strings.xml | 2 -- app/src/main/res/values-zh-rCN/strings.xml | 2 -- app/src/main/res/values-zh-rTW/strings.xml | 2 -- app/src/main/res/values-zh/strings.xml | 2 -- app/src/main/res/values/arrays.xml | 13 ------- app/src/main/res/values/strings.xml | 4 --- .../main/res/xml/ui_custom_preferences.xml | 9 +---- 59 files changed, 18 insertions(+), 158 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c9f88b760..46f1716af 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,9 +8,9 @@ android { //applicationId "dev.ukanth.ufirewall.donate" minSdkVersion 21 targetSdkVersion 33 - versionCode 20230828 - versionName "3.6.0" - //buildConfigField 'boolean', 'DONATE', 'true' + versionCode 20240305 + versionName "3.6.1" + buildConfigField 'boolean', 'DONATE', 'true' } buildFeatures { diff --git a/app/src/main/java/dev/ukanth/ufirewall/Api.java b/app/src/main/java/dev/ukanth/ufirewall/Api.java index cdba365a7..303606a27 100644 --- a/app/src/main/java/dev/ukanth/ufirewall/Api.java +++ b/app/src/main/java/dev/ukanth/ufirewall/Api.java @@ -158,8 +158,7 @@ public final class Api { * special application UID used for dnsmasq DHCP/DNS */ public static final int SPECIAL_UID_TETHER = -12; - /** special application UID used for netd DNS proxy */ - //public static final int SPECIAL_UID_DNSPROXY = -13; + /** * special application UID used for NTP */ @@ -435,24 +434,12 @@ private static void addRulesForUidlist(List cmds, List uids, St addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", action); }*/ - String pref = G.dns_proxy(); - if (whitelist) { - if (pref.equals("disable")) { - addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", " -j " + AFWALL_CHAIN_NAME + "-reject"); - addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p tcp --dport 53", " -j " + AFWALL_CHAIN_NAME + "-reject"); - } else { - addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", " -j RETURN"); - addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p tcp --dport 53", " -j RETURN"); - } + addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", " -j RETURN"); + addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p tcp --dport 53", " -j RETURN"); } else { - if (pref.equals("disable")) { - addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", " -j " + AFWALL_CHAIN_NAME + "-reject"); - addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p tcp --dport 53", " -j " + AFWALL_CHAIN_NAME + "-reject"); - } else if (pref.equals("enable")) { - addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", " -j RETURN"); - addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p tcp --dport 53", " -j RETURN"); - } + addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", " -j RETURN"); + addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p tcp --dport 53", " -j RETURN"); } @@ -462,7 +449,7 @@ private static void addRulesForUidlist(List cmds, List uids, St } - if (G.getPrivateDnsStatus() && !G.dns_proxy().equals("disable")) { + if (G.getPrivateDnsStatus()) { cmds.add("-A " + chain + " -p tcp --dport 853" + " -j ACCEPT"); // disabling HTTPS over DNS //cmds.add("-A " + chain + " -p tcp --dport 443" + " -j ACCEPT"); @@ -484,6 +471,13 @@ private static void addRulesForUidlist(List cmds, List uids, St cmds.add("-A " + chain + " -j " + AFWALL_CHAIN_NAME + "-reject"); } } + + //add 1052 for LAN + if(G.enableLAN()) { + cmds.add("-A " + "afwall-wifi-lan" + " -m owner --uid-owner 1052 -j RETURN"); + } + + cmds.add("-A " + "afwall-wifi-wan" + " -m owner --uid-owner 1052 -j RETURN"); } } @@ -785,7 +779,7 @@ private static boolean applyIptablesRulesImpl(final Context ctx, RuleDataSet rul // NOTE: we still need to open a hole to let WAN-only UIDs talk to a DNS server // on the LAN - if (whitelist && !G.dns_proxy().equals("disable")) { + if (whitelist) { cmds.add("-A " + AFWALL_CHAIN_NAME + "-wifi-lan -p udp --dport 53 -j RETURN"); cmds.add("-A " + AFWALL_CHAIN_NAME + "-wifi-lan -p tcp --dport 53 -j RETURN"); diff --git a/app/src/main/java/dev/ukanth/ufirewall/util/G.java b/app/src/main/java/dev/ukanth/ufirewall/util/G.java index 7cf974f5d..1a63a1070 100644 --- a/app/src/main/java/dev/ukanth/ufirewall/util/G.java +++ b/app/src/main/java/dev/ukanth/ufirewall/util/G.java @@ -139,7 +139,6 @@ public static Context getContext() { private static final String LOG_TARGETS = "logTargets"; private static final String SHOW_HOST = "showHostName"; private static final String APP_VERSION = "appVersion"; - private static final String DNS_PROXY = "dns_value"; private static final String MULTI_USER = "multiUser"; private static final String MULTI_USER_ID = "multiUserId"; private static final String IS_MIGRATED = "isMigrated"; @@ -544,9 +543,6 @@ public static String ip_path(String val) { return val; } - public static String dns_proxy() { - return gPrefs.getString(DNS_PROXY, "auto"); - } public static String bb_path() { return gPrefs.getString(BUSYBOX_PATH, "builtin"); diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index d3237c3ba..dc2103fdb 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -232,7 +232,5 @@ Filter option is hidden Enable Disable - DNS Proxy - DNS proxy option was added to support DNS lookups via netd on JB 4.3+. Disable this will block the internet on Android 4.3+ Removing all firewall iptables rules diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d3455a54f..591d1baee 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -330,8 +330,6 @@ إخفاء التصفية في طريقة العرض الأساسية حسب (الكل\الأساسية\النظام\المستخدم) تمكين DNS عبر netd تعطيل DNS عبر netd - وكيل خدمة أسماء النطاقات DNS - عمليات البحث عن DNS يتم عبر netd على اندرويد 4.3 وما بعده. سيؤدي تعطيل هذا إلى حظر الإنترنت على تلك الأجهزة. إضافة مستخدمي المهام AFWall+ تمكين تعطيل diff --git a/app/src/main/res/values-ast-rES/strings.xml b/app/src/main/res/values-ast-rES/strings.xml index 3f5dfe2ac..1e1fc1557 100644 --- a/app/src/main/res/values-ast-rES/strings.xml +++ b/app/src/main/res/values-ast-rES/strings.xml @@ -330,8 +330,6 @@ Les peñeres (Too/Nucleu/Sistema/Usuariu) van anubrise na vista principal Habilitar DNS pente netd Deshabilitar DNS pente netd - Proxy DNS - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Habilitar Deshabilitar diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index b0c556b42..b53801b11 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -330,8 +330,6 @@ Filters (All/Core/System/User) are hidden in the main view Enable DNS via netd Disable DNS via netd - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Fəallaşdır Ləğv et diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 8020f4ceb..ddba86d6c 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -330,8 +330,6 @@ Филтри (Всички/Основни/Системни/Потребителски) са скрити от основния екран Разреши DNS чрез netd Забрани DNS чрез netd - DNS прокси - DNS заявки са чрез netd на Android 4.3 и по-нов. Забраняването на това ще блокира интернета на тези устройства. AFWall + Tasker плъгин Разреши Изключи diff --git a/app/src/main/res/values-bi/strings.xml b/app/src/main/res/values-bi/strings.xml index da8ffe07b..cd871ef48 100644 --- a/app/src/main/res/values-bi/strings.xml +++ b/app/src/main/res/values-bi/strings.xml @@ -330,8 +330,6 @@ Filters (All/Core/System/User) are hidden in the main view Enable DNS via netd Disable DNS via netd - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Enable Disable diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 2cb4e6001..bdddf8660 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -330,8 +330,6 @@ ফিল্টার (সব/মূল/পদ্ধতি/ইউজার) প্রধান দৃশ্যে দেখানো হয় DNS netd মাধ্যমে সক্রিয় করুন DNS netd মাধ্যমে নিষ্ক্রিয় করুন - DNS প্রক্সি - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker প্লাগইন সক্রিয় করুন নিক্রিয় করুন diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index 7f0507634..c3e95369f 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -330,8 +330,6 @@ Filteri (Sve/Jezgra/Sistem/Korisnik) su sakriveni u glavnom prikazu Uključi DNS preko netd Isključi DNS preko netd - DNS proxy - DNS pretraga na Android 4.3 ili kasnijem je preko netd. Onemogućavanje ovog će blokirati internet na tim uređajima. AFWall+ dodatak Tasker Uključi Isključi diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index adbe92a37..97e5648a4 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -330,8 +330,6 @@ Filters (All/Core/System/User) are hidden in the main view Activa el DNS mitjançant netd Desactiva el DNS mitjançant netd - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Activa Desactiva diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 1d53c55c8..b4c244cb9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -331,8 +331,6 @@ Filtry (vše/jádro/systém/uživatel) jsou skryty v hlavním okně Povolit DNS přes netd Zakázat DNS přes netd - DNS proxy - Vyhledávání DNS je na zařízení s Android 4.3 a vyšší prostřednictvím netd. Zakázání zablokuje internet na těchto zařízeních. AFWall+ Tasker plugin Povolit Zakázat diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 190ed9e9f..06e700262 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -330,8 +330,6 @@ Filtre (alle/kerne/System/bruger) er skjult i hovedvisningen Aktivere DNS via netd Deaktiver DNS via netd - DNS-proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall + Tasker plugin Aktiverer Deaktiver diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4d9c33cd7..e632c1506 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -330,8 +330,6 @@ Filter (Alle/Core/System/Benutzer) werden in der Hauptansicht ausgeblendet DNS über netd aktivieren DNS über netd deaktivieren - DNS-Proxy - DNS-Abfragen über netd in Android 4.3 und höher. Falls dies deaktiviert ist, wird die Internetverbindung bei diesen Geräten blockiert. AFWall+ Tasker-Plugin Aktivieren Deaktivieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 2c69296b7..57049266b 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -330,8 +330,6 @@ Τα φίλτρα (Όλα/Πυρήνας/Σύστημα/Χρήστης) δεν θα εμφανίζονται στην κύρια προβολή Ενεργοποίηση DNS μέσω netd Άπενεργοποιηση DNS μέσω netd - Διαμεσολαβητής DNS - Οι αναζητήσεις DNS γίνονται μέσω του netd σε Android 4.3 και μετά . Η απενεργοποίηση του θα εμποδίσει το Διαδίκτυο σε αυτές τις συσκευές . AFWall+ Tasker plugin Ενεργοποίηση Απενεργοποίηση diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 50f593986..26c627abe 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -330,8 +330,6 @@ Los filtros (Todos/Core/Sistema/Usuario) se ocultan en la vista principal Activar DNS vía netd Desactivar DNS vía netd - Proxy DNS - Las consultas de DNS son mediante netd en Android 4.3 y posteriores. Deshabilitar esto bloqueará internet en dichos dispositivos. Plugin de Tasker AFWall+ Activar Desactivar diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 35f45626c..90aedce3d 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -330,8 +330,6 @@ Iragazkiak (Denak/Nukleoa/Sistema/Erabiltzailea) ikuspegi nagusian ezkutatuta daude Gaitu netd bidezko DNS Ezgaitu netd bidezko DNS - DNS Proxya - DNS bilaketak netd bidez dira Android 4.3-tik aurrera. Hau desgaitzeak Internet desgaituko du gailu hauetan. AFWall+ Tasker gehigarria Gaitu Ezgaitu diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 7e50ca290..2757a0f41 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -336,8 +336,6 @@ S-OFF پیکربندی شوند. فیلترها (تمام/هسته/سیستم/کاربر) در نمای اصلی پنهان هستند فعال سازی دی ان اس از طریق netd غیر فعال کردن دی ان اس از طریق netd - پراکسی DNS - جستجو های دی ان اس در اندروید 4.3 به بعد با استفاده از netd انجام میشه. غیرفعال کردن این باعث مسدود شدن اینترنت در آن دستگاه ها میشود. پلاگین AFWall+‎ Tasker فعالسازی غیرفعالسازی diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index da8ffe07b..cd871ef48 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -330,8 +330,6 @@ Filters (All/Core/System/User) are hidden in the main view Enable DNS via netd Disable DNS via netd - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Enable Disable diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 274073863..794327f2a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -330,8 +330,6 @@ Les filtres (Toutes/Core/Système/Utilisateur) sont masqués dans la vue principale Activer DNS via netd Désactiver DNS via netd - Proxy DNS - Les recherches DNS sont effectuées via netd sur Android 4.3 et plus. La désactivation bloquera Internet sur ces appareils. Plugin Tasker pour AFWall+ Activer Désactiver diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 35b4b8dfb..77cb371aa 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -331,8 +331,6 @@ iptables.\nייתכן כי +AFWall לא יפעל כצפוי בשל מגבלה ז מסננים (הכל/ליבה/מערכת/משתמש) מוסתרים במסך הראשי אפשר DNS באמצעות netd אל תאפשר DNS באמצעות netd - שרת DNS Proxy - שאילתות DNS נעשות באמצעות nets באנדרואיד 4.3 ומעלה. השבתה תחסום את האינטרנט במכשירים אלו. תוסף AFWall+ Tasker הפעל השבת diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 18a2381cd..647e5d79e 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -331,8 +331,6 @@ Filters (All/Core/System/User) are hidden in the main view Enable DNS via netd Disable DNS via netd - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Enable Disable diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index a78c9b273..13ea1b6e4 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -330,8 +330,6 @@ Filtri (Sve/Jezgra/Sistem/Korisnik) su sakriveni u glavnom prikazu Omogući DNS preko netd Onemogući DNS preko netd - DNS proxy - DNS pretraga na Android 4.3 ili kasnijem je preko netd. Onemogućavanje ovog će blokirati Internet na tim uređajima. AFWall+ Tasker dodatak Omogući Onemogući diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 07af70583..46d91e306 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -330,8 +330,6 @@ A szűrők (Összes/Alapvető/Rendszer/Felhasználói) nem jelennek meg a fő nézetben DNS engedélyezése netd keresztül DNS letiltása netd keresztül - DNS Proxy - A DNS lekérdezést a netd végzi az Android 4.3 és újabb verziókon. Ennek letiltása blokkolja az internetet ezeken az eszközökön. AFWall+ Tasker Plugin Engedélyez Letilt diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 751251f77..8faa37370 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -330,8 +330,6 @@ Filter (Semua/core/sistem/pengguna) disembunyikan pada tampilan utama Aktifkan DNS dari netd Matikan DNS dari netd - Proxy DNS - DNS lookups melalui netd pada Android 4.3 dan yang lebih baru. Menonaktifkan pengaturan ini akan memblokir akses internet pada perangkat ini. Plugin Tasker AFWall+ Aktifkan Matikan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9f2b6d4cb..386c8f6a3 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -330,8 +330,6 @@ I filtri (tutto/core/sistema/utente) sono nascosti dalla vista principale Abilitare il DNS tramite netd Disattiva DNS tramite netd - Proxy DNS - Le ricerche DNS sono via netd su Android 4.3 o successivi. Se disattivato, internet verrà bloccato su quei dispositivi. Plugin AFWall+ per Tasker Abilita Disabilita diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 56acd6ac3..3c9e15f86 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -333,8 +333,6 @@ フィルター (すべて/コア/システム/ユーザー) はメイン画面で非表示です netd 経由で DNS を有効にします netd 経由で DNS を無効にします - DNS プロキシ - DNS ルックアップは Android 4.3 およびそれ以降、netd 経由です。これを無効にすると、それらのデバイスでインターネットがブロックされます。 AFWall+ タスカー プラグイン 有効 無効 diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index da8ffe07b..cd871ef48 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -330,8 +330,6 @@ Filters (All/Core/System/User) are hidden in the main view Enable DNS via netd Disable DNS via netd - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Enable Disable diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ca7c062af..3d34b8e2f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -330,8 +330,6 @@ 필터 (모두/기본기/시스템/사용자) 숨기기 DNS via netd 사용 DNS via netd 비사용 - DNS 프록시 - 안드로이드 4.3 이상인 기기들에서는 netd를 통해 DNS 질의를 수행합니다. 이것을 비활성화할 경우, 이러한 기기들의 인터넷을 차단하게 됩니다. AFWall+ Tasker 플러그인 사용 비사용 diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml index 9e33cd649..2518d870c 100644 --- a/app/src/main/res/values-ku/strings.xml +++ b/app/src/main/res/values-ku/strings.xml @@ -330,8 +330,6 @@ Filters (All/Core/System/User) are hidden in the main view Enable DNS via netd Disable DNS via netd - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Enable Disable diff --git a/app/src/main/res/values-ky/strings.xml b/app/src/main/res/values-ky/strings.xml index 094a8a5de..5e95b030c 100644 --- a/app/src/main/res/values-ky/strings.xml +++ b/app/src/main/res/values-ky/strings.xml @@ -330,8 +330,6 @@ Filters (All/Core/System/User) are hidden in the main view Enable DNS via netd Disable DNS via netd - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Enable Disable diff --git a/app/src/main/res/values-ml-rIN/strings.xml b/app/src/main/res/values-ml-rIN/strings.xml index da8ffe07b..cd871ef48 100644 --- a/app/src/main/res/values-ml-rIN/strings.xml +++ b/app/src/main/res/values-ml-rIN/strings.xml @@ -330,8 +330,6 @@ Filters (All/Core/System/User) are hidden in the main view Enable DNS via netd Disable DNS via netd - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Enable Disable diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 232ff5cd7..04366df84 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -330,8 +330,6 @@ Tapis (Semua/Teras/Sistem/Pengguna) disembunyikan dimenu utama Aktif DNS melalui netd Nyahaktifkan DNS melalui netd - Proksi DNS - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Plugin Tasker Aktif Nyahaktif diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 792d5f021..e9a7ed03b 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -330,8 +330,6 @@ Filtre (Alle/Kjerne/System/Bruker) skjules i hovedvisningen Aktiver DNS via netd Deaktiver DNS via netd - DNS-mellomtjener - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker-tillegg Aktiver Deaktiver diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4f316e89d..6dab1fc04 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -333,8 +333,6 @@ Filters (All/Core/systeem/gebruiker) worden verborgen in het hoofdscherm DNS via netd inschakelen DNS via netd uitschakelen - DNS-Proxy - DNS-lookups gaan via netd op Android 4.3 en hoger. Het uitschakelen hiervan blokkeert het internet op deze apparaten. AFWall+ Tasker Plug-in Inschakelen Uitschakelen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2a207e084..6b1130014 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -330,8 +330,6 @@ Filtry (Wszystko/Rdzeń/System/Użytkownik) są ukryte w głównym widoku Włącz DNS przez netd Wyłącz DNS przez netd - DNS Proxy - Wyszukiwanie DNS odbywa się za pośrednictwem \"netd\" na Androidzie 4.3 lub nowszych. Wyłączenie tego spowoduje zablokowanie Internetu na tych urządzeniach. AFWall+ Tasker plugin Włącz Wyłącz diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e84b96541..d7452e951 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -330,8 +330,6 @@ Filtros (Tudo/Básico/Sistema/Usuário) são ocultados na vista principal Habilitar o DNS via netd Desativar o DNS via netd - Proxy DNS - Buscas ao DNS são através de netd no Android 4.3 ou posterior. Ao desabilitar, irá bloquear a internet nesses dispositivos. AFWall+ Plugin Tasker Ativar Desativar diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 11dbc33b4..aa4cc07bb 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -330,8 +330,6 @@ Ocultar filtros (todos/core/sistema/utilizador) na vista principal Habilitar o DNS via netd Desativar DNS via netd - Proxy DNS - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker Ativar Desativar diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 337054015..289beca22 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -330,8 +330,6 @@ Filtrele (Toate/Nucleu/Sistem/Utilizator) sunt ascunse în ecranul principal Activează DNS prin intermediul netd Dezactivează DNS prin intermediul netd - Proxy DNS - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall + Tasker Plugin Activează Dezactivează diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c88e64bdb..d49928947 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -331,8 +331,6 @@ Фильтры (все/ядро/система/пользователь) скрыты в главном окне Включить DNS через netd Отключить DNS через netd - Прокси-сервер DNS - DNS-запросы через netd на Android 4.3 и более поздних версиях. При отключении будет блокирован интернет на этих устройствах. Плагин Tasker AFWall+ Включить Отключить diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index c07a6e3e2..40a571aa9 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -330,8 +330,6 @@ පෙරහන් (සියලුම/හරය/පද්ධතිය/පරිශීලක) ප්‍රධාන දසුනෙහි සඟවා ඇත netd හරහා DNS සබල කරන්න netd හරහා DNS අක්‍රිය කරන්න - DNS ප්‍රොක්සි - DNS සෙවීම් ඇන්ඩ්‍රොයිඩ් 4.3 සහ ඊට පසු netd හරහා වේ. මෙය අක්‍රිය කිරීමෙන් එම උපාංගවල අන්තර්ජාලය අවහිර කරයි. AFWall+ Tasker ප්ලගිනය සබල කරන්න අබල කරන්න diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index d27a350c3..e6ba80094 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -330,8 +330,6 @@ Filtre (Všetko/Jadro/Systém/Užívateľ) budú skryté v hlavnom zobrazení Zapnúť DNS pomocou netd Vypnúť DNS pomocou netd - DNS proxy - DNS vyhľadania idú cez netd na Androide 4.3 a novších. Vypnutie zablokuje internet na týchto zariadeniach. AFWall+ Tasker zásuvný modul Zapnúť Vypnúť diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 87d965c24..039c7d031 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -330,8 +330,6 @@ Filtri (vse/jedro/sistem/uporabnik) niso prikazani na seznamu Vklopi DNS preko netd Izklopi DNS preko netd - DNS posredniški strežnik - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. Vtičnik Tasker za AFWall+ Vklopi Izklopi diff --git a/app/src/main/res/values-sr-rCS/strings.xml b/app/src/main/res/values-sr-rCS/strings.xml index 2d6c65349..db76b90c3 100644 --- a/app/src/main/res/values-sr-rCS/strings.xml +++ b/app/src/main/res/values-sr-rCS/strings.xml @@ -330,8 +330,6 @@ Filteri (Svi/Jezgra/Sistem/Korisnik) su skriveni na glavnom ekranu Uključi DNS preko netd Isključi DNS preko netd - DNS proxy - DNS pretraga na Android 4.3 ili kasnijem verzijama je preko netd. Onemogućavanje ovog će blokirati internet na tim uređajima. AFWall+ Tasker dodatak Uključi Isključi diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 30d5d89d3..0776a9487 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -330,8 +330,6 @@ Филтери (све/језгро/корисник) неће бити приказани Укључи DNS преко netd Искључи DNS преко netd - DNS прокси - DNS упити иду преко netd на Андроиду 4.3 и новијим. Искључивањем ћете потпуно онемогућити интернет. AFWall+ прикључак Таскера Укључи Искључи diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d139c5950..7a53ec5f3 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -330,8 +330,6 @@ Filter (Allt/Kärnan/System/användare) döljs i huvudvyn Aktivera DNS via netd Inaktivera DNS via netd - DNS-proxy - DNS-uppslagningar använder netd på Android 4.3 och senare. Inaktivera detta blockerar internet på dessa enheter. AFWall+ Tasker plugin Aktivera Inaktivera diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index e52fabc00..ae1cc2249 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -330,8 +330,6 @@ Filters (All/Core/System/User) are hidden in the main view Enable DNS via netd Disable DNS via netd - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Enable Disable diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 1f072e4d9..328bef045 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -330,8 +330,6 @@ Filters (All/Core/System/User) are hidden in the main view Enable DNS via netd Disable DNS via netd - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Enable Disable diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ca46d4795..922ceceae 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -330,8 +330,6 @@ Filtreler (Tümü/Çekirdek/Sistem/Kullanıcı) ana görünümde gizlenir Netd DNS\'i etkinleştir Netd DNS\'i devre dışı bırak - DNS vekil - DNS aramaları Android 4.3 ve sonraki sürümlerinde netd üzerinden yapılır. Bunu devre dışı bırakmak, bu cihazlarda interneti engelleyecektir. AFWall+ Tasker eklentisi Etkinleştir Devre dışı bırak diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index dcb71e99b..d136a2135 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -330,8 +330,6 @@ Фільтри (усі/ядро/система/користувач) приховані у головному вікні Увімкнути DNS за допомогою netd Вимкнути DNS за допомогою netd - Проксі-сервер DNS - DNS-запити на Android 4.3 та пізніших версій здійснюються через netd. Відключення цього заблокує доступ до інтернету на таких пристроях. Плагін AFWall+ Tasker Увімкнути Вимкнути diff --git a/app/src/main/res/values-ur-rPK/strings.xml b/app/src/main/res/values-ur-rPK/strings.xml index 0df668472..c73959a11 100644 --- a/app/src/main/res/values-ur-rPK/strings.xml +++ b/app/src/main/res/values-ur-rPK/strings.xml @@ -330,8 +330,6 @@ Filters (All/Core/System/User) are hidden in the main view Enable DNS via netd Disable DNS via netd - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. AFWall+ Tasker plugin Enable Disable diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index b4d6598db..0a774b7a2 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -330,8 +330,6 @@ Ẩn các bộ lọc (Tất cả/Lõi/Hệ thống/Người dùng) ở màn hình chính Bật DNS bằng netd Tắt DNS bằng netd - DNS Proxy - Tra cứu DNS bằng netd trên Android 4.3 trở lên. Internet trên những thiết bị này sẽ bị chặn nếu tắt tính năng. Phần mở rộng Tasker Bật Tắt diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 687869e1b..8ba48ca1e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -331,8 +331,6 @@ 在主视图中隐藏过滤器 (所有/核心/系统/用户) 由netd启用DNS 由netd禁用DNS - DNS 代理 - 在 Android 4.3 及更高版本上, DNS 查询通过 netd 完成. 禁用此项将导致这些设备上网络连接受阻 AFWall+ Tasker 插件 启用 禁用 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5501c20b5..f02b4777a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -330,8 +330,6 @@ 在首頁中隱藏過濾器 (所有/核心/系统/用戶) 通過 netd 啟用 DNS 通過 netd 停用 DNS - DNS 代理 - DNS 查找是通過 netd 上 Android 4.3 及更高版本。如果禁用該會阻止在這些設備上的互聯網。 AFWall + Tasker 插件 啟用 停用 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 1fba1d7a6..c1f83b15f 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -330,8 +330,6 @@ 在首頁中隱藏過濾器 (所有/核心/系统/用戶) 通過 netd 啟用 DNS 通過 netd 停用 DNS - DNS 代理 - DNS 查找是通過 netd 上 Android 4.3 及更高版本。如果禁用該會阻止在這些設備上的互聯網。 AFWall + Tasker 插件 啟用 停用 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index a00a8fee8..23be11357 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -134,19 +134,6 @@ system - - - @string/auto - @string/enable_dns - @string/disable_dns - - - - auto - enable - disable - - 3 4 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 15b6907a8..27375320d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -372,10 +372,6 @@ Enable DNS via netd Disable DNS via netd - - DNS proxy - DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices. - AFWall+ Tasker plugin Enable Disable diff --git a/app/src/main/res/xml/ui_custom_preferences.xml b/app/src/main/res/xml/ui_custom_preferences.xml index c2cd989ba..ce0852db5 100644 --- a/app/src/main/res/xml/ui_custom_preferences.xml +++ b/app/src/main/res/xml/ui_custom_preferences.xml @@ -16,13 +16,6 @@ android:summary="%s" android:title="@string/busybox_pref" > - - + \ No newline at end of file From 5932feb4e0ba165ced92a4c66da3e2c3f4cac4d0 Mon Sep 17 00:00:00 2001 From: ukanth Date: Wed, 5 Jun 2024 23:43:14 +0530 Subject: [PATCH 2/2] Updated libs and build tools --- app/build.gradle | 8 ++++---- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 46f1716af..cba9f3061 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,14 +3,14 @@ apply plugin: 'com.android.application' android { defaultConfig { - compileSdk 33 + compileSdk 34 applicationId "dev.ukanth.ufirewall" //applicationId "dev.ukanth.ufirewall.donate" minSdkVersion 21 - targetSdkVersion 33 - versionCode 20240305 + targetSdkVersion 34 + versionCode 20240606 versionName "3.6.1" - buildConfigField 'boolean', 'DONATE', 'true' + buildConfigField 'boolean', 'DONATE', 'false' } buildFeatures { diff --git a/build.gradle b/build.gradle index 4d7b40687..2072e91c8 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { gradlePluginPortal() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'com.android.tools.build:gradle:8.2.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c8f52886..a7d0faf77 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip