mirror of https://github.com/M66B/NetGuard.git
Removed settings to enable/disable foreground service
This commit is contained in:
M66B
parent
cb27726d0e
commit
b31bd037bd
|
|
@ -176,6 +176,15 @@ Besides that this requires questionable Android permissions,
|
|||
it is not possible to implement this, given the way NetGuard works.
|
||||
For more details, see [question 5](#FAQ5).
|
||||
|
||||
<a name="FAQ13"></a>
|
||||
**(13) How can I remove the on going notification in the status bar?**
|
||||
|
||||
* Long click the notification
|
||||
* Tap the 'i' icon
|
||||
* Enabled 'Block all'
|
||||
|
||||
Note that this will disable any warning notifications as well.
|
||||
|
||||
Support
|
||||
-------
|
||||
|
||||
|
|
|
|||
|
|
@ -114,13 +114,6 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
|
|||
|
||||
else if ("dark_theme".equals(name))
|
||||
recreate();
|
||||
|
||||
else if ("foreground".equals(name)) {
|
||||
if (prefs.getBoolean("enabled", false)) {
|
||||
SinkholeService.stop(this);
|
||||
SinkholeService.start(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ import java.nio.ByteOrder;
|
|||
public class SinkholeService extends VpnService {
|
||||
private static final String TAG = "NetGuard.Service";
|
||||
|
||||
private boolean foreground;
|
||||
private boolean last_roaming;
|
||||
private ParcelFileDescriptor vpn = null;
|
||||
private boolean debug = false;
|
||||
|
|
@ -105,10 +104,7 @@ public class SinkholeService extends VpnService {
|
|||
Log.i(TAG, "Executing intent=" + intent + " command=" + cmd + " vpn=" + (vpn != null));
|
||||
switch (cmd) {
|
||||
case start:
|
||||
if (prefs.getBoolean("foreground", true)) {
|
||||
foreground = true;
|
||||
startForeground(NOTIFY_FOREGROUND, getForegroundNotification());
|
||||
}
|
||||
startForeground(NOTIFY_FOREGROUND, getForegroundNotification());
|
||||
if (vpn == null) {
|
||||
vpn = startVPN();
|
||||
startDebug(vpn);
|
||||
|
|
@ -133,10 +129,7 @@ public class SinkholeService extends VpnService {
|
|||
stopVPN(vpn);
|
||||
vpn = null;
|
||||
}
|
||||
if (foreground) {
|
||||
foreground = false;
|
||||
stopForeground(true);
|
||||
}
|
||||
stopForeground(true);
|
||||
Widget.updateWidgets(SinkholeService.this);
|
||||
// stopSelf();
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -17,14 +17,12 @@ These issues are caused by bugs in Android, or in the software provided by the m
|
|||
<string name="setting_whitelist_other">حظر الشبكة بشكل افتراضي</string>
|
||||
<string name="setting_whitelist_roaming">Block roaming by default</string>
|
||||
<string name="setting_system">Manage system applications</string>
|
||||
<string name="setting_foreground">Start as foreground service</string>
|
||||
<string name="setting_dark">استخدام الثيم الداكن</string>
|
||||
<string name="setting_export">Export settings</string>
|
||||
<string name="setting_import">Import settings</string>
|
||||
<string name="setting_vpn">فتح إعدادات الـVPN</string>
|
||||
|
||||
<string name="summary_system">Define rules for system applications (for experts)</string>
|
||||
<string name="summary_foreground">Foreground services show an ongoing notification in the status bar and have less chance of being killed by Android</string>
|
||||
|
||||
<string name="msg_sure">هل أنت متأكد؟</string>
|
||||
<string name="msg_started">Enforcing rules</string>
|
||||
|
|
|
|||
|
|
@ -16,14 +16,12 @@ Das wird von Fehlern in Android oder in Software vom Hersteller verursacht. Bitt
|
|||
<string name="setting_whitelist_other">Blockiere Mobilfunk standardmäßig</string>
|
||||
<string name="setting_whitelist_roaming">Blockiere Roaming standardmäßig</string>
|
||||
<string name="setting_system">System Apps anzeigen</string>
|
||||
<string name="setting_foreground">Starte als Vordergrunddienst</string>
|
||||
<string name="setting_dark">Verwende dunkles Theme</string>
|
||||
<string name="setting_export">Exportiere Einstellungen</string>
|
||||
<string name="setting_import">Importiere Einstellungen</string>
|
||||
<string name="setting_vpn">Öffne Android VPN Einstellungen</string>
|
||||
|
||||
<string name="summary_system">Regeln für System Apps definieren, nur für Experten</string>
|
||||
<string name="summary_foreground">Vordergrunddienste zeigen eine dauerhafte Benachrichtigung und werden von Android mit geringerer Wahrscheinlichkeit beendet</string>
|
||||
|
||||
<string name="msg_sure">Bist du sicher?</string>
|
||||
<string name="msg_started">Regeln werden angewendet</string>
|
||||
|
|
|
|||
|
|
@ -17,14 +17,12 @@ Esto es causado por errores en Android, o por el software proporcionado por el f
|
|||
<string name="setting_whitelist_other">Bloquear red móvil por defecto</string>
|
||||
<string name="setting_whitelist_roaming">Bloquear roaming por defecto</string>
|
||||
<string name="setting_system">Administrar aplicaciones de sistema</string>
|
||||
<string name="setting_foreground">Start as foreground service</string>
|
||||
<string name="setting_dark">Usar tema oscuro</string>
|
||||
<string name="setting_export">Exportar configuración</string>
|
||||
<string name="setting_import">Importar configuración</string>
|
||||
<string name="setting_vpn">Abrir configuración VPN de Android</string>
|
||||
|
||||
<string name="summary_system">Define rules for system applications (for experts)</string>
|
||||
<string name="summary_foreground">Foreground services show an ongoing notification in the status bar and have less chance of being killed by Android</string>
|
||||
|
||||
<string name="msg_sure">¿Estás seguro?</string>
|
||||
<string name="msg_started">Enforcing rules</string>
|
||||
|
|
|
|||
|
|
@ -17,14 +17,12 @@ Ceci est causé par des bugs dans Android, ou dans le logiciel fourni par le con
|
|||
<string name="setting_whitelist_other">Blocage données mobiles par défaut</string>
|
||||
<string name="setting_whitelist_roaming">Blocage roaming par défaut</string>
|
||||
<string name="setting_system">Gérer les applications système</string>
|
||||
<string name="setting_foreground">Start as foreground service</string>
|
||||
<string name="setting_dark">Utiliser le thème sombre</string>
|
||||
<string name="setting_export">Exporter paramètres</string>
|
||||
<string name="setting_import">Importer paramètres</string>
|
||||
<string name="setting_vpn">Ouvrir les paramètres VPN</string>
|
||||
|
||||
<string name="summary_system">Define rules for system applications (for experts)</string>
|
||||
<string name="summary_foreground">Foreground services show an ongoing notification in the status bar and have less chance of being killed by Android</string>
|
||||
|
||||
<string name="msg_sure">Etes-vous sûr ?</string>
|
||||
<string name="msg_started">Enforcing rules</string>
|
||||
|
|
|
|||
|
|
@ -18,14 +18,12 @@ Ció è causato da alcuni bug contenuti in Android, o in programmi forniti dal p
|
|||
<string name="setting_whitelist_other">Blocca rete dati di default</string>
|
||||
<string name="setting_whitelist_roaming">Blocca roaming di default</string>
|
||||
<string name="setting_system">Gestisci applicazioni di sistema</string>
|
||||
<string name="setting_foreground">Avvia come servizio in primo piano</string>
|
||||
<string name="setting_dark">Usa il tema scuro</string>
|
||||
<string name="setting_export">Esporta impostazioni</string>
|
||||
<string name="setting_import">Importa impostazioni</string>
|
||||
<string name="setting_vpn">Apri impostazioni VPN</string>
|
||||
|
||||
<string name="summary_system">Definisci regole per le applicazioni di sistema (solo per esperti)</string>
|
||||
<string name="summary_foreground">I servizi in primo piano mostrano una notifica nella barra di stato e hanno meno probabilitá di essere terminati da Android</string>
|
||||
|
||||
<string name="msg_sure">Sei sicuro?</string>
|
||||
<string name="msg_started">Regole applicate</string>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
<string name="setting_whitelist_other">デフォルトでモバイル通信をブロック</string>
|
||||
<string name="setting_whitelist_roaming">デフォルトでローミングをブロック</string>
|
||||
<string name="setting_system">システムアプリケーションの管理</string>
|
||||
<string name="setting_foreground">Start as foreground service</string>
|
||||
<string name="setting_dark">ダークテーマを使用する</string>
|
||||
<string name="setting_export">設定をエクスポート</string>
|
||||
<string name="setting_import">設定をインポート</string>
|
||||
|
|
@ -25,7 +24,6 @@
|
|||
<string name="msg_try">Try NetGuard</string>
|
||||
|
||||
<string name="summary_system">システムアプリケーションのルールを定義します (エキスパート向け)</string>
|
||||
<string name="summary_foreground">Foreground services show an ongoing notification in the status bar and have less chance of being killed by Android</string>
|
||||
|
||||
<string name="msg_sure">よろしいですか?</string>
|
||||
<string name="msg_started">Enforcing rules</string>
|
||||
|
|
|
|||
|
|
@ -17,14 +17,12 @@ These issues are caused by bugs in Android, or in the software provided by the m
|
|||
<string name="setting_whitelist_other">모바일 데이터 차단을 기본 설정으로</string>
|
||||
<string name="setting_whitelist_roaming">Block roaming by default</string>
|
||||
<string name="setting_system">Manage system applications</string>
|
||||
<string name="setting_foreground">Start as foreground service</string>
|
||||
<string name="setting_dark">어두운 테마 사용</string>
|
||||
<string name="setting_export">Export settings</string>
|
||||
<string name="setting_import">Import settings</string>
|
||||
<string name="setting_vpn">Android VPN 설정 열기</string>
|
||||
|
||||
<string name="summary_system">Define rules for system applications (for experts)</string>
|
||||
<string name="summary_foreground">Foreground services show an ongoing notification in the status bar and have less chance of being killed by Android</string>
|
||||
|
||||
<string name="msg_sure">계속 하시겠습니까?</string>
|
||||
<string name="msg_started">Enforcing rules</string>
|
||||
|
|
|
|||
|
|
@ -17,14 +17,12 @@ These issues are caused by bugs in Android, or in the software provided by the m
|
|||
<string name="setting_whitelist_other">Blokkeer mobiel standaard</string>
|
||||
<string name="setting_whitelist_roaming">Blokkeer roaming standaard</string>
|
||||
<string name="setting_system">Beheer systeemapplicaties</string>
|
||||
<string name="setting_foreground">Start als voorgrondservice</string>
|
||||
<string name="setting_dark">Gebruik donker thema</string>
|
||||
<string name="setting_export">Exporteer instellingen</string>
|
||||
<string name="setting_import">Importeer instellingen</string>
|
||||
<string name="setting_vpn">Open Android VPN-instellingen</string>
|
||||
|
||||
<string name="summary_system">Define rules for system applications (for experts)</string>
|
||||
<string name="summary_foreground">Foreground services show an ongoing notification in the status bar and have less chance of being killed by Android</string>
|
||||
|
||||
<string name="msg_sure">Weet u het zeker?</string>
|
||||
<string name="msg_started">Regels worden afgedwongen</string>
|
||||
|
|
|
|||
|
|
@ -17,14 +17,12 @@ Problemy te są spowodowane błędami w samym Androidzie, lub oprogramowaniu dos
|
|||
<string name="setting_whitelist_other">Domyślnie blokuj Mobilne</string>
|
||||
<string name="setting_whitelist_roaming">Domyślnie blokuj Roaming</string>
|
||||
<string name="setting_system">Zarządzaj aplikacjami systemowymi</string>
|
||||
<string name="setting_foreground">Uruchom jako zadanie w tle</string>
|
||||
<string name="setting_dark">Użyj ciemnej skórki</string>
|
||||
<string name="setting_export">Eksport ustawień</string>
|
||||
<string name="setting_import">Import ustawień</string>
|
||||
<string name="setting_vpn">Otwórz ustawienia VPN w Androidzie</string>
|
||||
|
||||
<string name="summary_system">Stwórz reguły dla aplikacji systemowych(zaawansowane)</string>
|
||||
<string name="summary_foreground">Zadania w tle pokazywane są w pasku statusu i rzadziej bywają zamknięte przez system Android</string>
|
||||
|
||||
<string name="msg_sure">Na pewno?</string>
|
||||
<string name="msg_started">Wymuś Reguły</string>
|
||||
|
|
|
|||
|
|
@ -17,14 +17,12 @@ Acest lucru este cauzat de bug-uri in Android sau in software-ul pus la dispozit
|
|||
<string name="setting_whitelist_other">Blocheaza implicit date mobile</string>
|
||||
<string name="setting_whitelist_roaming">Blocheaza implicit in roaming</string>
|
||||
<string name="setting_system">Gestionati aplicatiile de sistem</string>
|
||||
<string name="setting_foreground">Porneste un serviciu in prim plan</string>
|
||||
<string name="setting_dark">Foloseste tema intunecata</string>
|
||||
<string name="setting_export">Exporta setari</string>
|
||||
<string name="setting_import">Importa setari</string>
|
||||
<string name="setting_vpn">Deschide setari VPN Android</string>
|
||||
|
||||
<string name="summary_system">Defineste reguli pentru aplicatiile de sistem (setare expert)</string>
|
||||
<string name="summary_foreground">Serviciul in prim plan arata o notificare in bara de stare si e mai putin probabil sa fie inchis de sistemul Android</string>
|
||||
|
||||
<string name="msg_sure">Esti sigur?</string>
|
||||
<string name="msg_started">Limitari activate</string>
|
||||
|
|
|
|||
|
|
@ -15,14 +15,12 @@
|
|||
<string name="setting_whitelist_other">Блокировать моб. сеть по умолч.</string>
|
||||
<string name="setting_whitelist_roaming">Блокировать роуминг по умолч.</string>
|
||||
<string name="setting_system">Управлять сист. приложениями</string>
|
||||
<string name="setting_foreground">Запустить как фоновый сервис</string>
|
||||
<string name="setting_dark">Использовать темную тему</string>
|
||||
<string name="setting_export">Экспорт настроек</string>
|
||||
<string name="setting_import">Импорт настроек</string>
|
||||
<string name="setting_vpn">Открыть параметры VPN</string>
|
||||
|
||||
<string name="summary_system">Определить правила для системных приложений (для профи)</string>
|
||||
<string name="summary_foreground">Всегда уведомлять в статус-баре, меньше шансов быть убитым Android</string>
|
||||
|
||||
<string name="msg_sure">Вы уверены?</string>
|
||||
<string name="msg_started">Определить правила</string>
|
||||
|
|
|
|||
|
|
@ -17,14 +17,12 @@ Je to spôsobené chybami v Androide alebo v softvéri poskytovanom výrobcom, p
|
|||
<string name="setting_whitelist_other">Predvolene blokovať mobilné dáta</string>
|
||||
<string name="setting_whitelist_roaming">Predvolene blokovať roaming</string>
|
||||
<string name="setting_system">Spravovať systémové aplikácie</string>
|
||||
<string name="setting_foreground">Start as foreground service</string>
|
||||
<string name="setting_dark">Použiť tmavú tému</string>
|
||||
<string name="setting_export">Exportovať nastavenia</string>
|
||||
<string name="setting_import">Importovať nastavenia</string>
|
||||
<string name="setting_vpn">Otvoriť nastavenia VPN</string>
|
||||
|
||||
<string name="summary_system">Define rules for system applications (for experts)</string>
|
||||
<string name="summary_foreground">Foreground services show an ongoing notification in the status bar and have less chance of being killed by Android</string>
|
||||
|
||||
<string name="msg_sure">Ste si istý?</string>
|
||||
<string name="msg_started">Enforcing rules</string>
|
||||
|
|
|
|||
|
|
@ -17,14 +17,12 @@
|
|||
<string name="setting_whitelist_other">默认阻止移动网络</string>
|
||||
<string name="setting_whitelist_roaming">默认阻止漫游</string>
|
||||
<string name="setting_system">管理系统应用</string>
|
||||
<string name="setting_foreground">作为前台服务启动</string>
|
||||
<string name="setting_dark">使用暗色主题</string>
|
||||
<string name="setting_export">导出设置</string>
|
||||
<string name="setting_import">导入设置</string>
|
||||
<string name="setting_vpn">打开安卓VPN设置</string>
|
||||
|
||||
<string name="summary_system">定义系统应用规则, 仅供专业用户</string>
|
||||
<string name="summary_foreground">前台服务在状态栏显示常驻通知,被系统终止的可能性较低</string>
|
||||
|
||||
<string name="msg_sure">是否确认?</string>
|
||||
<string name="msg_started">规则加载中</string>
|
||||
|
|
|
|||
|
|
@ -18,14 +18,12 @@ These issues are caused by bugs in Android, or in the software provided by the m
|
|||
<string name="setting_whitelist_other">Block mobile by default</string>
|
||||
<string name="setting_whitelist_roaming">Block roaming by default</string>
|
||||
<string name="setting_system">Manage system applications</string>
|
||||
<string name="setting_foreground">Start as foreground service</string>
|
||||
<string name="setting_dark">Use dark theme</string>
|
||||
<string name="setting_export">Export settings</string>
|
||||
<string name="setting_import">Import settings</string>
|
||||
<string name="setting_vpn">Open Android VPN settings</string>
|
||||
|
||||
<string name="summary_system">Define rules for system applications (for experts)</string>
|
||||
<string name="summary_foreground">Foreground services show an ongoing notification in the status bar and have less chance of being killed by Android</string>
|
||||
|
||||
<string name="msg_sure">Are you sure?</string>
|
||||
<string name="msg_started">Enforcing rules</string>
|
||||
|
|
|
|||
|
|
@ -17,11 +17,6 @@
|
|||
android:key="manage_system"
|
||||
android:summary="@string/summary_system"
|
||||
android:title="@string/setting_system" />
|
||||
<SwitchPreference
|
||||
android:defaultValue="true"
|
||||
android:key="foreground"
|
||||
android:summary="@string/summary_foreground"
|
||||
android:title="@string/setting_foreground" />
|
||||
<SwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="dark_theme"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
#!/bin/bash
|
||||
#grep -RIl "\<string name=\"msg_settings_specific" app/src/main/res | xargs sed -i -e '/msg_settings_specific/a \
|
||||
#\ \ \ \ <string name=\"msg_corrupt\">The privacy database was reset, because it was corrupt</string>'
|
||||
|
||||
#grep -RIl "\<string name=\"title_template_merge" app/src/main/res | xargs sed -i -e 's/Apply template (merge)/Apply template (merge set)/g'
|
||||
|
||||
grep -RIl "\<string name=\"setting_foreground" app/src/main/res | xargs sed -i -e '/setting_foreground/d'
|
||||
grep -RIl "\<string name=\"summary_foreground" app/src/main/res | xargs sed -i -e '/summary_foreground/d'
|
||||
#grep -RIl "\<string name=\"restrict_help_internet" app/src/main/res | xargs sed -i -e 's/internet</Internet</g'
|
||||
#grep -RIl "\<string name=\"settings_aosp" app/src/main/res | xargs sed -i -e 's/requires restart/requires reboot/g'
|
||||
Loading…
Reference in New Issue