From 01dadb98010795948e6a6cf23d73d7189b78f3e9 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 28 Nov 2015 08:27:20 +0100 Subject: [PATCH] Revert "Notify app added" Closes #183 Refs #182 This reverts commit 97c38d1d0ad73f9930d44f2d9465c05d7630a487. Conflicts: app/build.gradle --- app/src/main/AndroidManifest.xml | 2 - .../eu/faircode/netguard/ActivityMain.java | 1 - .../java/eu/faircode/netguard/Receiver.java | 42 +----------------- .../eu/faircode/netguard/SinkholeService.java | 2 +- .../ic_error_outline_white_24dp.png | Bin 492 -> 0 bytes .../res/drawable-hdpi/ic_error_white_24dp.png | Bin 0 -> 324 bytes .../ic_error_outline_white_24dp.png | Bin 325 -> 0 bytes .../res/drawable-mdpi/ic_error_white_24dp.png | Bin 0 -> 232 bytes .../ic_error_outline_white_24dp.png | Bin 666 -> 0 bytes .../drawable-xhdpi/ic_error_white_24dp.png | Bin 0 -> 431 bytes .../ic_error_outline_white_24dp.png | Bin 979 -> 0 bytes .../drawable-xxhdpi/ic_error_white_24dp.png | Bin 0 -> 614 bytes .../ic_error_outline_white_24dp.png | Bin 1307 -> 0 bytes .../drawable-xxxhdpi/ic_error_white_24dp.png | Bin 0 -> 814 bytes app/src/main/res/values-af/strings.xml | 1 - app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-en/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-et/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-he/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-lv/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-no/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sl/strings.xml | 1 - app/src/main/res/values-sr/strings.xml | 1 - app/src/main/res/values-sv-rSE/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - strings.sh | 10 +++-- 53 files changed, 9 insertions(+), 86 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_error_outline_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_error_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_error_outline_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_error_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_error_outline_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_error_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_error_outline_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_error_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_error_outline_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_error_white_24dp.png diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c09b7268..1b135b5c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -53,9 +53,7 @@ - - diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java index a11a8ea7..65fc5158 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java @@ -71,7 +71,6 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences private static final int REQUEST_INVITE = 3; private static final int REQUEST_LOGCAT = 4; - public static final String EXTRA_PACKAGE_NAME = "package"; public static final String ACTION_RULES_CHANGED = "eu.faircode.netguard.ACTION_RULES_CHANGED"; @Override diff --git a/app/src/main/java/eu/faircode/netguard/Receiver.java b/app/src/main/java/eu/faircode/netguard/Receiver.java index 0d0bd1ef..e1cb3950 100644 --- a/app/src/main/java/eu/faircode/netguard/Receiver.java +++ b/app/src/main/java/eu/faircode/netguard/Receiver.java @@ -19,19 +19,12 @@ package eu.faircode.netguard; Copyright 2015 by Marcel Bokhorst (M66B) */ -import android.app.Notification; -import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; import android.net.VpnService; import android.preference.PreferenceManager; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; -import android.support.v4.content.ContextCompat; import android.util.Log; import java.util.Map; @@ -44,41 +37,9 @@ public class Receiver extends BroadcastReceiver { Log.i(TAG, "Received " + intent); Util.logExtras(intent); - if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) { - if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) { - int uid = intent.getIntExtra(Intent.EXTRA_UID, 0); - String packageName = intent.getData().getSchemeSpecificPart(); - - Intent main = new Intent(context, ActivityMain.class); - main.putExtra(ActivityMain.EXTRA_PACKAGE_NAME, packageName); - main.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - PendingIntent pi = PendingIntent.getActivity(context, uid, main, PendingIntent.FLAG_UPDATE_CURRENT); - - String name; - try { - ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo(packageName, 0); - name = context.getPackageManager().getApplicationLabel(appInfo).toString(); - } catch (PackageManager.NameNotFoundException ex) { - name = ex.toString(); - } - - NotificationCompat.Builder notification = new NotificationCompat.Builder(context) - .setSmallIcon(R.drawable.ic_error_outline_white_24dp) - .setContentTitle(context.getString(R.string.app_name)) - .setContentText(context.getString(R.string.msg_installed, name)) - .setContentIntent(pi) - .setCategory(Notification.CATEGORY_STATUS) - .setVisibility(Notification.VISIBILITY_SECRET) - .setColor(ContextCompat.getColor(context, R.color.colorPrimary)) - .setAutoCancel(true); - - NotificationManagerCompat.from(context).notify(uid, notification.build()); - } - - } else if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) { + if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) { // Remove settings if (intent.getBooleanExtra(Intent.EXTRA_DATA_REMOVED, false)) { - int uid = intent.getIntExtra(Intent.EXTRA_UID, 0); String packageName = intent.getData().getSchemeSpecificPart(); Log.i(TAG, "Deleting settings package=" + packageName); context.getSharedPreferences("wifi", Context.MODE_PRIVATE).edit().remove(packageName).apply(); @@ -86,7 +47,6 @@ public class Receiver extends BroadcastReceiver { context.getSharedPreferences("screen_wifi", Context.MODE_PRIVATE).edit().remove(packageName).apply(); context.getSharedPreferences("screen_other", Context.MODE_PRIVATE).edit().remove(packageName).apply(); context.getSharedPreferences("roaming", Context.MODE_PRIVATE).edit().remove(packageName).apply(); - NotificationManagerCompat.from(context).cancel(uid); } } else { diff --git a/app/src/main/java/eu/faircode/netguard/SinkholeService.java b/app/src/main/java/eu/faircode/netguard/SinkholeService.java index 7787ae51..c68b35a0 100644 --- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java +++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java @@ -534,7 +534,7 @@ public class SinkholeService extends VpnService { PendingIntent pi = PendingIntent.getActivity(this, 0, main, PendingIntent.FLAG_UPDATE_CURRENT); NotificationCompat.Builder notification = new NotificationCompat.Builder(this) - .setSmallIcon(R.drawable.ic_error_outline_white_24dp) + .setSmallIcon(R.drawable.ic_error_white_24dp) .setContentTitle(getString(R.string.app_name)) .setContentText(getString(R.string.msg_revoked)) .setContentIntent(pi) diff --git a/app/src/main/res/drawable-hdpi/ic_error_outline_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_error_outline_white_24dp.png deleted file mode 100644 index 00d5646e43fe9d6dcee8f500f64111415aa0807b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 492 zcmV*h^MrDn|Aa1LNkV-VEv5pd>#L?|TD(gwWO=nuUG9JnF$$+$znem`gx zuqjmJC7@LXP3eIHAcT_cKVj9Rkmi>@obT>50& iEhE)`BI@TKfqnyOL$q&X$oBOB0000gGbr{!4DC&5DTe055otv=(oBcbwiQ9yc={9S=wqGvvb{)YG_-cTkwp}f z`yT&OF!RTU{~tMq?Z(U8YgIoe@jCRcP1rd4N|RY{%7e{VkWrE+V8Q6cmZ!OAm^=m;wdYVCGU}Z~>ZWEx~^;pI(BQaco|K&fD*B zzUThVx%URaKZi>#Qy-3w-c2->^2!^&oW|PS`QoAxm}x63DXHj)z(6qzjIi}|k}YW4 zVURV$*45dw>vp7!34N064hhx4Ix)T$W~r`epddmsPE67M9S8zlyvA~caxPHCGL}cu z7nA`)9R2{TPziEE4U1U5p_2>rF^=UUB88l_&e2FZ+@u$K0`#y-P3ayx^|N-a?QwgW z9%84RG!_I3diHq9_9+^INLN)TRMR&H&u5P)9pDS`rt8>j14g%vJK^s@CixA{JOk4QTA=JOC;K#wgGmprXKRz!nAc zA3zb4$$%jWbOzK>BbED)TQ7myeVhoz_h#2weHJS8AZjUpMBz!kQMYK#7O0gq|w?Jz^0EE!UyXeUdaS$3#b zBpEf3<}IKtGe|26b8QT<3TUrsjS}$c4!_SRNfh>ZjB!wxNQMWd(N;K%im-0VXvMI= zWwdvkL`9s>0$M-z06yD@6*+v2L>aNk347oP;@edZJKd&w zZntRxG22j}gt%%3a)=$;P>xHphsc_N1YZ$D&KG$Y@tGzwpty@z#d8XzSVP=I9Tqr4 zfEaTM6cANTnE}~j#6IU@2YRR?CQ-IPI~7D39~EOAtRsGM+#XO2pe@8mbnqVSQrL^v z6k3^XRD|`gj`k207D)02?SOGS6!xVkP(^!1b9g|}h9pFpJZZ~gHOv~Iy^QkmD@!s( zyoc% zH6TmSOM&NnV2c`6Hd&;^IOpXr%^~2hqk#MV0K3R3QV-+fH2?qr07*qoM6N<$g0-g? A)c^nh diff --git a/app/src/main/res/drawable-xhdpi/ic_error_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_error_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9829698ddf0ad7df1e36f212ebb6b00c89d97075 GIT binary patch literal 431 zcmV;g0Z{&lP)2|$d zb8`?1e$Og=AO=p3^FQ2v1vo`5um^p+ctP+U`du{Cg2BIYu^K^T*z8PSr06@ zpYw0-H`M_jNko7vwcEfLL;x7x0$h$_z@D56d;>86zNo-J6zHkIN)+%_AQS}x6*!9m zkqRWDK>P&Y>5nKxvcT|~X3kfEK9Y4+powG+6>vF-{mDCWD&Q~@1Kw`$gF3O$!g;S- znKKb!qTk6CPGs#5B|YHKA!{wuhu4fO{lqZ=9vf_1lQ#nnMN49>{rFYJTihf&V}x|mZD?=FSw%%@ZEe$JhcBpNwTJ|mYzjKS_~#g1&vr! zOeHp8v9ypjsWwWXFSjaUE#d~vE{d1Bv%znVzj@fq?7Tb=lH3Te8yR>^Dh-Vs#Lhc5>p(cpByULB>7M`A99r%VX7=JN|*hhH@VCzQPr5^ReM4G zERn<_d&~#D$Ty_%6$O()@A8i?r19ZQUPa3p|ztB}V6!R<3;V@oZ zlA9!`jRkanvl*3Owr~U8k7VNqeTnV@E-K-;%%U5Q8}tsk2{Nb@li>uqeQ|J){slXa>IvWQ+u5xQO4`s6l)6qulW9_^Hs@$W8qALN(y2Jvxl&;VlDVonPW5PO4za(IXx)`E6Lef&@? zBF3!+O(1?kg#{fzl*w7S>>VnI;qagWtB6r6LGL3x^5H>>ONe_o#)Djz5#OR31-*vf zVdFtZ@q4*(km3r$V~f$CZPfGw9VMs_zZOn>F-0<{9Sjn?gkm z>gExCCyWH0#IHhE^dQB4(38ld{OjmB@OIpno|EVjt1bNGN|sLOda&GMy#dFqup z&Q4lFo_BUJL4|skani1*TA5^R_c>3IA$rNvN-KGK8KTGx4_MphY%sIH+s`A?s_>S{ z6=yfoB=?llbeUfQ_i=?J=Gkp;P5wHUs1cRNEHByrAwhuyEK()Rf6Vh9dHX*kkjXK? zL8e&ZAIemD!V0&!$|*kL4cbu2MqziFLCv6M(ErYJ<{QNUt@{7~002ovPDHLkV1i@~ B$Tk1~ diff --git a/app/src/main/res/drawable-xxhdpi/ic_error_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_error_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..abe2573b1a5e6be01a5f82c03a089f8ae87fa825 GIT binary patch literal 614 zcmV-s0-61ZP)qtG0D3I)9=d59Kjp*^Xg722Dkhl0YY!4OL5BZS<; z61=$^@!wOAvpYLG^KB0M-}Ax`HcMva+o_^St*D4Hn>1TvB%jTH^te+N{_IE%A#iov~;Ww9O+~8_}=>n&BI^ zI--;nG>?zXu6dmW zsy^r^5`EVNtszxi5A;CV{@^j=ui!6F8|2Y@HE50q*%Fo?Q`{q+AHQPUL%N-$MgCaywU1ax z+6G;Ug3gooWpz=|Tb-?RTMXpu?d?~P>4jz8YL)m<^&~w09$TEDXaAWylm9vhgN*rOUk4)Pc;58VL zwSX;~BhD&6FzauW`W`-6GCecK;!P$1b;o#Px*Fj`{^R2dS@F z);Z*a4t<7%gbeA^;g|#7@k-=V3xlfw6`%t24_R#olFFzoX8-^I07*qoM6N<$f=(S9 A<^TWy literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_error_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_error_outline_white_24dp.png deleted file mode 100644 index b144939b9b1547711a5b10672b4393f9cb6cfa9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1307 zcmV+$1?2jPP)t_Nr}+#<#?p#>Twq)|G!|pI-mY&N4H*GjoFM=X)get!RD(S;cH_K2y?0tH&JV@n!1Vs52JEw`Fd|Hfi*!hX6`3IaQ(*)a5 zKCcmrOvm#L*hZ!lwWt7AM~Y0F^9iWt1-cX~Q2}kWO~M#+at$b=3*7{@r~p@wh3-nO z0iTj-J1XGqB-5r`0^&SDcM9ctI^}xj(LEySJ>Uy;-9$qPh;awqZm$8;7(tp~87h!Twn$aCWg%+S_N4LXEK!is~Lrf1fpo|fu`xLtmSck3!6>5NDKf0Cf13Hn0 ziG?1JU=-=1+kiO#A{{`59-ugc^qi=>fCi*ARYn48NF#mZF5o26b(E0+#Z9EI+y&f6 zYBUzmgw*3E;4O63#sU_iD|Zf9ht!8M7NB^7wAwjfFVZEW0i8&@odeDw?K2wChIGO? zpbM$aXut-ftIh$pkro>bSc3G2bHG1Hl|}<*Aq_eQq>!RU14@yS&H)xu#ArYSY2q~t znEa1W3@Q1V{Si<8kI|*xKSuwDREILS2BaUH15P8g8VzVeI_~{t?y}KY;bWvDzhlMd3@>1VE=2VWOuNq}MYlR)LLX|yqly?*BV zee}47hh#I#A!V-plGsO28~fq2X}F!n`5jO z4~@|PxeC_M!bz_2CxaxJ;Qu7~o8S4K4tBAUnJ7P}Fug*6$rS<$0fm4OpZvS)hbY2bjDdCIt{;m^E&&TAfu=g!~1xk)e#84w<3VA3%)v zT;W8QWNGmlFhK<;J7(NFz$5aw(K=mT04Ay7R#jfR3y83c+nI#j0wmeRi*`u30qCQQ zR~6}T8t{Y@ysSdMlYl->@VW}UP63jX@uMOMCjb$4@v9xe_5sWInQ0d=iQi4w0rXJA z@2Ye)4#*>+^+o{`NNKDQK#U4@`v3FnbVSrT;2nqoz?@Y;8&{$L7sRarG9U^7(^dc> z%HjYeLi&JV5C?!keZZPXz=|#)&W%Vwji?@A6hs1GL=Rw!1?2PqMX`W=9Y80D1wcX# zNQ(xf)PSsLz?>SeBpP6<0o$Shc{QLQ8nCAZoQnpWssXp60d+OtUNqqDF967Yh5q!9 z__zNV-9mDkYQQ3rn^yy}NN!dQNF%u+H6V%P+SLGq1Ef~K&;iUNwGVoL=Sc0T9w0_t z%1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index f34f4130..c3e211fd 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked التطبيق غير مُفعّل, قم بتفعيل التطبيق من الخيار أعلاه. NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e4df43c8..89a54fe4 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -30,7 +30,6 @@ Das wird von Fehlern in Android oder in Software vom Hersteller verursacht. Bitt %1$d erlaubt, %2$d blockiert NetGuard ist deaktiviert. Verwenden Sie den Schalter, um NetGuard zu aktivieren NetGuard wurde deaktiviert. Wahrscheinlich durch Verwendung einer VPN-Anwendung - %1$s installed Aktion abgeschlossen NetGuard verwendet ein lokales VPN, um einen Internet-Verkehr zu blockieren. Deshalb erlauben Sie eine VPN-Verbindung im nächsten Fenster. Da NetGuard keine Internet-Berechtigung hat, wird der Internet-Verkehr auch nirgendwo weitergeleitet. NetGuard ausprobieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 97fdb767..c8023e14 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8e2cecf1..f5d4ca6f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -31,7 +31,6 @@ Estos problemas son causados por errores en Android, o en el software provisto p %1$d permitido, %2$d bloqueado NetGuard está deshabilitado, utiliza el interruptor de arriba para habilitar a NetGuard NetGuard ha sido desactivado, probablemente por usar otra aplicación de VPN - %1$s installed Acción completada NetGuard utiliza una VPN local como un pozo ciego para bloquear el tráfico de internet. Por esta razón, por favor permite la conexión VPN en el próximo diálogo. diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 85c3e000..94a749b5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -31,7 +31,6 @@ Ceci est causé par des bugs dans Android, ou dans le logiciel fourni par le con %1$d allowed, %2$d blocked NetGuard est désactivé, utilisez le bouton ci-dessus pour activer NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completé NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a6259a4e..c5375361 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -32,7 +32,6 @@ Ció è causato da alcuni bug contenuti in Android, o in programmi forniti dal p %1$d permesse, %2$d bloccate NetGuard è disabilitata, usa lo switch per abilitarla nuovamente NetGuard è stata disabilitata, probabilmente a causa di un\'altra applicazione che usa il servizio VPN - %1$s installed Azione completata Per bloccare il traffico internet, NetGuard utilizza una VPN locale come \"pozzo\". Per questo motivo, abilita la connessione VPN nella prossima schermata. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 1a4f6b10..4094acdf 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -31,7 +31,6 @@ %1$d allowed, %2$d blocked NetGuard は無効です。NetGuard を有効にするには上のスイッチを使用してください NetGuard has been disabled, likely by using another VPN based application - %1$s installed 操作を完了しました NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 0186fd1f..f9bda4b6 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked 넷가드가 해제되어 있습니다. 상단 스위치를 사용해 넷가드를 활성화하세요. NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 3169e042..b533a6d8 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d toegestaan, %2$d geblokkeerd NetGuard staat uit, gebruik de schakelaar boven om NetGuard aan te zetten NetGuard is uitgezet, waarschijnlijk door een andere VPN applicatie - %1$s installed Actie uitgevoerd NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 03c91ffb..413e938e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -31,7 +31,6 @@ Problemy te są spowodowane błędami w samym Androidzie, lub oprogramowaniu dos %1$d allowed, %2$d blocked NetGuard jest wyłączony, użyj przełącznika u góry by go uruchomić NetGuard has been disabled, likely by using another VPN based application - %1$s installed Wykonano NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 313184ee..d3f3a636 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -31,7 +31,6 @@ Esses problemas são causados por bugs/falhas no Android ou no sotfware fornecid %1$d permitido, %2$d bloqueado NetGuard desativado, use o interruptor acima para ativar o NetGuard NetGuard foi desativado, provavelmente outro aplicativo baseado em VPN esta sendo usado - %1$s installed Ação concluída NetGuard usa uma VPN local como um sumidouro para bloquear o tráfego de dados. Por essa razão, por favor, permita a conexão VPN na tela a seguir. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index c74b1a30..f4e30739 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -31,7 +31,6 @@ Esses problemas são causados por bugs/falhas no Android ou no sotfware fornecid %1$d permitido, %2$d bloqueado NetGuard desativado, use o interruptor acima para ativar o NetGuard NetGuard foi desativado, provavelmente outro aplicativo baseado em VPN esta sendo usado - %1$s installed Ação concluída NetGuard usa uma VPN local como um sumidouro para bloquear o tráfego de dados. Por essa razão, por favor, permita a conexão VPN na tela a seguir. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 1b16f66e..6a77f815 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -31,7 +31,6 @@ Acest lucru este cauzat de bug-uri in Android sau in software-ul pus la dispozit %1$d permise, %2$d blocate NetGuard este momentan dezactivat, foloseste comutatorul de mai sus pentru a il activa NetGuard a fost dezactivat, probabil de o alta aplicatie ce foloseste o conexiune VPN - %1$s installed Actiune realizata NetGuard foloseste o conexiune locala VPN ca o \"gaura neagra\" pentru traficul de internet blocat. Din acest motiv la urmatoarea fereastra de dialog trebuie sa acceptati crearea conexiunii VPN. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 28f5850f..28e1f2a0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -28,7 +28,6 @@ %1$d разрешен, %2$d заблокирован NetGuard отключен, используйте переключатель выше для включения NetGuard был отключен, скорее всего, из-за применения другого VPN-подключения - %1$s installed Действие завершено NetGuard использует локальный VPN, чтобы блокировать интернет трафик. По этой причине, пожалуйста, разрешите VPN-подключение в следующем диалоговом окне. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 0d781b5a..f8c00d56 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -31,7 +31,6 @@ Je to spôsobené chybami v Androide alebo v softvéri poskytovanom výrobcom, p %1$d allowed, %2$d blocked NetGuard je vypnutý, použite prepínač vyššie na zapnutie NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Akcia bola dokončená NetGuard používa lokálnu VPN sieť na zablokovanie sieťovej prevádzky, a preto by ste mali povoliť VPN pripojenie v ďalšom okne. diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index acc1c6f2..be26599c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d izin verilen, %2$d engellenen NetGuard devre dışı, NetGuard etkinleştirmek için yukarıdaki anahtarını kullanın. NetGuard, büyük olasılıkla başka bir VPN tabanlı uygulama kullanılarak devre dışı bırakıldı - %1$s installed Eylem tamamlandı NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 360967c4..7089b01b 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -27,7 +27,6 @@ %1$d дозволено, %2$d заблоковано NetGuard вимкнено, аби увімкнути, використовуй перемикач, що знаходиться вище NetGuard було вимкнено, скоріш за все через використання іншого VPN-підключення - %1$s installed Дію завершено NetGuard використовує локальний VPN, аби заблокувати інтернет трафік. Через це, будь ласка, дозвольте VPN-підключення в наступному діалоговому вікні. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1c1eb3cb..8f4431dc 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -31,7 +31,6 @@ %1$d 已允许, %2$d 已拦截 NetGuard已被停用, 请使用上方的开关启用NetGuard NetGuard已被停用, 可能是由于您启动了另一个基于VPN的应用 - %1$s installed 操作完成 NetGuard使用一个本地VPN来重定向被阻止的网络流量. 因此请在下一个对话框中允许建立VPN连接. diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c3c48cfe..7e0f3c51 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -31,7 +31,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b9be7802..cb0f3089 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,7 +34,6 @@ These issues are caused by bugs in Android, or in the software provided by the m %1$d allowed, %2$d blocked NetGuard is disabled, use the switch above to enable NetGuard NetGuard has been disabled, likely by using another VPN based application - %1$s installed Action completed NetGuard uses a local VPN as a sinkhole to block internet traffic. For this reason, please allow a VPN connection in the next dialog. diff --git a/strings.sh b/strings.sh index 856c9145..3062a6f1 100644 --- a/strings.sh +++ b/strings.sh @@ -1,8 +1,12 @@ #!/bin/bash -#grep -RIl "\%1$s installed' +#grep -RIl "\Default allow mobile when screen is on' +#grep -RIl "\Default allow Wi-Fi when screen is on' +#grep -RIl "\