Merge branch 'dev'

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="dnsfilter.android"
-    android:versionCode="1504901"
-    android:versionName="1.50.49.1">
+    android:versionCode="1505000"
+    android:versionName="1.50.50.0">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

app/src/main/assets/additionalHosts.txt

@@ -1,22 +1,31 @@
 # Add your own additional hosts here!
-# Supports Blacklist, whitelist and map to custom IP
+# Supports blacklist, whitelist and map to custom IP
 
-# Format for Blacklist: 1 host name per line (sample below).
+# WARNING! You must not add huge lists here!
+# This is only for overruling the configured filter.
+
+# Format for blacklist: 1 host name per line (sample below).
 # Wildcard Character "*" can be used for host blocking.
-# Host name and all sub domains will be blocked.
+# Host name and all sub domains will be blocked,
+# unless there is a more specific rule.
 
 sample4711.justasample.com
 sample4712.justasample.com
 
-# In order to white list a specific host, add a
-# "!" prefix in front of the host name.
-# Whitelisting does NOT support wildcards "*"
+# In order to white list a specific host, use "!" prefix.
+# Wildcard Character "*" can be used for whitelisting.
+# Host name and all sub domains will be whitelisted,
+# unless there is a more specific rule.
 
 !whitelistsample.justasample.com
 
-# In order to forward to custom ip add a ">" in front
-# of the host name followed by whitespace and mapped IP
+# PRIORITIES in case of conflicting entries
+# 1. Explicit entries without wildcards
+# 2. Wildcard entries prioritized along the sequence in this file
+# 3. Downloaded blocklist
 
->router.home 192.168.2.1
+# In order to forward to custom ip add a ">" in front of the host,
+# followed by whitespace and mapped IP.
 
+>router.home 192.168.2.1
 

app/src/main/assets/dnsfilter.conf

@@ -1,3 +1,9 @@
+#############################################
+#        WARNING! FOR EXPERTS ONLY!         #
+#  This is personalDNSfilter configuration! #
+# Only edit this file if you are an expert! #
+#############################################
+
 # detectDNS = true|false.
 # if true, the DNS servers will be detected if possible.
 # if false, the DNS Servers will be taken from the fallbackDNS setting below.
@@ -176,10 +182,6 @@ filterAutoUpdateURL_switchs = true; true; false; false; false; false; false; fal
 # DO NOT CHANGE! - will be set internally!
 previousAutoUpdateURL = <none>
 
-# additionalHosts_lastImportTS - the time stamp of additionalHosts.txt when it was last imported
-# DO NOT CHANGE! - will be set internally!
-additionalHosts_lastImportTS = 0
-
 # reloadIntervalDays - specifies the number of days, after the filter gets updated when configured.
 reloadIntervalDays =7
 
@@ -200,14 +202,3 @@ footerLink = <strong>Want to support us? Feel free to <a href='https://www.paypa
 showInitialInfoPopUp = true
 initialInfoPopUpTitle = Consider your rating!
 initialInfoPopUpText = Thanks for using our free app personalDNSfilter!\nSometimes we get bad ratings due to misunderstanding.\nTherefore, before rating, please check our <a href='https://www.zenz-home.com/personaldnsfilter/help/faq.php'>FAQ</a></strong>, or ask our <a href='https://telegram.me/pdnsf'>Telegram group</a></strong>.\nA bad rating is not motivating to provide this free app further.
-
-# overrule filterHostFile with filter.<host>=true|false  (true will be blocked, false will not be blocked).
-
-#allow bild.de - remove # below to enable
-#filter.cdn1.smartadserver.com = false
-#filter.ec-ns.sascdn.com = false
-#filter.acdn.adnxs.com=false
-
-#allow spiegel.de - remove # below to enable
-#filter.imagesrv.adition.com=false
-#filter.spiegel-de.spiegel.de=false