mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added menu FAQ 

Closes #161
This commit is contained in:
M66B 2015-11-17 14:26:26 +01:00
parent f4f6597211
commit 3f1615b633
18 changed files with 119 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View File

@ -64,6 +64,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
private MenuItem menuSearch = null;
private AlertDialog dialogFirst = null;
private AlertDialog dialogVpn = null;
private AlertDialog dialogSupport = null;
private AlertDialog dialogAbout = null;
private static final int REQUEST_VPN = 1;
@ -234,6 +235,10 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
dialogVpn.dismiss();
dialogVpn = null;
}
if (dialogSupport != null) {
dialogSupport.dismiss();
dialogSupport = null;
}
if (dialogAbout != null) {
dialogAbout.dismiss();
dialogAbout = null;
@ -387,6 +392,9 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
if (!Util.hasValidFingerprint(TAG, this) || getIntentInvite(this).resolveActivity(getPackageManager()) == null)
menu.removeItem(R.id.menu_invite);
if (getIntentFAQ().resolveActivity(getPackageManager()) == null)
menu.removeItem(R.id.menu_faq);
if (getIntentSupport().resolveActivity(getPackageManager()) == null)
menu.removeItem(R.id.menu_support);
@ -405,8 +413,39 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
startActivityForResult(getIntentInvite(this), REQUEST_INVITE);
return true;
case R.id.menu_faq:
startActivity(getIntentFAQ());
return true;
case R.id.menu_support:
startActivity(getIntentSupport());
if (getIntentFAQ().resolveActivity(getPackageManager()) == null)
startActivity(getIntentSupport());
else {
dialogSupport = new AlertDialog.Builder(this)
.setMessage(R.string.msg_faq)
.setCancelable(true)
.setPositiveButton(R.string.msg_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
startActivity(getIntentSupport());
}
})
.setNegativeButton(R.string.msg_no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
startActivity(getIntentFAQ());
}
})
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
dialogSupport = null;
}
})
.create();
dialogSupport.show();
}
return true;
case R.id.menu_about:
@ -547,4 +586,9 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
return intent;
}
private static Intent getIntentFAQ() {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("https://github.com/M66B/NetGuard/blob/master/FAQ.md"));
return intent;
}
}

3
app/src/main/res/menu/main.xml
View File

@ -13,6 +13,9 @@
<item
android:id="@+id/menu_invite"
android:title="@string/menu_invite" />
<item
android:id="@+id/menu_faq"
android:title="@string/menu_faq" />
<item
android:id="@+id/menu_support"
android:title="@string/menu_support" />

4
app/src/main/res/values-ar/strings.xml
View File

@ -10,6 +10,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
<string name="menu_search">البحث عن تطبيقات</string>
<string name="menu_settings">Settings</string>
<string name="menu_invite">Invite</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">الدعم</string>
<string name="menu_about">حول</string>
@ -28,6 +29,9 @@ These issues are caused by bugs in Android, or in the software provided by the m
<string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
<string name="msg_sure">هل أنت متأكد؟</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Enforcing rules</string>
<string name="msg_disabled">التطبيق غير مُفعّل, قم بتفعيل التطبيق من الخيار أعلاه.</string>
<string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>

4
app/src/main/res/values-de/strings.xml
View File

@ -9,6 +9,7 @@ Das wird von Fehlern in Android oder in Software vom Hersteller verursacht. Bitt
<string name="menu_search">Nach Apps suchen</string>
<string name="menu_settings">Einstellungen</string>
<string name="menu_invite">Einladung</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">Hilfe</string>
<string name="menu_about">Über</string>
@ -27,6 +28,9 @@ Das wird von Fehlern in Android oder in Software vom Hersteller verursacht. Bitt
<string name="summary_metered">Mobilfunk-Regeln gemessenen (bezahlten, tethered) WLAN-Netzwerken anwenden</string>
<string name="msg_sure">Sind Sie sicher?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Regeln werden angewendet</string>
<string name="msg_disabled">NetGuard ist deaktiviert. Verwenden Sie den Schalter, um NetGuard zu aktivieren</string>
<string name="msg_revoked">NetGuard wurde deaktiviert. Wahrscheinlich durch Verwendung einer VPN-Anwendung</string>

4
app/src/main/res/values-es/strings.xml
View File

@ -10,6 +10,7 @@ Esto es causado por errores en Android, o por el software proporcionado por el f
<string name="menu_search">Buscar aplicación</string>
<string name="menu_settings">Configuración</string>
<string name="menu_invite">Invitar</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">Soporte</string>
<string name="menu_about">Acerca de</string>
@ -28,6 +29,9 @@ Esto es causado por errores en Android, o por el software proporcionado por el f
<string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
<string name="msg_sure">¿Estás seguro?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Aplicando reglas</string>
<string name="msg_disabled">NetGuard está deshabilitado, utiliza el interruptor de arriba para habilitar a NetGuard</string>
<string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>

4
app/src/main/res/values-fr/strings.xml
View File

@ -10,6 +10,7 @@ Ceci est causé par des bugs dans Android, ou dans le logiciel fourni par le con
<string name="menu_search">Recherche application</string>
<string name="menu_settings">Paramètres</string>
<string name="menu_invite">Invité</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">Support</string>
<string name="menu_about">À propos</string>
@ -28,6 +29,9 @@ Ceci est causé par des bugs dans Android, ou dans le logiciel fourni par le con
<string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
<string name="msg_sure">Etes-vous sûr ?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Enforcing rules</string>
<string name="msg_disabled">NetGuard est désactivé, utilisez le bouton ci-dessus pour activer NetGuard</string>
<string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>

4
app/src/main/res/values-it/strings.xml
View File

@ -11,6 +11,7 @@ Ció è causato da alcuni bug contenuti in Android, o in programmi forniti dal p
<string name="menu_search">Cerca applicazione</string>
<string name="menu_settings">Impostazioni</string>
<string name="menu_invite">Invita</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">Supporto</string>
<string name="menu_about">Info</string>
@ -29,6 +30,9 @@ Ció è causato da alcuni bug contenuti in Android, o in programmi forniti dal p
<string name="summary_metered">Applica le regole per le reti cellulari anche alle reti Wi-Fi a consumo (a pagamento, condivise)</string>
<string name="msg_sure">Sei sicuro?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Regole applicate</string>
<string name="msg_disabled">NetGuard è disabilitata, usa lo switch per abilitarla nuovamente</string>
<string name="msg_revoked">NetGuard è stata disabilitata, probabilmente a causa di un\'altra applicazione che usa il servizio VPN</string>

4
app/src/main/res/values-ja/strings.xml
View File

@ -10,6 +10,7 @@
<string name="menu_search">アプリケーションの検索</string>
<string name="menu_settings">設定</string>
<string name="menu_invite">Invite</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">サポート</string>
<string name="menu_about">アプリについて</string>
@ -31,6 +32,9 @@
<string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
<string name="msg_sure">よろしいですか?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Enforcing rules</string>
<string name="msg_disabled">NetGuard は無効です。NetGuard を有効にするには上のスイッチを使用してください</string>
<string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>

4
app/src/main/res/values-ko/strings.xml
View File

@ -10,6 +10,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
<string name="menu_search">앱 검색</string>
<string name="menu_settings">Settings</string>
<string name="menu_invite">Invite</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">지원</string>
<string name="menu_about">넷가드 정보</string>
@ -28,6 +29,9 @@ These issues are caused by bugs in Android, or in the software provided by the m
<string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
<string name="msg_sure">계속 하시겠습니까?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Enforcing rules</string>
<string name="msg_disabled">넷가드가 해제되어 있습니다. 상단 스위치를 사용해 넷가드를 활성화하세요.</string>
<string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>

4
app/src/main/res/values-nl/strings.xml
View File

@ -10,6 +10,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
<string name="menu_search">Zoek naar applicatie</string>
<string name="menu_settings">Instellingen</string>
<string name="menu_invite">Uitnodigen</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">Ondersteuning</string>
<string name="menu_about">Over</string>
@ -28,6 +29,9 @@ These issues are caused by bugs in Android, or in the software provided by the m
<string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
<string name="msg_sure">Weet u het zeker?</string>
<string name="msg_faq">Heeft u in de FAQ gekeken?</string>
<string name="msg_yes">Ja</string>
<string name="msg_no">Nee</string>
<string name="msg_started">Regels worden afgedwongen</string>
<string name="msg_disabled">NetGuard staat uit, gebruik de schakelaar boven om NetGuard aan te zetten</string>
<string name="msg_revoked">NetGuard is uitgezet, waarschijnlijk door een andere VPN applicatie</string>

4
app/src/main/res/values-pl/strings.xml
View File

@ -10,6 +10,7 @@ Problemy te są spowodowane błędami w samym Androidzie, lub oprogramowaniu dos
<string name="menu_search">Szukaj aplikacji</string>
<string name="menu_settings">Ustawienia</string>
<string name="menu_invite">Zaproś</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">Wsparcie</string>
<string name="menu_about">O...</string>
@ -28,6 +29,9 @@ Problemy te są spowodowane błędami w samym Androidzie, lub oprogramowaniu dos
<string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
<string name="msg_sure">Na pewno?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Wymuś Reguły</string>
<string name="msg_disabled">NetGuard jest wyłączony, użyj przełącznika u góry by go uruchomić</string>
<string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>

4
app/src/main/res/values-ro/strings.xml
View File

@ -10,6 +10,7 @@ Acest lucru este cauzat de bug-uri in Android sau in software-ul pus la dispozit
<string name="menu_search">Cauta aplicatii</string>
<string name="menu_settings">Setari</string>
<string name="menu_invite">Invita</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">Asistenta</string>
<string name="menu_about">Despre</string>
@ -28,6 +29,9 @@ Acest lucru este cauzat de bug-uri in Android sau in software-ul pus la dispozit
<string name="summary_metered">Trateaza conexiunile Wi-Fi contorizate (cu plata, hot-spot) precum date mobile</string>
<string name="msg_sure">Esti sigur?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Limitari activate</string>
<string name="msg_disabled">NetGuard este momentan dezactivat, foloseste comutatorul de mai sus pentru a il activa</string>
<string name="msg_revoked">NetGuard a fost dezactivat, probabil de o alta aplicatie ce foloseste o conexiune VPN</string>

4
app/src/main/res/values-ru/strings.xml
View File

@ -8,6 +8,7 @@
<string name="menu_search">Поиск приложения</string>
<string name="menu_settings">Настройки</string>
<string name="menu_invite">Пригласить</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">Поддержка</string>
<string name="menu_about">О приложении</string>
@ -26,6 +27,9 @@
<string name="summary_metered">Применить правила для лимитированных (платных, ограниченных) Wi-Fi сетей</string>
<string name="msg_sure">Вы уверены?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Определить правила</string>
<string name="msg_disabled">NetGuard отключен, используйте переключатель выше для включения</string>
<string name="msg_revoked">NetGuard был отключен, скорее всего, из-за применения другого VPN-подключения</string>

4
app/src/main/res/values-sk/strings.xml
View File

@ -10,6 +10,7 @@ Je to spôsobené chybami v Androide alebo v softvéri poskytovanom výrobcom, p
<string name="menu_search">Hľadať aplikáciu</string>
<string name="menu_settings">Nastavenia</string>
<string name="menu_invite">Pozvať</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">Podpora</string>
<string name="menu_about">O aplikácii</string>
@ -28,6 +29,9 @@ Je to spôsobené chybami v Androide alebo v softvéri poskytovanom výrobcom, p
<string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
<string name="msg_sure">Ste si istý?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Pravidlá vynútenia</string>
<string name="msg_disabled">NetGuard je vypnutý, použite prepínač vyššie na zapnutie NetGuard</string>
<string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>

4
app/src/main/res/values-uk/strings.xml
View File

@ -6,6 +6,7 @@
<string name="menu_search">Пошук додатку</string>
<string name="menu_settings">Налаштування</string>
<string name="menu_invite">Запросити</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">Підтримка</string>
<string name="menu_about">Про</string>
@ -24,6 +25,9 @@
<string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
<string name="msg_sure">Ви впевнені?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Визначити правила</string>
<string name="msg_disabled">NetGuard вимкнено, аби увімкнути, використовуй перемикач, що знаходиться вище</string>
<string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>

4
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -10,6 +10,7 @@
<string name="menu_search">搜索应用</string>
<string name="menu_settings">设置</string>
<string name="menu_invite">邀请</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">软件支持</string>
<string name="menu_about">关于</string>
@ -28,6 +29,9 @@
<string name="summary_metered">将移动网络规则应用于按流量计费的 (付费, 共享) Wi-Fi网络</string>
<string name="msg_sure">是否确认?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">规则加载中</string>
<string name="msg_disabled">NetGuard已被停用, 请使用上方的开关启用NetGuard</string>
<string name="msg_revoked">NetGuard已被停用, 可能是由于您启动了另一个基于VPN的应用</string>

4
app/src/main/res/values/strings.xml
View File

@ -11,6 +11,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
<string name="menu_search">Search for application</string>
<string name="menu_settings">Settings</string>
<string name="menu_invite">Invite</string>
<string name="menu_faq">FAQ</string>
<string name="menu_support">Support</string>
<string name="menu_about">About</string>
@ -29,6 +30,9 @@ These issues are caused by bugs in Android, or in the software provided by the m
<string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
<string name="msg_sure">Are you sure?</string>
<string name="msg_faq">Did you check the FAQ?</string>
<string name="msg_yes">Yes</string>
<string name="msg_no">No</string>
<string name="msg_started">Enforcing rules</string>
<string name="msg_disabled">NetGuard is disabled, use the switch above to enable NetGuard</string>
<string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based application</string>

17
strings.sh
View File

@ -1,12 +1,17 @@
#!/bin/bash
grep -RIl "\<string name=\"setting_metered" app/src/main/res | xargs sed -i -e '/setting_metered/d'
grep -RIl "\<string name=\"setting_whitelist_roaming" app/src/main/res | xargs sed -i -e '/setting_whitelist_roaming/a\
\ \ \ \ <string name="setting_metered">Handle metered WiFi networks</string>'
#grep -RIl "\<string name=\"setting_metered" app/src/main/res | xargs sed -i -e '/setting_metered/d'
grep -RIl "\<string name=\"summary_metered" app/src/main/res | xargs sed -i -e '/summary_metered/d'
grep -RIl "\<string name=\"summary_system" app/src/main/res | xargs sed -i -e '/summary_system/a\
\ \ \ \ <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) WiFi networks</string>'
#grep -RIl "\<string name=\"menu_invite" app/src/main/res | xargs sed -i -e '/menu_invite/a\
#\ \ \ \ <string name="menu_faq">FAQ</string>'
#grep -RIl "\<string name=\"msg_sure" app/src/main/res | xargs sed -i -e '/msg_sure/a\
#\ \ \ \ <string name="msg_faq">Did you check the FAQ?</string>'
grep -RIl "\<string name=\"msg_faq" app/src/main/res | xargs sed -i -e '/msg_faq/a\
\ \ \ \ <string name="msg_no">No</string>'
grep -RIl "\<string name=\"msg_faq" app/src/main/res | xargs sed -i -e '/msg_faq/a\
\ \ \ \ <string name="msg_yes">Yes</string>'
#grep -RIl "\<string name=\"title_disabled" app/src/main/res | xargs sed -i -e 's/Is disabled/is disabled/g'
#grep -RIl "\<string name=\"title_internet" app/src/main/res | xargs sed -i -e 's/Has no internet access/has no internet permission/g'