From fffc2947253c83a577c085d0d9327bcb4da5dc78 Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Sat, 12 Mar 2016 08:09:40 +0100
Subject: [PATCH] 2.7 beta

---
 app/app.iml                                   | 35 ++++------
 app/build.gradle                              |  4 +-
 .../java/eu/faircode/netguard/Receiver.java   |  4 +-
 .../main/java/eu/faircode/netguard/Rule.java  |  3 +-
 app/src/main/res/values-he/strings.xml        | 66 +++++++++----------
 5 files changed, 52 insertions(+), 60 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 2d0625b8..7dcb11f9 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -41,12 +41,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/allDebug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/allDebug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/allDebug/renderscript" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/all/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/all/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/all/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/assets" type="java-test-resource" />
@@ -54,6 +48,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/all/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/all/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/all/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/assets" type="java-resource" />
@@ -61,13 +61,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/all/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/all/renderscript" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAll/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/assets" type="java-test-resource" />
@@ -75,6 +68,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAll/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -112,26 +112,17 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/renderscript" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/binaries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/objectFiles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/app/build.gradle b/app/build.gradle
index d82e6847..1f85a097 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ model {
             applicationId = "eu.faircode.netguard"
             minSdkVersion.apiLevel = 14
             targetSdkVersion.apiLevel = 23
-            versionCode = 2016031002
-            versionName = "2.6"
+            versionCode = 2016031203
+            versionName = "2.7"
             archivesBaseName = "NetGuard-v$versionName-$versionCode"
 
             buildConfigFields {
diff --git a/app/src/main/java/eu/faircode/netguard/Receiver.java b/app/src/main/java/eu/faircode/netguard/Receiver.java
index 0841d55f..d30b8041 100644
--- a/app/src/main/java/eu/faircode/netguard/Receiver.java
+++ b/app/src/main/java/eu/faircode/netguard/Receiver.java
@@ -47,7 +47,7 @@ public class Receiver extends BroadcastReceiver {
         if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) {
             // Application added
             if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) {
-                Rule.updatePackages(context);
+                Rule.clearCache(context);
 
                 // Show notification
                 if (IAB.isPurchased(ActivityPro.SKU_NOTIFY, context)) {
@@ -59,7 +59,7 @@ public class Receiver extends BroadcastReceiver {
         } else if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) {
             // Application removed
             if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false))
-                Rule.updatePackages(context);
+                Rule.clearCache(context);
 
             if (intent.getBooleanExtra(Intent.EXTRA_DATA_REMOVED, false)) {
                 // Remove settings
diff --git a/app/src/main/java/eu/faircode/netguard/Rule.java b/app/src/main/java/eu/faircode/netguard/Rule.java
index 0ed70fd9..144d6743 100644
--- a/app/src/main/java/eu/faircode/netguard/Rule.java
+++ b/app/src/main/java/eu/faircode/netguard/Rule.java
@@ -149,7 +149,8 @@ public class Rule {
         }
     }
 
-    public static void updatePackages(Context context) {
+    public static void clearCache(Context context) {
+        Log.i(TAG, "Clearing cache");
         synchronized (context.getApplicationContext()) {
             cachePackageInfo = null;
             cacheLabel.clear();
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 8b49f914..1d2845ee 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -15,7 +15,7 @@ however it is impossible to guarantee NetGuard will work correctly on every devi
   <string name="menu_app_disabled">הצג יישומים מנוטרלים</string>
   <string name="menu_sort">מיין יישומים</string>
   <string name="menu_sort_name">מיון לפי שם</string>
-  <string name="menu_sort_uid">Sort on uid</string>
+  <string name="menu_sort_uid">מיין לפי uid</string>
   <string name="menu_sort_data">מיון לפי השימוש בנתונים</string>
   <string name="menu_log">הצג לוג</string>
   <string name="menu_settings">העדפות</string>
@@ -52,11 +52,11 @@ however it is impossible to guarantee NetGuard will work correctly on every devi
   <string name="setting_theme">נושא: %1$s</string>
   <string name="setting_dark">השתמש בערכת נושא כהה</string>
   <string name="setting_auto">אפשר אוטומטית לאחר %1$s דקות</string>
-  <string name="setting_delay">Delay screen off %1$s minutes</string>
+  <string name="setting_delay">השהה מסך אחרי %1$s דקות</string>
   <string name="setting_update">בדוק לעדכון גירסא</string>
   <string name="setting_network_options">אפשרויות רשת</string>
-  <string name="setting_tethering">Allow tethering</string>
-  <string name="setting_wifi_home">Wi-Fi home networks: %1$s</string>
+  <string name="setting_tethering">אפשר מודם סללורי</string>
+  <string name="setting_wifi_home">רשת Wi-Fi ביתית: %1$s</string>
   <string name="setting_metered">Handle metered Wi-Fi networks</string>
   <string name="setting_metered_2g">Consider 2G unmetered</string>
   <string name="setting_metered_3g">Consider 3G unmetered</string>
@@ -78,35 +78,35 @@ however it is impossible to guarantee NetGuard will work correctly on every devi
   <string name="setting_pcap_file_size">חסם גודל קובץ PCAP: %s MB</string>
   <string name="setting_proxy">Proxy server: %s</string>
   <string name="setting_proxy_username">Proxy username</string>
-  <string name="setting_proxy_password">Proxy password</string>
-  <string name="setting_stats_category">Speed notification</string>
-  <string name="setting_stats">Show speed notification</string>
-  <string name="setting_stats_top">Show top applications</string>
-  <string name="setting_stats_frequency">Sample interval: %s ms</string>
-  <string name="setting_stats_samples">Number of samples: %s s</string>
-  <string name="setting_backup">Backup</string>
-  <string name="setting_export">Export settings</string>
-  <string name="setting_import">Import settings</string>
-  <string name="setting_hosts">Import hosts file</string>
-  <string name="setting_hosts_url">Hosts file download URL</string>
-  <string name="setting_hosts_download">Download hosts file</string>
-  <string name="setting_technical">Technical information</string>
-  <string name="setting_technical_general">General</string>
-  <string name="setting_technical_networks">Networks</string>
-  <string name="setting_technical_subscription">Subscriptions</string>
-  <string name="summary_auto">After disabling using the widget, automatically enable NetGuard again after the selected number of minutes (enter zero to disable this option)</string>
-  <string name="summary_delay">After turning the screen off, keep screen on rules active for the selected number of minutes (enter zero to disable this option)</string>
-  <string name="summary_update">Check for new releases on GitHub twice daily</string>
-  <string name="summary_tethering">Depending on the Android version, tethering may work or may not work. Tethered traffic cannot be filtered.</string>
-  <string name="summary_wifi_home">Apply Wi-Fi network rules for selected network only (apply mobile network rules for other Wi-Fi networks)</string>
-  <string name="summary_metered">Apply mobile network rules to metered (paid, tethered) Wi-Fi networks</string>
-  <string name="summary_metered_2g">Apply Wi-Fi network rules for 2G data connections</string>
-  <string name="summary_metered_3g">Apply Wi-Fi network rules for 3G data connections</string>
-  <string name="summary_metered_4g">Apply Wi-Fi network rules for LTE data connections</string>
-  <string name="summary_national_roaming">Do not apply roaming rules when the SIM and mobile network country are the same</string>
-  <string name="summary_system">Define rules for system applications (for experts)</string>
-  <string name="summary_log_app">Log attempts to access the internet for applications. This might result in extra battery usage.</string>
-  <string name="summary_access">Show a status bar notification when an application attempts to access a new internet address</string>
+  <string name="setting_proxy_password">סיסמת Proxy</string>
+  <string name="setting_stats_category">מהירות התראה</string>
+  <string name="setting_stats">הצג מהירות התראה</string>
+  <string name="setting_stats_top">הצג את היישומים העליונים</string>
+  <string name="setting_stats_frequency">מרווח הדגימה: %%s מ\"ש</string>
+  <string name="setting_stats_samples">מספר דוגמאות: %s</string>
+  <string name="setting_backup">גיבוי</string>
+  <string name="setting_export">הגדרות ייצוא</string>
+  <string name="setting_import">יבא הגדרות</string>
+  <string name="setting_hosts">ייבוא קובץ hosts</string>
+  <string name="setting_hosts_url">כתובת להורדה של קובץ hosts</string>
+  <string name="setting_hosts_download">הורד קובץ hosts</string>
+  <string name="setting_technical">מידע טכני</string>
+  <string name="setting_technical_general">כללי</string>
+  <string name="setting_technical_networks">רשתות</string>
+  <string name="setting_technical_subscription">מנויים</string>
+  <string name="summary_auto">לאחר השבתה דרך הווידגט, אפשר לNetGuard  לפעול באופן אוטמטי לאחר  מספר הדקות (הזן אפס על מנת לבטל אופציה זאת)</string>
+  <string name="summary_delay">לאחר כיבוי המסך, המשך לחוקים לפעול למשך מספר דקות (הזן 0 כדי לבטל אפשרות זו)</string>
+  <string name="summary_update">בדוק עבור עדכונים חדשים דרך GitHub באופן יומי</string>
+  <string name="summary_tethering">בהתאם גירסת אנדרואיד, ייתכן ומודם סללורי לא יפעל, אין אפשרות לסנן תעבורה דרך מודם סללורי.</string>
+  <string name="summary_wifi_home">החל חוקים עבור רשת Wi-Fi הנבחרת בלבד (החל חוקי רשת סללורית עבור רשתות Wi-Fi אחרות)</string>
+  <string name="summary_metered">החל כללים עבור רשת סללורית (בתשלום, מודם סלולרי)</string>
+  <string name="summary_metered_2g">החל חוקי רשת Wi-Fi עבור חיבור נתונים 2G</string>
+  <string name="summary_metered_3g">החל חוקי רשת Wi-Fi עבור חיבור נתונים 3G</string>
+  <string name="summary_metered_4g">החל חוקי רשת Wi-Fi עבור חיבור נתונים LTE</string>
+  <string name="summary_national_roaming">אל תאפשר להחיל חוקי נדידת נתונים כאשר מדינת הסים והרשת זהים</string>
+  <string name="summary_system">הגדר חוקים עבור יישומי מערכת (עבור מומחים)</string>
+  <string name="summary_log_app">לוג(יומן) מנסה לגשת לאינטרנט עבור יישומים. אפשרות זו עלולה לצרוך סוללה</string>
+  <string name="summary_access">הצג התראה כאשר יישום מנסה לגשת כתובת אינטרנט חדשה</string>
   <string name="summary_filter">Filter IP packets going out of the VPN tunnel. This might result in extra battery usage.</string>
   <string name="summary_track_usage">Track the number of bytes sent and received for each application and address. This might result in extra battery usage.</string>
   <string name="summary_block_domains">Respond with \'name error\' (NXDOMAIN) for blocked domain names. This switch is disabled when no hosts file is available.</string>