Merge branch 'tr'

IngoZenz · Sep 1, 2022 · fc47cb6 · fc47cb6
2 parents 48a67d2 + 5bba347
commit fc47cb6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/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="1505304"
-    android:versionName="1.50.53.4">
+    android:versionCode="1505305"
+    android:versionName="1.50.53.5">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/app/src/main/java/dnsfilter/DNSFilterManager.java b/app/src/main/java/dnsfilter/DNSFilterManager.java
@@ -64,7 +64,7 @@ of the License, or (at your option) any later version.
 
 public class DNSFilterManager extends ConfigurationAccess  {
 
-	public static final String VERSION = "1505304";
+	public static final String VERSION = "1505305";
 
 	private static DNSFilterManager INSTANCE = new DNSFilterManager();
 

diff --git a/app/src/main/java/dnsfilter/android/DNSProxyActivity.java b/app/src/main/java/dnsfilter/android/DNSProxyActivity.java
@@ -1676,6 +1676,7 @@ protected void startup() {
 				String timeStampPattern = getConfig().getConfigValue("liveLogTimeStampFormat", "hh:mm:ss");
 				myLogger.setTimestampFormat(timeStampPattern);
 			}
+			myLogger.setSuppressTime(repeatingLogSuppressTime);
 
 			if (DNSFilterService.SERVICE != null) {
 				Logger.getLogger().logLine("DNS filter service is running!");