Skip to content

Commit 4f5e5cb

Browse files
author
ukanth
committed
resolve conflicts
2 parents 5976130 + 50272cd commit 4f5e5cb

File tree

60 files changed

+23
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+23
-156
lines changed

‎.github/workflows/android.yml

+7
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,10 @@ jobs:
2020
java-version: 17
2121
- name: Build with Gradle
2222
run: ./gradlew build
23+
- name: Upload build artifacts
24+
uses: actions/upload-artifact@v3
25+
with:
26+
name: build-artifacts
27+
path: |
28+
app/build/outputs/apk/
29+
app/build/outputs/bundle/

‎app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
minSdkVersion 21
1010
versionCode 20241019
1111
versionName "3.6.1"
12-
//buildConfigField 'boolean', 'DONATE', 'true'
12+
buildConfigField 'boolean', 'DONATE', 'false'
1313
}
1414

1515
buildFeatures {

‎app/src/main/java/dev/ukanth/ufirewall/Api.java

+14-20
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ public final class Api {
158158
* special application UID used for dnsmasq DHCP/DNS
159159
*/
160160
public static final int SPECIAL_UID_TETHER = -12;
161-
/** special application UID used for netd DNS proxy */
162-
//public static final int SPECIAL_UID_DNSPROXY = -13;
161+
163162
/**
164163
* special application UID used for NTP
165164
*/
@@ -435,24 +434,12 @@ private static void addRulesForUidlist(List<String> cmds, List<Integer> uids, St
435434
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", action);
436435
}*/
437436

438-
String pref = G.dns_proxy();
439-
440437
if (whitelist) {
441-
if (pref.equals("disable")) {
442-
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", " -j " + AFWALL_CHAIN_NAME + "-reject");
443-
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p tcp --dport 53", " -j " + AFWALL_CHAIN_NAME + "-reject");
444-
} else {
445-
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", " -j RETURN");
446-
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p tcp --dport 53", " -j RETURN");
447-
}
438+
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", " -j RETURN");
439+
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p tcp --dport 53", " -j RETURN");
448440
} else {
449-
if (pref.equals("disable")) {
450-
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", " -j " + AFWALL_CHAIN_NAME + "-reject");
451-
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p tcp --dport 53", " -j " + AFWALL_CHAIN_NAME + "-reject");
452-
} else if (pref.equals("enable")) {
453-
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", " -j RETURN");
454-
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p tcp --dport 53", " -j RETURN");
455-
}
441+
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p udp --dport 53", " -j RETURN");
442+
addRuleForUsers(cmds, new String[]{"root"}, "-A " + chain + " -p tcp --dport 53", " -j RETURN");
456443
}
457444

458445

@@ -462,7 +449,7 @@ private static void addRulesForUidlist(List<String> cmds, List<Integer> uids, St
462449
}
463450

464451

465-
if (G.getPrivateDnsStatus() && !G.dns_proxy().equals("disable")) {
452+
if (G.getPrivateDnsStatus()) {
466453
cmds.add("-A " + chain + " -p tcp --dport 853" + " -j ACCEPT");
467454
// disabling HTTPS over DNS
468455
//cmds.add("-A " + chain + " -p tcp --dport 443" + " -j ACCEPT");
@@ -484,6 +471,13 @@ private static void addRulesForUidlist(List<String> cmds, List<Integer> uids, St
484471
cmds.add("-A " + chain + " -j " + AFWALL_CHAIN_NAME + "-reject");
485472
}
486473
}
474+
475+
//add 1052 for LAN
476+
if(G.enableLAN()) {
477+
cmds.add("-A " + "afwall-wifi-lan" + " -m owner --uid-owner 1052 -j RETURN");
478+
}
479+
480+
cmds.add("-A " + "afwall-wifi-wan" + " -m owner --uid-owner 1052 -j RETURN");
487481
}
488482
}
489483

@@ -785,7 +779,7 @@ private static boolean applyIptablesRulesImpl(final Context ctx, RuleDataSet rul
785779

786780
// NOTE: we still need to open a hole to let WAN-only UIDs talk to a DNS server
787781
// on the LAN
788-
if (whitelist && !G.dns_proxy().equals("disable")) {
782+
if (whitelist) {
789783
cmds.add("-A " + AFWALL_CHAIN_NAME + "-wifi-lan -p udp --dport 53 -j RETURN");
790784
cmds.add("-A " + AFWALL_CHAIN_NAME + "-wifi-lan -p tcp --dport 53 -j RETURN");
791785

‎app/src/main/java/dev/ukanth/ufirewall/util/G.java

-4
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ public static Context getContext() {
139139
private static final String LOG_TARGETS = "logTargets";
140140
private static final String SHOW_HOST = "showHostName";
141141
private static final String APP_VERSION = "appVersion";
142-
private static final String DNS_PROXY = "dns_value";
143142
private static final String MULTI_USER = "multiUser";
144143
private static final String MULTI_USER_ID = "multiUserId";
145144
private static final String IS_MIGRATED = "isMigrated";
@@ -544,9 +543,6 @@ public static String ip_path(String val) {
544543
return val;
545544
}
546545

547-
public static String dns_proxy() {
548-
return gPrefs.getString(DNS_PROXY, "auto");
549-
}
550546

551547
public static String bb_path() {
552548
return gPrefs.getString(BUSYBOX_PATH, "builtin");

‎app/src/main/res/values-af/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,5 @@
232232
<string name="showfilter_summary_off">Filter option is hidden</string>
233233
<string name="enable_dns">Enable</string>
234234
<string name="disable_dns">Disable</string>
235-
<string name="dns_proxy_title">DNS Proxy</string>
236-
<string name="dns_proxy_summary">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+</string>
237235
<string name="purging_rules">Removing all firewall iptables rules</string>
238236
</resources>

‎app/src/main/res/values-ar/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">إخفاء التصفية في طريقة العرض الأساسية حسب (الكل\الأساسية\النظام\المستخدم)</string>
331331
<string name="enable_dns">تمكين DNS عبر netd</string>
332332
<string name="disable_dns">تعطيل DNS عبر netd</string>
333-
<string name="dns_proxy_title">وكيل خدمة أسماء النطاقات DNS</string>
334-
<string name="dns_proxy_summary">عمليات البحث عن DNS يتم عبر netd على اندرويد 4.3 وما بعده. سيؤدي تعطيل هذا إلى حظر الإنترنت على تلك الأجهزة.</string>
335333
<string name="tasker_lable">إضافة مستخدمي المهام AFWall+</string>
336334
<string name="enable">تمكين</string>
337335
<string name="disable">تعطيل</string>

‎app/src/main/res/values-ast-rES/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Les peñeres (Too/Nucleu/Sistema/Usuariu) van anubrise na vista principal</string>
331331
<string name="enable_dns">Habilitar DNS pente netd</string>
332332
<string name="disable_dns">Deshabilitar DNS pente netd</string>
333-
<string name="dns_proxy_title">Proxy DNS </string>
334-
<string name="dns_proxy_summary">DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices.</string>
335333
<string name="tasker_lable">AFWall+ Tasker plugin</string>
336334
<string name="enable">Habilitar</string>
337335
<string name="disable">Deshabilitar</string>

‎app/src/main/res/values-az/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Filters (All/Core/System/User) are hidden in the main view</string>
331331
<string name="enable_dns">Enable DNS via netd</string>
332332
<string name="disable_dns">Disable DNS via netd</string>
333-
<string name="dns_proxy_title">DNS proxy </string>
334-
<string name="dns_proxy_summary">DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices.</string>
335333
<string name="tasker_lable">AFWall+ Tasker plugin</string>
336334
<string name="enable">Fəallaşdır</string>
337335
<string name="disable">Ləğv et</string>

‎app/src/main/res/values-bg/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Филтри (Всички/Основни/Системни/Потребителски) са скрити от основния екран</string>
331331
<string name="enable_dns">Разреши DNS чрез netd</string>
332332
<string name="disable_dns">Забрани DNS чрез netd</string>
333-
<string name="dns_proxy_title">DNS прокси </string>
334-
<string name="dns_proxy_summary">DNS заявки са чрез netd на Android 4.3 и по-нов. Забраняването на това ще блокира интернета на тези устройства.</string>
335333
<string name="tasker_lable">AFWall + Tasker плъгин</string>
336334
<string name="enable">Разреши</string>
337335
<string name="disable">Изключи</string>

‎app/src/main/res/values-bi/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Filters (All/Core/System/User) are hidden in the main view</string>
331331
<string name="enable_dns">Enable DNS via netd</string>
332332
<string name="disable_dns">Disable DNS via netd</string>
333-
<string name="dns_proxy_title">DNS proxy </string>
334-
<string name="dns_proxy_summary">DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices.</string>
335333
<string name="tasker_lable">AFWall+ Tasker plugin</string>
336334
<string name="enable">Enable</string>
337335
<string name="disable">Disable</string>

‎app/src/main/res/values-bn/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">ফিল্টার (সব/মূল/পদ্ধতি/ইউজার) প্রধান দৃশ্যে দেখানো হয়</string>
331331
<string name="enable_dns">DNS netd মাধ্যমে সক্রিয় করুন</string>
332332
<string name="disable_dns">DNS netd মাধ্যমে নিষ্ক্রিয় করুন</string>
333-
<string name="dns_proxy_title">DNS প্রক্সি </string>
334-
<string name="dns_proxy_summary">DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices.</string>
335333
<string name="tasker_lable">AFWall+ Tasker প্লাগইন</string>
336334
<string name="enable">সক্রিয় করুন</string>
337335
<string name="disable">নিক্রিয় করুন</string>

‎app/src/main/res/values-bs/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Filteri (Sve/Jezgra/Sistem/Korisnik) su sakriveni u glavnom prikazu</string>
331331
<string name="enable_dns">Uključi DNS preko netd</string>
332332
<string name="disable_dns">Isključi DNS preko netd</string>
333-
<string name="dns_proxy_title">DNS proxy </string>
334-
<string name="dns_proxy_summary">DNS pretraga na Android 4.3 ili kasnijem je preko netd. Onemogućavanje ovog će blokirati internet na tim uređajima.</string>
335333
<string name="tasker_lable">AFWall+ dodatak Tasker</string>
336334
<string name="enable">Uključi</string>
337335
<string name="disable">Isključi</string>

‎app/src/main/res/values-ca/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Filters (All/Core/System/User) are hidden in the main view</string>
331331
<string name="enable_dns">Activa el DNS mitjançant netd</string>
332332
<string name="disable_dns">Desactiva el DNS mitjançant netd</string>
333-
<string name="dns_proxy_title">DNS proxy </string>
334-
<string name="dns_proxy_summary">DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices.</string>
335333
<string name="tasker_lable">AFWall+ Tasker plugin</string>
336334
<string name="enable">Activa</string>
337335
<string name="disable">Desactiva</string>

‎app/src/main/res/values-cs/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,6 @@
331331
<string name="showfilter_summary_off">Filtry (vše/jádro/systém/uživatel) jsou skryty v hlavním okně</string>
332332
<string name="enable_dns">Povolit DNS přes netd</string>
333333
<string name="disable_dns">Zakázat DNS přes netd</string>
334-
<string name="dns_proxy_title">DNS proxy </string>
335-
<string name="dns_proxy_summary">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.</string>
336334
<string name="tasker_lable">AFWall+ Tasker plugin</string>
337335
<string name="enable">Povolit</string>
338336
<string name="disable">Zakázat</string>

‎app/src/main/res/values-da/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Filtre (alle/kerne/System/bruger) er skjult i hovedvisningen</string>
331331
<string name="enable_dns">Aktivere DNS via netd</string>
332332
<string name="disable_dns">Deaktiver DNS via netd</string>
333-
<string name="dns_proxy_title">DNS-proxy </string>
334-
<string name="dns_proxy_summary">DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices.</string>
335333
<string name="tasker_lable">AFWall + Tasker plugin</string>
336334
<string name="enable">Aktiverer</string>
337335
<string name="disable">Deaktiver</string>

‎app/src/main/res/values-de/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Filter (Alle/Core/System/Benutzer) werden in der Hauptansicht ausgeblendet</string>
331331
<string name="enable_dns">DNS über netd aktivieren</string>
332332
<string name="disable_dns">DNS über netd deaktivieren</string>
333-
<string name="dns_proxy_title">DNS-Proxy</string>
334-
<string name="dns_proxy_summary">DNS-Abfragen über netd in Android 4.3 und höher. Falls dies deaktiviert ist, wird die Internetverbindung bei diesen Geräten blockiert.</string>
335333
<string name="tasker_lable">AFWall+ Tasker-Plugin</string>
336334
<string name="enable">Aktivieren</string>
337335
<string name="disable">Deaktivieren</string>

‎app/src/main/res/values-el/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Τα φίλτρα (Όλα/Πυρήνας/Σύστημα/Χρήστης) δεν θα εμφανίζονται στην κύρια προβολή</string>
331331
<string name="enable_dns">Ενεργοποίηση DNS μέσω netd</string>
332332
<string name="disable_dns">Άπενεργοποιηση DNS μέσω netd</string>
333-
<string name="dns_proxy_title">Διαμεσολαβητής DNS </string>
334-
<string name="dns_proxy_summary">Οι αναζητήσεις DNS γίνονται μέσω του netd σε Android 4.3 και μετά . Η απενεργοποίηση του θα εμποδίσει το Διαδίκτυο σε αυτές τις συσκευές .</string>
335333
<string name="tasker_lable">AFWall+ Tasker plugin</string>
336334
<string name="enable">Ενεργοποίηση</string>
337335
<string name="disable">Απενεργοποίηση</string>

‎app/src/main/res/values-es/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Los filtros (Todos/Core/Sistema/Usuario) se ocultan en la vista principal</string>
331331
<string name="enable_dns">Activar DNS vía netd</string>
332332
<string name="disable_dns">Desactivar DNS vía netd</string>
333-
<string name="dns_proxy_title">Proxy DNS </string>
334-
<string name="dns_proxy_summary">Las consultas de DNS son mediante netd en Android 4.3 y posteriores. Deshabilitar esto bloqueará internet en dichos dispositivos.</string>
335333
<string name="tasker_lable">Plugin de Tasker AFWall+</string>
336334
<string name="enable">Activar</string>
337335
<string name="disable">Desactivar</string>

‎app/src/main/res/values-eu/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Iragazkiak (Denak/Nukleoa/Sistema/Erabiltzailea) ikuspegi nagusian ezkutatuta daude</string>
331331
<string name="enable_dns">Gaitu netd bidezko DNS</string>
332332
<string name="disable_dns">Ezgaitu netd bidezko DNS</string>
333-
<string name="dns_proxy_title">DNS Proxya </string>
334-
<string name="dns_proxy_summary">DNS bilaketak netd bidez dira Android 4.3-tik aurrera. Hau desgaitzeak Internet desgaituko du gailu hauetan.</string>
335333
<string name="tasker_lable">AFWall+ Tasker gehigarria</string>
336334
<string name="enable">Gaitu</string>
337335
<string name="disable">Ezgaitu</string>

‎app/src/main/res/values-fa/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,6 @@ S-OFF پیکربندی شوند.</string>
336336
<string name="showfilter_summary_off">فیلترها (تمام/هسته/سیستم/کاربر) در نمای اصلی پنهان هستند</string>
337337
<string name="enable_dns">فعال سازی دی ان اس از طریق netd</string>
338338
<string name="disable_dns">غیر فعال کردن دی ان اس از طریق netd</string>
339-
<string name="dns_proxy_title">پراکسی DNS </string>
340-
<string name="dns_proxy_summary">جستجو های دی ان اس در اندروید 4.3 به بعد با استفاده از netd انجام میشه. غیرفعال کردن این باعث مسدود شدن اینترنت در آن دستگاه ها میشود.</string>
341339
<string name="tasker_lable">پلاگین AFWall+‎ Tasker</string>
342340
<string name="enable">فعالسازی</string>
343341
<string name="disable">غیرفعالسازی</string>

‎app/src/main/res/values-fi/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Filters (All/Core/System/User) are hidden in the main view</string>
331331
<string name="enable_dns">Enable DNS via netd</string>
332332
<string name="disable_dns">Disable DNS via netd</string>
333-
<string name="dns_proxy_title">DNS proxy </string>
334-
<string name="dns_proxy_summary">DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices.</string>
335333
<string name="tasker_lable">AFWall+ Tasker plugin</string>
336334
<string name="enable">Enable</string>
337335
<string name="disable">Disable</string>

‎app/src/main/res/values-fr/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Les filtres (Toutes/Core/Système/Utilisateur) sont masqués dans la vue principale</string>
331331
<string name="enable_dns">Activer DNS via netd</string>
332332
<string name="disable_dns">Désactiver DNS via netd</string>
333-
<string name="dns_proxy_title">Proxy DNS </string>
334-
<string name="dns_proxy_summary">Les recherches DNS sont effectuées via netd sur Android 4.3 et plus. La désactivation bloquera Internet sur ces appareils.</string>
335333
<string name="tasker_lable">Plugin Tasker pour AFWall+</string>
336334
<string name="enable">Activer</string>
337335
<string name="disable">Désactiver</string>

‎app/src/main/res/values-he/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,6 @@ iptables.\nייתכן כי +AFWall לא יפעל כצפוי בשל מגבלה ז
331331
<string name="showfilter_summary_off">מסננים (הכל/ליבה/מערכת/משתמש) מוסתרים במסך הראשי</string>
332332
<string name="enable_dns">אפשר DNS באמצעות netd</string>
333333
<string name="disable_dns">אל תאפשר DNS באמצעות netd</string>
334-
<string name="dns_proxy_title">שרת DNS Proxy </string>
335-
<string name="dns_proxy_summary">שאילתות DNS נעשות באמצעות nets באנדרואיד 4.3 ומעלה. השבתה תחסום את האינטרנט במכשירים אלו.</string>
336334
<string name="tasker_lable">תוסף AFWall+ Tasker</string>
337335
<string name="enable">הפעל</string>
338336
<string name="disable">השבת</string>

‎app/src/main/res/values-hi/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,6 @@
331331
<string name="showfilter_summary_off">Filters (All/Core/System/User) are hidden in the main view</string>
332332
<string name="enable_dns">Enable DNS via netd</string>
333333
<string name="disable_dns">Disable DNS via netd</string>
334-
<string name="dns_proxy_title">DNS proxy </string>
335-
<string name="dns_proxy_summary">DNS lookups are via netd on Android 4.3 and later. Disabling this will block the Internet on those devices.</string>
336334
<string name="tasker_lable">AFWall+ Tasker plugin</string>
337335
<string name="enable">Enable</string>
338336
<string name="disable">Disable</string>

‎app/src/main/res/values-hr/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@
330330
<string name="showfilter_summary_off">Filtri (Sve/Jezgra/Sistem/Korisnik) su sakriveni u glavnom prikazu</string>
331331
<string name="enable_dns">Omogući DNS preko netd</string>
332332
<string name="disable_dns">Onemogući DNS preko netd</string>
333-
<string name="dns_proxy_title">DNS proxy </string>
334-
<string name="dns_proxy_summary">DNS pretraga na Android 4.3 ili kasnijem je preko netd. Onemogućavanje ovog će blokirati Internet na tim uređajima.</string>
335333
<string name="tasker_lable">AFWall+ Tasker dodatak</string>
336334
<string name="enable">Omogući</string>
337335
<string name="disable">Onemogući</string>

0 commit comments

Comments
 (0)