Merge remote-tracking branch 'refs/remotes/M66B/master'

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)

app/proguard-rules.pro

@@ -15,3 +15,12 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+#Line numbers
+-renamesourcefileattribute SourceFile
+-keepattributes SourceFile,LineNumberTable
+
+#NetGuard
+-keepnames class eu.faircode.netguard.** { *; }
+-keep class android.support.v7.widget.** { *; }
+-dontwarn android.support.v4.**

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;

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();
     }
 

app/src/main/res/values-ar/strings.xml

@@ -13,6 +13,7 @@
 
     <string name="msg_sure">هل أنت متأكد؟</string>
     <string name="msg_disabled">التطبيق غير مُفعّل, قم بتفعيل التطبيق من الخيار أعلاه.</string>
+    <string name="msg_revoked">NetGuard has been disabled</string>
 
     <string name="title_using">السماح عند استخدام الجهاز</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -13,6 +13,7 @@
 
     <string name="msg_sure">Etes-vous sûr ?</string>
     <string name="msg_disabled">NetGuard is disabled, use the switch above to enable NetGuard</string>
+    <string name="msg_revoked">NetGuard has been disabled</string>
 
     <string name="title_using">Allow when device in use</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -0,0 +1,19 @@
+<resources>
+    <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
+
+    <string name="menu_search">Cerca applicazione</string>
+    <string name="menu_network">Apri impostazioni di rete</string>
+    <string name="menu_refresh">Aggiorna la lista</string>
+    <string name="menu_whitelist_wifi">Blocca Wi-Fi di default</string>
+    <string name="menu_whitelist_other">Block rete di dati di default</string>
+    <string name="menu_dark">Usa il tema scuro</string>
+    <string name="menu_vpn_settings">Apri impostazioni VPN</string>
+    <string name="menu_support">Supporto</string>
+    <string name="menu_about">Info</string>
+
+    <string name="msg_sure">Sei sicuro?</string>
+    <string name="msg_disabled">NetGuard è disabilitata, usa lo switch per abilitarlo nuovamente</string>
+    <string name="msg_revoked">NetGuard has been disabled</string>
+
+    <string name="title_using">Consenti quando il dispositivo è in uso</string>
+</resources>

app/src/main/res/values-nl/strings.xml

@@ -13,6 +13,7 @@
 
     <string name="msg_sure">Weet u het zeker?</string>
     <string name="msg_disabled">NetGuard staat uit, gebruik de schakelaar bovem om NetGuard aan te zetten</string>
+    <string name="msg_revoked">NetGuard is uitgezet</string>
 
     <string name="title_using">Sta toe als apparaat in gebruik</string>
 </resources>

app/src/main/res/values-ro/strings.xml

@@ -0,0 +1,19 @@
+<resources>
+    <string name="app_copyright">Copyright \u00A9 2015 by M. Bokhorst (M66B)</string>
+
+    <string name="menu_search">Cauta aplicatii</string>
+    <string name="menu_network">Deschide setari retea</string>
+    <string name="menu_refresh">Actualizeaza lista de aplicatii</string>
+    <string name="menu_whitelist_wifi">Blocheaza implicit Wi-Fi</string>
+    <string name="menu_whitelist_other">Blocheaza implicit date mobile</string>
+    <string name="menu_dark">Foloseste tema intunecata</string>
+    <string name="menu_vpn_settings">Deschide setari VPN Android</string>
+    <string name="menu_support">Asistenta</string>
+    <string name="menu_about">Despre</string>
+
+    <string name="msg_sure">Esti sigur?</string>
+    <string name="msg_disabled">NetGuard este momentan dezactivat, foloseste comutatorul de mai sus pentru a activa NetGuard</string>
+    <string name="msg_revoked">NetGuard has been disabled</string>
+
+    <string name="title_using">Permite cand dispozitivul este folosit</string>
+</resources>

app/src/main/res/values-sk/strings.xml

@@ -13,6 +13,7 @@
 
     <string name="msg_sure">Ste si istý?</string>
     <string name="msg_disabled">NetGuard je vypnutý, použite prepínač vyššie na zapnutie NetGuard</string>
+    <string name="msg_revoked">NetGuard je vypnutý</string>
 
     <string name="title_using">Povoliť pri používaní zariadenia</string>
 </resources>

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_copyright" translatable="false">版权所有 \u00A9 2015 by M. Bokhorst (M66B)</string>
+    <string name="app_copyright">版权所有 \u00A9 2015 by M. Bokhorst (M66B)</string>
 
     <string name="menu_search">搜索应用</string>
     <string name="menu_network">打开网络设置</string>
@@ -13,6 +13,7 @@
 
     <string name="msg_sure">是否确认?</string>
     <string name="msg_disabled">NetGuard is disabled, use the switch above to enable NetGuard</string>
+    <string name="msg_revoked">NetGuard has been disabled</string>
 
     <string name="title_using">Allow when device in use</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -14,6 +14,7 @@
 
     <string name="msg_sure">Are you sure?</string>
     <string name="msg_disabled">NetGuard is disabled, use the switch above to enable NetGuard</string>
+    <string name="msg_revoked">NetGuard has been disabled</string>
 
     <string name="title_using">Allow when device in use</string>
 </resources>