From 642591a61e7009733d7729f9bd63822ed0c34523 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 30 Oct 2015 10:10:05 +0100 Subject: [PATCH 1/8] Enabled proguard --- app/build.gradle | 2 +- app/proguard-rules.pro | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index db008082..66ad56f0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { } buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' applicationVariants.all { variant -> setOutputFile(variant, defaultConfig) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index c4fd90e4..5f0bf8c2 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -15,3 +15,11 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} + +#Line numbers +-renamesourcefileattribute SourceFile +-keepattributes SourceFile,LineNumberTable + +#NetGuard +-keepnames class eu.faircode.netguard.** { *; } +-dontwarn android.support.v4.** From 09c637be2b0f87b66609d779a906c5c6ab0559f4 Mon Sep 17 00:00:00 2001 From: JJ Date: Fri, 30 Oct 2015 10:17:52 +0100 Subject: [PATCH 2/8] Add strings.xml Add intalian translation on project. --- app/src/main/res/values-it/strings.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 app/src/main/res/values-it/strings.xml diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml new file mode 100644 index 00000000..d14d35f9 --- /dev/null +++ b/app/src/main/res/values-it/strings.xml @@ -0,0 +1,19 @@ + + NetGuard + Copyright \u00A9 2015 by M. Bokhorst (M66B) + + Cerca applicazione + Apri impostazioni di rete + Aggiorna la lista + Blocca Wi-Fi di default + Block rete di dati di default + Usa il tema scuro + Apri impostazioni VPN + Supporto + Info + + Sei sicuro? + NetGuard è disabilitata, usa lo switch per abilitarlo nuovamente + + Consenti quando il dispositivo è in uso + From b391275624ffb2b63837c177768c01b4ef277797 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 30 Oct 2015 10:20:56 +0100 Subject: [PATCH 3/8] Fixed Italian translation Refs #13 --- app/src/main/res/values-it/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d14d35f9..732fcee4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,5 +1,4 @@ - NetGuard Copyright \u00A9 2015 by M. Bokhorst (M66B) Cerca applicazione From 5a29bde52731e00ff43d8c37ea10ba3395d3dd3d Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 30 Oct 2015 10:51:44 +0100 Subject: [PATCH 4/8] Added disabled notification --- .../java/eu/faircode/netguard/ActivityMain.java | 1 - .../eu/faircode/netguard/SinkholeService.java | 16 ++++++++++++++++ app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 3 ++- app/src/main/res/values/strings.xml | 1 + 9 files changed, 24 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java index bc321720..2f3928b5 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java @@ -3,7 +3,6 @@ package eu.faircode.netguard; import android.app.AlertDialog; import android.content.BroadcastReceiver; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; diff --git a/app/src/main/java/eu/faircode/netguard/SinkholeService.java b/app/src/main/java/eu/faircode/netguard/SinkholeService.java index 6c91ae36..e4f3fe0a 100644 --- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java +++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java @@ -1,5 +1,6 @@ package eu.faircode.netguard; +import android.app.NotificationManager; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; @@ -11,6 +12,7 @@ import android.net.ConnectivityManager; import android.net.VpnService; import android.os.ParcelFileDescriptor; import android.preference.PreferenceManager; +import android.support.v4.app.NotificationCompat; import android.util.Log; import android.widget.Toast; @@ -269,6 +271,20 @@ public class SinkholeService extends VpnService { unregisterReceiver(connectivityChangedReceiver); unregisterReceiver(interactiveStateReceiver); + // Display notification + Intent riMain = new Intent(this, ActivityMain.class); + PendingIntent piMain = PendingIntent.getActivity(this, 0, riMain, PendingIntent.FLAG_CANCEL_CURRENT); + + NotificationCompat.Builder notification = new NotificationCompat.Builder(this) + .setSmallIcon(R.mipmap.ic_launcher) + .setContentTitle(getString(R.string.app_name)) + .setContentText(getString(R.string.msg_revoked)) + .setContentIntent(piMain) + .setAutoCancel(true); + + NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + notificationManager.notify(0, notification.build()); + super.onDestroy(); } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 740a1b2c..06356651 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -13,6 +13,7 @@ هل أنت متأكد؟ التطبيق غير مُفعّل, قم بتفعيل التطبيق من الخيار أعلاه. + NetGuard has been disabled السماح عند استخدام الجهاز diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c7c99516..9b3be233 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -13,6 +13,7 @@ Etes-vous sûr ? NetGuard is disabled, use the switch above to enable NetGuard + NetGuard has been disabled Allow when device in use diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 732fcee4..66c42ee6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -13,6 +13,7 @@ Sei sicuro? NetGuard è disabilitata, usa lo switch per abilitarlo nuovamente + NetGuard has been disabled Consenti quando il dispositivo è in uso diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 54f081b8..f14f9c36 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -13,6 +13,7 @@ Weet u het zeker? NetGuard staat uit, gebruik de schakelaar bovem om NetGuard aan te zetten + NetGuard is uitgezet Sta toe als apparaat in gebruik diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index d313ea41..afb06c75 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -13,6 +13,7 @@ Ste si istý? NetGuard je vypnutý, použite prepínač vyššie na zapnutie NetGuard + NetGuard has been disabled Povoliť pri používaní zariadenia diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index da738aea..52adc5e7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,5 +1,5 @@ - 版权所有 \u00A9 2015 by M. Bokhorst (M66B) + 版权所有 \u00A9 2015 by M. Bokhorst (M66B) 搜索应用 打开网络设置 @@ -13,6 +13,7 @@ 是否确认? NetGuard is disabled, use the switch above to enable NetGuard + NetGuard has been disabled Allow when device in use diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b68a1521..c0e3cb1d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,6 +14,7 @@ Are you sure? NetGuard is disabled, use the switch above to enable NetGuard + NetGuard has been disabled Allow when device in use From be5f266dbe9cc044982ebc89dc1b6ae8c04421c8 Mon Sep 17 00:00:00 2001 From: pyler Date: Fri, 30 Oct 2015 11:09:09 +0100 Subject: [PATCH 5/8] Updated SK translation --- app/src/main/res/values-sk/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index afb06c75..f6034aeb 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -13,7 +13,7 @@ Ste si istý? NetGuard je vypnutý, použite prepínač vyššie na zapnutie NetGuard - NetGuard has been disabled + NetGuard je vypnutý Povoliť pri používaní zariadenia From 074f3f98c6e7d7813adfb61a98c2fd5033d56def Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 30 Oct 2015 11:59:49 +0100 Subject: [PATCH 6/8] Updated proguard config --- app/proguard-rules.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 5f0bf8c2..fd7b4d3e 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -22,4 +22,5 @@ #NetGuard -keepnames class eu.faircode.netguard.** { *; } +-keep class android.support.v7.widget.** { *; } -dontwarn android.support.v4.** From a712ba1655d923fe0307aa33251e37fc1a415eaa Mon Sep 17 00:00:00 2001 From: Licaon Kter Date: Fri, 30 Oct 2015 13:00:36 +0200 Subject: [PATCH 7/8] Added Romanian translation --- app/src/main/res/values-ro/strings.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 app/src/main/res/values-ro/strings.xml diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml new file mode 100644 index 00000000..8cf1d791 --- /dev/null +++ b/app/src/main/res/values-ro/strings.xml @@ -0,0 +1,19 @@ + + NetGuard + Copyright \u00A9 2015 by M. Bokhorst (M66B) + + Cauta aplicatii + Deschide setari retea + Actualizeaza lista de aplicatii + Blocheaza implicit Wi-Fi + Blocheaza implicit date mobile + Foloseste tema intunecata + Deschide setari VPN Android + Asistenta + Despre + + Esti sigur? + NetGuard este momentan dezactivat, foloseste comutatorul de mai sus pentru a activa NetGuard + + Permite cand dispozitivul este folosit + From 2fa687f6d3b6944021cf537dbf210425188661e3 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 30 Oct 2015 12:04:08 +0100 Subject: [PATCH 8/8] Fixed Romanian translation Refs #16 --- app/src/main/res/values-ro/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 8cf1d791..90f9d046 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1,5 +1,4 @@ - NetGuard Copyright \u00A9 2015 by M. Bokhorst (M66B) Cauta aplicatii @@ -14,6 +13,7 @@ Esti sigur? NetGuard este momentan dezactivat, foloseste comutatorul de mai sus pentru a activa NetGuard + NetGuard has been disabled Permite cand dispozitivul este folosit