Skip to content

Commit

Permalink
Merge pull request #1142 from ukanth/tether_fix
Browse files Browse the repository at this point in the history
Merge recent changes for beta release
  • Loading branch information
ukanth committed Sep 5, 2020
2 parents 3da5e45 + 63fb3d5 commit 354770c
Show file tree
Hide file tree
Showing 20 changed files with 472 additions and 463 deletions.
9 changes: 9 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
AFWall+ Changelog
==================

Version 3.5.0-BETA-1
* Feature: Show installed apps without internet permission
* Feature: Default setting for installed app (Blacklist/whitelist) - Donate Only
* Fix: Logs do not show app image
* Fix: Better support for Multiprofile/Island/Workprofile - Thanks to @n90p
* Fix: Log service startup issue
* Update support tools and build libraries(AndroidX)
* Target SDK to android 10

Version 3.4.0
* Feature: Bluetooth,USB tethering as separate rules - Thanks @nxzero
* Feature: Clone columns (Copy rules from one column to other column)
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
//applicationId "dev.ukanth.ufirewall.donate"
minSdkVersion 21
targetSdkVersion 29
versionCode 200830
versionName "3.5.0-BETA"
versionCode 2000905
versionName "3.5.0-BETA-1"
//buildConfigField 'boolean', 'DONATE', 'true'
}

Expand Down
17 changes: 8 additions & 9 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<!--
AFWall+ UI - String resource (English)
Expand All @@ -24,13 +23,13 @@
<string name="error_refresh">خطأ في تحديث قواعد العناوين</string>
<string name="error_apply">خطأ في تطبيق قواعد العناوين</string>
<string name="error_fetch">خطأ في جلب قواعد العناوين</string>
<string name="error_su_toast">Unable to aquire root access !</string>
<string name="error_su_toast">غير قادر على الوصول إلى الجذر!</string>
<string name="error_su">لم أستطع الحصول على صلاحيات الرووت.\n يجب أن يكون جهازك مروت لإستعمال AFWall+.\n\n إذا كان هذا الجهاز مروت، الرجاء التأكد أن AFWall+ يملك الإذن لتنفيذ تعليمة \"su\".</string>
<string name="error_netfilter">تعذر العثور على دعم اهداف iptables والسلاسل.\+nAFWall قد لا يعمل على النحو المتوقع نتيجة لهذا التقييد.</string>
<string name="error_common">خطأ: </string>
<string name="all_item">(أي تطبيق) - مماثل لتحديد جميع التطبيقات</string>
<string name="kernel_item">(نواة) - نواة لينيكس</string>
<string name="android_system">Android System</string>
<string name="android_system">نظام الأندرويد</string>
<string name="unknown_item">غير معروف</string>
<string name="tethering_item">(مشاركة الانترنت) - خدمات DHCP+DNS</string>
<string name="dnsproxy_item">(dns بروكسي) - عمليات بحث DNS بواسطة netd</string>
Expand Down Expand Up @@ -69,16 +68,16 @@
<string name="mode_header">الوضع: %s</string>
<string name="legend_clear">امسح كافة خانات الاختيار في كافة الأعمدة</string>
<string name="mode_whitelist">اسمح للمحدد</string>
<string name="legend_whitelist">Selected apps will be granted Internet access</string>
<string name="legend_whitelist">التطبيقات المحددة ستمنح حق الوصول إلى الإنترنت</string>
<string name="mode_blacklist">منع المحدد</string>
<string name="legend_blacklist">Selected apps will be denied Internet access</string>
<string name="legend_blacklist">التطبيقات المحددة ستمنع من الوصول إلى الإنترنت</string>
<string name="set_custom_script">تعيين برنامج نصي مخصص</string>
<string name="preferences">تفضيلات</string>
<string name="reload">إعادة تحميل التطبيقات</string>
<string name="flush">امسح القواعد</string>
<string name="send_report">إرسال تقرير الخطأ</string>
<string name="enter_problem">يرجى توضيح المشكلة:</string>
<string name="send_mail">Send e-mail</string>
<string name="send_mail">إرسال بريد إلكتروني</string>
<string name="notify_pref_summary_on">سيتم إظهار إشعار عندما يتم تثبيت تطبيق جديد</string>
<string name="notify_pref_summary_off">لن يظهر أي إشعار عندما يتم تثبيت تطبيق جديد</string>
<string name="custom_script_defined">تعريف برنامج نصي مخصص</string>
Expand All @@ -96,7 +95,7 @@
<string name="flushRulesConfirm">مسح جميع قواعد iptables؟</string>
<string name="overrideRules">هل تريد استيراد القواعد؟ هذا سوف يعوض القواعد الموجودة!</string>
<string name="notification_new">تم تثبيت تطبيق جديد</string>
<string name="notification_new_package">Configure Internet permission</string>
<string name="notification_new_package">تكوين إذن الإنترنت</string>
<string name="confirmMsg">تعطيل جدار الحماية بشكل كامل؟</string>
<string name="apply">تطبيق</string>
<string name="discard">تجاهل</string>
Expand All @@ -120,7 +119,7 @@
<string name="unable_remove_initd">غير قادر على إزالة البرنامج النصي لبدء تشغيل AFWall+</string>
<!-- Widget -->
<string name="widget_disable_fail">لا يمكن تعطيل جدار الحماية - محمي بكلمة مرور!</string>
<string name="widget_label_status">AFWall+ Toggle</string>
<string name="widget_label_status">تبديل AFWall+</string>
<string name="widget_label_settings">إعدادات AFWall+</string>
<string name="widget_label_settings_old">إعدادات AFWall+ (قديم)</string>
<!-- Color Picker -->
Expand Down Expand Up @@ -182,7 +181,7 @@
<string name="profile3">ملف التعريف 3</string>
<string name="profile_hint">اسم الملف الشخصي</string>
<string name="profile_notsupport">الرجاء ترحيل بيانات الملف الشخصي لاستخدام هذا الخيار</string>
<string name="profile_duplicate">Profile exists already!</string>
<string name="profile_duplicate">الملف الشخصي موجود بالفعل!</string>
<string name="reapply_profile">إعادة تطبيق قواعد الملف الشخصي</string>
<!-- Interface -->
<string name="lan_title">التحكم في الشبكة المحلية</string>
Expand Down
41 changes: 20 additions & 21 deletions app/src/main/res/values-ast-rES/strings.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<!--
AFWall+ UI - String resource (English)
Expand All @@ -11,16 +10,16 @@
<string name="title_disabled">AFWall+ (DESHABILITÁU)</string>
<string name="whitelist_array_item">Permitir lo esbillao</string>
<string name="blacklist_array_item">Bloquiar lo esbillao</string>
<string name="showrules">Amosar regles</string>
<string name="showrules">Amosar les regles</string>
<string name="applyrules">Aplicar</string>
<string name="saverules">Guardar</string>
<string name="setpwd">Afitar contraseña</string>
<string name="help">Ayuda</string>
<string name="close">Zarrar</string>
<string name="exit">Colar</string>
<string name="error_purge">Fallu purgando iptables</string>
<string name="error_binary">Fallu instalando los ficheros binarios</string>
<string name="error_migration">Fallu migrando los axustes vieyos</string>
<string name="error_binary">Fallu al instalar los ficheros binarios</string>
<string name="error_migration">Fallu al migrar los axustes vieyos</string>
<string name="error_refresh">Fallu xenerando iptables</string>
<string name="error_apply">Fallu aplicando les regles d\'iptables</string>
<string name="error_fetch">Fallu diendo en cata les regles d\'iptables</string>
Expand All @@ -38,7 +37,7 @@
<string name="root_item">(root) - Aplicaciones executándose como root</string>
<string name="adb_item">(adb) - Android Debug Bridge</string>
<string name="media_item">(media) - Sirvidor multimedia</string>
<string name="vpn_item">(vpn) - Rede VPN</string>
<string name="vpn_item">(vpn) - Redes VPN</string>
<string name="drm_item">(drm) - Serviciu de xestión de drechos dixitales</string>
<string name="gps_item">(gps) - GPS</string>
<string name="shell_item">(shell) - Shell de Linux</string>
Expand Down Expand Up @@ -77,10 +76,10 @@
<string name="reload">Recargar aplicaciones</string>
<string name="flush">Balerar regles</string>
<string name="send_report">Unviar informe de fallu</string>
<string name="enter_problem">Por favor, desplica\'l problema:</string>
<string name="enter_problem">Desplica\'l problema:</string>
<string name="send_mail">Send e-mail</string>
<string name="notify_pref_summary_on">Amosaráse un avisu al instalase una aplicación nueva</string>
<string name="notify_pref_summary_off">Nun s\'amosará avisu dalu al instalase una aplicación nueva</string>
<string name="notify_pref_summary_off">Nun va amosase nengún avisu al instalar una aplicación nueva</string>
<string name="custom_script_defined">Definióse\'l script personalizáu</string>
<string name="custom_script_removed">Desanicióse\'l script personalizáu</string>
<string name="custom_script_error">Fallu guardando\'l script personalizáu</string>
Expand All @@ -94,7 +93,7 @@
<string name="copied">Copiáu</string>
<string name="Search">Guetar</string>
<string name="flushRulesConfirm">¿Balerar toles regles d\'iptables?</string>
<string name="overrideRules">¿Quies importar les regles? ¡Esto anulará les esistentes!</string>
<string name="overrideRules">¿Quies importar les regles? ¡Esto va anular les esistentes!</string>
<string name="notification_new">Instaláronse aplicaciones nueves</string>
<string name="notification_new_package">Configure Internet permission</string>
<string name="confirmMsg">¿Deshabilitar dafechu\'l firmware?</string>
Expand All @@ -115,7 +114,7 @@
<!-- Advanced Settings -->
<!-- init.d -->
<string name="success_initd">Instalóse\'l script d\'aniciu</string>
<string name="unable_initd">Nun pue instalase\'l script d\'aniciu d\'AFWall+. Verifica que la to ROM/kernel sofita init.d/su.d, por favor</string>
<string name="unable_initd">Nun pue instalase\'l script d\'aniciu d\'AFWall+. Verifica que la ROM/kernel sofita init.d/su.d</string>
<string name="remove_initd">Desinstalóse\'l script d\'aniciu</string>
<string name="unable_remove_initd">Nun pue desaniciase\'l script d\'aniciu d\'AFWall+</string>
<!-- Widget -->
Expand Down Expand Up @@ -226,7 +225,7 @@
<string name="tasker_muliprofile">Tasker: AFWall+ multi-profile disabled</string>
<!-- IPv4/IPv6 -->
<string name="ipv6_title">Sofitu d\'IPv6</string>
<string name="ipv6_summary">Habilita\'l sofitu d\'IPv6</string>
<string name="ipv6_summary">Activa\'l sofitu d\'IPv6</string>
<string name="control_ipv6_title">Only Control IPv6 Chains</string>
<string name="ip6unavailable">Fallu: IPv6 rique «/system/bin/ip6tables».</string>
<string name="switch_ipv6">Cambiar a regles IPv6</string>
Expand All @@ -236,7 +235,7 @@
<string name="usePattern">Usar patrón de bloquéu en cuantes d\'una contraseña</string>
<string name="stealthMode">Mou a la callandiella nel patrón</string>
<string name="patternMaxTry">Númberu máximu d\'intentos</string>
<string name="resetPattern">¿Reafitar patrón de bloquéu?</string>
<string name="resetPattern">¿Reafitar el patrón de bloquéu?</string>
<!-- Device Admin -->
<string name="enable_device_admin">Xestor de preseos</string>
<string name="device_admin_enabled">AFWall+ Device Admin enabled</string>
Expand All @@ -245,7 +244,7 @@
<!-- Experimental Preferences -->
<string name="exp_prefs_title">Esperimental</string>
<!-- Startup -->
<string name="startup_service">Aplicando regles. Espera, por favor.</string>
<string name="startup_service">Aplicando les regles. Espera, por favor.</string>
<string name="addStartupDelayTitle">Retrasu d\'aniciu</string>
<string name="addStartupDelaySummary">AFWall+ esperará 5 segundos enantes d\'aplicar les regles. Habilita esti axuste namái si les regles d\'aniciu nun s\'apliquen de mou afayadizu nel arranque.</string>
<string name="fixleakTitle">Iguar escape de datos nel aniciu</string>
Expand All @@ -264,7 +263,7 @@
<string name="rules_prefs_title">Regles/Coneutividá</string>
<string name="log_prefs_title">Rexistru</string>
<string name="hideicons_pref_title">Anubrir iconos d\'aplicaciones</string>
<string name="hideicons_pref_summary_on">Ameyora\'l rindimientu deshabilitando los iconos d\'aplicaciones na vista principal</string>
<string name="hideicons_pref_summary_on">Ameyora\'l rindimientu desactivando los iconos d\'aplicaciones na vista principal</string>
<string name="hideicons_pref_summary_off">Amuesa los iconos d\'aplicaciones na vista principal</string>
<string name="notify_pref_title">Habilitar avisos</string>
<string name="syscolor_pref_title">System applications</string>
Expand All @@ -273,7 +272,7 @@
<string name="accent_pref_title">Accent Color</string>
<string name="syscolor_pref_summary_on">Color pa toles aplicaciones del sistema</string>
<string name="enableConfirmTitle">Confirmar el deshabilitar AFWall+</string>
<string name="enableConfirm_summary_on">El tornafuéu pidirá la to confirmación enantes de deshabilitase</string>
<string name="enableConfirm_summary_on">El tornafuéu va pidir la confirmación enantes de desactivase</string>
<string name="showUid">Amosar UID p\'aplicaciones</string>
<string name="showuid_summary_on">Amuesa les UIDs d\'aplicaciones na vista principal</string>
<string name="showuid_summary_off">Anubre les UIDs d\'aplicación an vista principal. Habilitalo pue ser útil pa rastrexar rexistros.</string>
Expand Down Expand Up @@ -322,8 +321,8 @@
<string name="menu">Menú</string>
<string name="backup_notexist">Nun esisten respaldos. Esporta ún dende\'l menú, por favor.</string>
<string name="showFilter">Amosar peñeres</string>
<string name="showfilter_summary_on">Les peñeres (Too/Nucleu/Sistema/Usuariu) amuésense na vista principal</string>
<string name="showfilter_summary_off">Les peñeres (Too/Nucleu/Sistema/Usuariu) anúbrense na vista principal</string>
<string name="showfilter_summary_on">Les peñeres (Too/Nucleu/Sistema/Usuariu) van amosase na vista principal</string>
<string name="showfilter_summary_off">Les peñeres (Too/Nucleu/Sistema/Usuariu) van anubrise na vista principal</string>
<string name="enable_dns">Habilitar DNS pente netd</string>
<string name="disable_dns">Deshabilitar DNS pente netd</string>
<string name="dns_proxy_title">Proxy DNS </string>
Expand All @@ -344,14 +343,14 @@
<string name="unlock_donate"> calca pa desbloquiar la versión de donación</string>
<string name="donate_support">You can now use donate features.</string>
<string name="donate_thanks">Thanks for your support.</string>
<string name="activeNotification">Amosar iconu d\'avisu</string>
<string name="activeNotification">Amosar l\'iconu d\'avisu</string>
<string name="activeNotification_summary">Amuesa siempres un iconu na barra d\'avisos</string>
<string name="active">Firewall enabled</string>
<string name="inactive">Tornafuéu deshabilitáu</string>
<string name="About">Tocante a</string>
<string name="FAQ">FAQ</string>
<string name="su_check_title">Estáu</string>
<string name="su_check_message">Comprobando accesu root</string>
<string name="su_check_message">Comprobando l\'accesu root</string>
<!-- choose file -->
<!-- <string name="fileSize">File Size</string>-->
<!--<string name="currentDir">Current Dir</string>-->
Expand Down Expand Up @@ -425,12 +424,12 @@
<string name="custom_rules">Custom Rules</string>
<string name="mdnslabel">(mdns) Multicast DNS</string>
<string name="mdns">Enable Multicast DNS</string>
<string name="error_log">Nun pue aniciase\'l serviciu de rexistru. LogTarget ta baleru o LogService nun s\'habilitó.</string>
<string name="error_log">Nun pue aniciase\'l serviciu de rexistru. LogTarget ta baleru o LogService nun ta activáu.</string>
<string name="delete_profile">Nun pue desaniciase\'l perfil</string>
<string name="profile_migrate_msg">Profiles migrated</string>
<!-- Log Details -->
<string name="destination_address">Direición destín</string>
<string name="source_address">Direición fonte</string>
<string name="destination_address">Direición de destín</string>
<string name="source_address">Direición d\'orixe</string>
<string name="ping_destination">Destín de ping</string>
<string name="ping_source">Fonte de ping</string>
<string name="resolve_destination">Resolve Destination</string>
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/values-az/strings.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<!--
AFWall+ UI - String resource (English)
Expand All @@ -20,11 +19,11 @@
<string name="exit">Çıxış</string>
<string name="error_purge">Iptables təmizləmə xətası</string>
<string name="error_binary">Binary faylları quraşdırma xətası</string>
<string name="error_migration">Error migrating old settings</string>
<string name="error_migration">Köhnə tənzimləmələri köçürərkən xəta baş verdi</string>
<string name="error_refresh">Iptables təzələmə xətası</string>
<string name="error_apply">Iptables qaydalarının tətbiq edilmə xətası</string>
<string name="error_fetch">Iptables qaydalarının alınma xətası</string>
<string name="error_su_toast">Unable to aquire root access !</string>
<string name="error_su_toast">Kök müraciəti alına bilmir!</string>
<string name="error_su">Could not acquire root access.\nYour device must be rooted to use AFWall+.\n\nIf this device is already rooted, please ensure AFWall+ has permission to execute the \"su\" command.</string>
<string name="error_netfilter">Could not find support for iptables targets and chains.\nAFWall+ might not work as expected due to this limitation.</string>
<string name="error_common">Xəta: </string>
Expand Down
Loading

0 comments on commit 354770c

Please sign in to comment.