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

Merge branch 'master' of https://github.com/M66B/NetGuard

This commit is contained in:
Marco 2015-11-13 19:55:32 +01:00
parent dfb178bbbe e479e1370d
commit 8505267c01
18 changed files with 62 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/netguard/RuleAdapter.java
View File

@ -65,7 +65,6 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
public ImageView ivIcon;
public ImageView ivExpander;
public TextView tvName;
public TextView tvPackage;
public CheckBox cbWifi;
public CheckBox cbOther;
@ -74,6 +73,9 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
public TextView tvRoaming;
public LinearLayout llConfiguration;
public TextView tvPackage;
public TextView tvDisabled;
public TextView tvInternet;
public CheckBox cbUsing;
public CheckBox cbRoaming;
public ImageButton btnSettings;
@ -97,6 +99,8 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
llConfiguration = (LinearLayout) itemView.findViewById(R.id.llConfiguration);
tvPackage = (TextView) itemView.findViewById(R.id.tvPackage);
tvDisabled = (TextView) itemView.findViewById(R.id.tvDisabled);
tvInternet = (TextView) itemView.findViewById(R.id.tvInternet);
cbUsing = (CheckBox) itemView.findViewById(R.id.cbUsing);
cbRoaming = (CheckBox) itemView.findViewById(R.id.cbRoaming);
btnSettings = (ImageButton) itemView.findViewById(R.id.btnSettings);
@ -224,6 +228,9 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
else
holder.tvPackage.setText(rule.info.applicationInfo.uid + " " + rule.info.packageName);
holder.tvDisabled.setVisibility(rule.disabled ? View.VISIBLE : View.GONE);
holder.tvInternet.setVisibility(rule.internet ? View.GONE : View.VISIBLE);
holder.cbUsing.setOnCheckedChangeListener(null);
holder.cbUsing.setChecked(rule.unused);
holder.cbUsing.setEnabled(rule.wifi_blocked || rule.other_blocked);

20
app/src/main/res/layout/rule.xml
View File

@ -109,6 +109,26 @@
android:layout_marginTop="4dp"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
<TextView
android:id="@+id/tvInternet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/title_internet"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textStyle="italic"
android:visibility="gone" />
<TextView
android:id="@+id/tvDisabled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/title_disabled"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textStyle="italic"
android:visibility="gone" />
<CheckBox
android:id="@+id/cbUsing"
android:layout_width="wrap_content"

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

@ -39,6 +39,8 @@ Since NetGuard has no internet permission, you know your internet traffic is not
<string name="title_using">Allow when screen is on</string>
<string name="title_roaming">Block when roaming</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">Start application</string>
<string name="title_donate">Donate</string>
<string name="title_rate">Rate</string>

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

@ -38,6 +38,8 @@ Since NetGuard has no internet permission, you know your internet traffic is not
<string name="title_using">Erlauben wenn Bildschirm an</string>
<string name="title_roaming">Blockiere bei Roaming</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">Starte App</string>
<string name="title_donate">Spenden</string>
<string name="title_rate">Bewerten</string>

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

@ -39,6 +39,8 @@ Puesto que NetGuard no tiene permisos de internet, ya sabes que tu tráfico de i
<string name="title_using">Permitir cuando la pantalla esté encendida</string>
<string name="title_roaming">Bloquear cuando se esté en roaming</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">Iniciar aplicación</string>
<string name="title_donate">Donar</string>
<string name="title_rate">Calificar</string>

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

@ -41,6 +41,8 @@ Faire un don est une de façon de montrer votre soutiens aux développeur et vot
<string name="title_using">Accepter si l\'ecran est allumé</string>
<string name="title_roaming">Bloquer si roaming</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">Lancer l\'application</string>
<string name="title_donate">Faire un don</string>
<string name="title_rate">Rate</string>

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

@ -41,6 +41,8 @@ Ció è causato da alcuni bug contenuti in Android, o in programmi forniti dal p
<string name="title_using">Permetti quando lo schermo è acceso</string>
<string name="title_roaming">Blocca quando in roaming</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">Avvia applicazione</string>
<string name="title_donate">Dona</string>
<string name="title_rate">Vota</string>

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

@ -39,6 +39,8 @@ Since NetGuard has no internet permission, you know your internet traffic is not
<string name="title_using">Allow when screen is on</string>
<string name="title_roaming">ローミング時にブロック</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">アプリケーションを開始</string>
<string name="title_donate">寄付する</string>
<string name="title_rate">Rate</string>

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

@ -39,6 +39,8 @@ Since NetGuard has no internet permission, you know your internet traffic is not
<string name="title_using">Allow when screen is on</string>
<string name="title_roaming">Block when roaming</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">앱 시작</string>
<string name="title_donate">기부</string>
<string name="title_rate">Rate</string>

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

@ -39,6 +39,8 @@ Since NetGuard has no internet permission, you know your internet traffic is not
<string name="title_using">Sta toe als scherm aan is</string>
<string name="title_roaming">Blokkeer bij roamen</string>
<string name="title_disabled">is uitgezet</string>
<string name="title_internet">heeft geen internet toegang</string>
<string name="title_launch">Start applicatie</string>
<string name="title_donate">Doneer</string>
<string name="title_rate">Beoordeel</string>

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

@ -39,6 +39,8 @@ Since NetGuard has no internet permission, you know your internet traffic is not
<string name="title_using">Allow when screen is on</string>
<string name="title_roaming">Blokuj gdy roaming</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">Start aplikacji</string>
<string name="title_donate">Wspomóż</string>
<string name="title_rate">Oceń</string>

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

@ -39,6 +39,8 @@ Cum NetGuard efectiv nu are permisiunea de a accesa internetul, esti sigur ca tr
<string name="title_using">Permite doar cand ecranul este pornit</string>
<string name="title_roaming">Blocheaza in roaming</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">Porneste aplicatia</string>
<string name="title_donate">Doneaza</string>
<string name="title_rate">Evalueaza aplicatia</string>

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

@ -37,6 +37,8 @@ Since NetGuard has no internet permission, you know your internet traffic is not
<string name="title_using">Разрешить, когда экран включен</string>
<string name="title_roaming">Блокировать в роуминге</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">Запуск приложения</string>
<string name="title_donate">Пожертвовать</string>
<string name="title_rate">Оценить</string>

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

@ -39,6 +39,8 @@ Since NetGuard has no internet permission, you know your internet traffic is not
<string name="title_using">Povoliť pri zapnutej obrazovke</string>
<string name="title_roaming">Blokovať pri roamingu</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">Spustiť aplikáciu</string>
<string name="title_donate">Prispieť</string>
<string name="title_rate">Ohodnotiť</string>

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

@ -36,6 +36,8 @@ Since NetGuard has no internet permission, you know your internet traffic is not
<string name="title_using">Дозволити, коли екран увімкнуто</string>
<string name="title_roaming">Блокувати у роумінгу</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">Запуск додатку</string>
<string name="title_donate">Матеріально подякувати</string>
<string name="title_rate">Оцінити</string>

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

@ -39,6 +39,8 @@ Since NetGuard has no internet permission, you know your internet traffic is not
<string name="title_using">亮屏时允许</string>
<string name="title_roaming">漫游时阻止</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">启动应用</string>
<string name="title_donate">捐赠</string>
<string name="title_rate">评分</string>

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

@ -40,6 +40,8 @@ Since NetGuard has no internet permission, you know your internet traffic is not
<string name="title_using">Allow when screen is on</string>
<string name="title_roaming">Block when roaming</string>
<string name="title_disabled">Is disabled</string>
<string name="title_internet">Has no internet access</string>
<string name="title_launch">Start application</string>
<string name="title_donate">Donate</string>
<string name="title_rate">Rate</string>

6
strings.sh
View File

@ -2,7 +2,9 @@
#grep -RIl "\<string name=\"msg_vpn" app/src/main/res | xargs sed -i -e '/msg_vpn/d'
grep -RIl "\<string name=\"setting_whitelist_other" app/src/main/res | xargs sed -i -e '/setting_whitelist_other/a\
\ \ \ \ <string name="setting_unused">Default allow when screen is on</string>'
grep -RIl "\<string name=\"title_roaming" app/src/main/res | xargs sed -i -e '/title_roaming/a\
\ \ \ \ <string name="title_internet">Has no internet access</string>'
grep -RIl "\<string name=\"title_roaming" app/src/main/res | xargs sed -i -e '/title_roaming/a\
\ \ \ \ <string name="title_disabled">Is disabled</string>'
#grep -RIl "\<string name=\"summary_credentials" app/src/main/res | xargs sed -i -e 's/Prevent from being uninstalled/Prevent NetGuard from being uninstalled/g'