From: Soren Stoutner <soren@stoutner.com>
Date: Wed, 17 Jul 2024 22:30:26 +0000 (-0700)
Subject: Fix updating of entry enabled status in the Navigation Drawer.
X-Git-Tag: v3.18.1~1
X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=8d5ac7dc09c42e6dbd41128d7aa7fdb95acb945e;p=PrivacyBrowserAndroid.git
Fix updating of entry enabled status in the Navigation Drawer.
---
diff --git a/app/build.gradle b/app/build.gradle
index 273dd017..e827df84 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -90,7 +90,7 @@ dependencies {
implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.drawerlayout:drawerlayout:1.2.0'
- implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0'
+ implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.viewpager:viewpager:1.0.0'
@@ -100,5 +100,5 @@ dependencies {
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20'
// Include the Google material library.
- implementation 'com.google.android.material:material:1.12.0'
+ implementation 'com.google.android.material:material:1.13.0-alpha04'
}
diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html
index 9c69680b..22100c74 100644
--- a/app/src/main/assets/de/about_changelog.html
+++ b/app/src/main/assets/de/about_changelog.html
@@ -34,8 +34,8 @@
</head>
<body>
- <h3>3.18 (Version Code 74)</h3>
- <p>27. Mai 2024 - Mindest-API 26, Ziel-API 34</p>
+ <h3><a href="https://www.stoutner.com/privacy-browser-android-3-18/">3.18</a> (Version Code 74)</h3>
+ <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=5be67db45b84cd4d8abedf70d90ae584415348f6">27. Mai 2024</a> - Mindest-API 26, Ziel-API 34</p>
<ul>
<li>Fix some files <a href="https://redmine.stoutner.com/issues/1197">not being selectable in the file picker</a> on some websites.</li>
<li><a href="https://redmine.stoutner.com/issues/378">Colorize the logcat</a> and add a <a href="https://redmine.stoutner.com/issues/381">search option</a>.</li>
diff --git a/app/src/main/assets/en/about_changelog.html b/app/src/main/assets/en/about_changelog.html
index 426219d7..5ca933e6 100644
--- a/app/src/main/assets/en/about_changelog.html
+++ b/app/src/main/assets/en/about_changelog.html
@@ -28,8 +28,8 @@
</head>
<body>
- <h3>3.18 (version code 74)</h3>
- <p>27 May 2024 - minimum API 26, target API 34</p>
+ <h3><a href="https://www.stoutner.com/privacy-browser-android-3-18/">3.18</a> (version code 74)</h3>
+ <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=5be67db45b84cd4d8abedf70d90ae584415348f6">27 May 2024</a> - minimum API 26, target API 34</p>
<ul>
<li>Fix some files <a href="https://redmine.stoutner.com/issues/1197">not being selectable in the file picker</a> on some websites.</li>
<li><a href="https://redmine.stoutner.com/issues/378">Colorize the logcat</a> and add a <a href="https://redmine.stoutner.com/issues/381">search option</a>.</li>
diff --git a/app/src/main/assets/es/about_changelog.html b/app/src/main/assets/es/about_changelog.html
index 797deceb..234e04f0 100644
--- a/app/src/main/assets/es/about_changelog.html
+++ b/app/src/main/assets/es/about_changelog.html
@@ -30,8 +30,8 @@
</head>
<body>
- <h3>3.18 (código de versión 74)</h3>
- <p>27 de mayo de 2024 - API mÃnimo 26, API objetivo 34</p>
+ <h3><a href="https://www.stoutner.com/privacy-browser-android-3-18/">3.18</a> (código de versión 74)</h3>
+ <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=5be67db45b84cd4d8abedf70d90ae584415348f6">27 de mayo de 2024</a> - API mÃnimo 26, API objetivo 34</p>
<ul>
<li>Corregir algunos archivos <a href="https://redmine.stoutner.com/issues/1197">no seleccionables en el selector de archivos</a> en algunos sitios web.</li>
<li><a href="https://redmine.stoutner.com/issues/378">Colorear el logcat</a> y añadir una <a href="https://redmine.stoutner.com/issues/381">opción de búsqueda</a>.</li>
diff --git a/app/src/main/assets/filterlists/easyprivacy.txt b/app/src/main/assets/filterlists/easyprivacy.txt
index c1ac57cf..c4c1c8bb 100644
--- a/app/src/main/assets/filterlists/easyprivacy.txt
+++ b/app/src/main/assets/filterlists/easyprivacy.txt
@@ -21101,7 +21101,6 @@ abema.tv##+js(rmnt, script, NREUM)
||om.aopa.org^
||om.burberry.com^
||om.cbsi.com^
-||om.churchofjesuschrist.org^
||om.cyberrentals.com^
||om.dowjoneson.com^
||om.escapehomes.com^
diff --git a/app/src/main/assets/fr/about_changelog.html b/app/src/main/assets/fr/about_changelog.html
index 6688b97c..a241b8da 100644
--- a/app/src/main/assets/fr/about_changelog.html
+++ b/app/src/main/assets/fr/about_changelog.html
@@ -30,8 +30,8 @@
</head>
<body>
- <h3>3.18 (version du code 74)</h3>
- <p>27 Mai 2024 - API minimale : 26, API optimale : 34</p>
+ <h3><a href="https://www.stoutner.com/privacy-browser-android-3-18/">3.18</a> (version du code 74)</h3>
+ <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=5be67db45b84cd4d8abedf70d90ae584415348f6">27 Mai 2024</a> - API minimale : 26, API optimale : 34</p>
<ul>
<li>Correction de certains fichiers <a href="https://redmine.stoutner.com/issues/1197">qui ne pouvaient pas être sélectionnés dans le sélecteur de fichiers</a> sur certains sites Web.</li>
<li><a href="https://redmine.stoutner.com/issues/378">Coloration du logcat</a> et ajout d'une <a href="https://redmine.stoutner.com/issues/381">option de recherche</a>.</li>
diff --git a/app/src/main/assets/it/about_changelog.html b/app/src/main/assets/it/about_changelog.html
index 6df7ae37..b4371239 100644
--- a/app/src/main/assets/it/about_changelog.html
+++ b/app/src/main/assets/it/about_changelog.html
@@ -30,8 +30,8 @@
</head>
<body>
- <h3>3.18 (versione codice 74)</h3>
- <p>27 Maggio 2024 - minima API 26, target API 34</p>
+ <h3><a href="https://www.stoutner.com/privacy-browser-android-3-18/">3.18</a> (versione codice 74)</h3>
+ <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=5be67db45b84cd4d8abedf70d90ae584415348f6">27 Maggio 2024</a> - minima API 26, target API 34</p>
<ul>
<li>Correzione del problema per cui alcuni file <a href="https://redmine.stoutner.com/issues/1197">non erano selezionabili nella finestra di dialogo</a> per alcuni siti web.</li>
<li><a href="https://redmine.stoutner.com/issues/378">Colorazione del logcat</a> e aggiunta dell'<a href="https://redmine.stoutner.com/issues/381">opzione di ricerca</a>.</li>
diff --git a/app/src/main/assets/pt-rBR/about_changelog.html b/app/src/main/assets/pt-rBR/about_changelog.html
index 34e2f344..01854cde 100644
--- a/app/src/main/assets/pt-rBR/about_changelog.html
+++ b/app/src/main/assets/pt-rBR/about_changelog.html
@@ -30,8 +30,8 @@
</head>
<body>
- <h3>3.18 (código de versão 74)</h3>
- <p>27 de maio de 2024 - minimum API 26, target API 34</p>
+ <h3><a href="https://www.stoutner.com/privacy-browser-android-3-18/">3.18</a> (código de versão 74)</h3>
+ <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=5be67db45b84cd4d8abedf70d90ae584415348f6">27 de maio de 2024</a> - minimum API 26, target API 34</p>
<ul>
<li>Fix some files <a href="https://redmine.stoutner.com/issues/1197">not being selectable in the file picker</a> on some websites.</li>
<li><a href="https://redmine.stoutner.com/issues/378">Colorize the logcat</a> and add a <a href="https://redmine.stoutner.com/issues/381">search option</a>.</li>
diff --git a/app/src/main/assets/ru/about_changelog.html b/app/src/main/assets/ru/about_changelog.html
index 796bfdb7..29a0cef0 100644
--- a/app/src/main/assets/ru/about_changelog.html
+++ b/app/src/main/assets/ru/about_changelog.html
@@ -28,8 +28,8 @@
</head>
<body>
- <h3>3.18 (код веÑÑии 74)</h3>
- <p>27 иÑÐ½Ñ 2024 года - минималÑнÑй API 26, Ñелевой API 34</p>
+ <h3><a href="https://www.stoutner.com/privacy-browser-android-3-18/">3.18</a> (код веÑÑии 74)</h3>
+ <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=5be67db45b84cd4d8abedf70d90ae584415348f6">27 иÑÐ½Ñ 2024 года</a> - минималÑнÑй API 26, Ñелевой API 34</p>
<ul>
<li>ÐÑпÑавлено оÑÑÑÑÑÑвие возможноÑÑи <a href="https://redmine.stoutner.com/issues/1197">вÑбоÑа некоÑоÑÑÑ
Ñайлов в Ñайловом менеджеÑе</a> на ÑÑде ÑайÑов.</li>
<li><a href="https://redmine.stoutner.com/issues/378">СинÑакÑÐ¸Ñ Ð¶ÑÑнала logcat ÑепеÑÑ Ð¿Ð¾Ð´ÑвеÑиваеÑÑÑ ÑвеÑами</a>,
diff --git a/app/src/main/assets/tr/about_changelog.html b/app/src/main/assets/tr/about_changelog.html
index b598c9e4..ccf33521 100644
--- a/app/src/main/assets/tr/about_changelog.html
+++ b/app/src/main/assets/tr/about_changelog.html
@@ -28,8 +28,8 @@
</head>
<body>
- <h3>3.18 (version code 74)</h3>
- <p>27 Mayıs 2024 - minimum API 26, target API 34</p>
+ <h3><a href="https://www.stoutner.com/privacy-browser-android-3-18/">3.18</a> (version code 74)</h3>
+ <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=5be67db45b84cd4d8abedf70d90ae584415348f6">27 Mayıs 2024</a> - minimum API 26, target API 34</p>
<ul>
<li>Fix some files <a href="https://redmine.stoutner.com/issues/1197">not being selectable in the file picker</a> on some websites.</li>
<li><a href="https://redmine.stoutner.com/issues/378">Colorize the logcat</a> and add a <a href="https://redmine.stoutner.com/issues/381">search option</a>.</li>
diff --git a/app/src/main/assets/zh-rCN/about_changelog.html b/app/src/main/assets/zh-rCN/about_changelog.html
index 069dd5c4..1770e1e2 100644
--- a/app/src/main/assets/zh-rCN/about_changelog.html
+++ b/app/src/main/assets/zh-rCN/about_changelog.html
@@ -30,8 +30,8 @@
</head>
<body>
- <h3>3.18 (version code 74)</h3>
- <p>27 May 2024 - æä½æ¯æAPI 26, æé«æ¯æAPI 34</p>
+ <h3><a href="https://www.stoutner.com/privacy-browser-android-3-18/">3.18</a> (version code 74)</h3>
+ <p><a href="https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff;h=5be67db45b84cd4d8abedf70d90ae584415348f6">27 May 2024</a> - æä½æ¯æAPI 26, æé«æ¯æAPI 34</p>
<ul>
<li>Fix some files <a href="https://redmine.stoutner.com/issues/1197">not being selectable in the file picker</a> on some websites.</li>
<li><a href="https://redmine.stoutner.com/issues/378">Colorize the logcat</a> and add a <a href="https://redmine.stoutner.com/issues/381">search option</a>.</li>
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt
index 163e41d1..97875353 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt
@@ -1,7 +1,7 @@
/*
* Copyright 2016-2024 Soren Stoutner <soren@stoutner.com>.
*
- * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
*
* Privacy Browser Android is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 80c11f15..dec081e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -604,13 +604,13 @@
<item>WebView default user agent</item> <!-- This item must not be translated into other languages because it is referenced in code. It is never displayed on the screen. -->
<item>Mozilla/5.0 (Android 14; Mobile; rv:126.0) Gecko/126.0 Firefox/126.0</item>
<item>Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36</item>
- <item>Mozilla/5.0 (iPhone; CPU iPhone OS 17_2_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2 Mobile/15E148 Safari/604.1</item>
+ <item>Mozilla/5.0 (iPhone; CPU iPhone OS 17_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.5 Mobile/15E148 Safari/604.1</item>
<item>Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0</item>
<item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36</item>
- <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:126.0) Gecko/20100101 Firefox/126.0</item>
- <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36</item>
- <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0</item>
- <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15</item>
+ <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0</item>
+ <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36</item>
+ <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0</item>
+ <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_Z) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.5 Safari/605.1.15</item>
<item>Custom user agent</item> <!-- This item must not be translated into other languages because it is referenced in code. It is never displayed on the screen. -->
</string-array>
<string name="custom_user_agent">Custom user agent</string>
diff --git a/build.gradle b/build.gradle
index c963cfe3..f56237fd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:8.4.1'
+ classpath 'com.android.tools.build:gradle:8.5.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
// NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1f5b0c3d..73b15378 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
# Copyright 2019-2024 Soren Stoutner <soren@stoutner.com>.
#
-# This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+# This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
#
# Privacy Browser Android is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip