From b6abb47d4784d46fe9768f2eb42e9faeaca973a3 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Tue, 11 Dec 2018 15:57:24 -0700
Subject: [PATCH] Remove text selection from the WebView when a drawer opens.
https://redmine.stoutner.com/issues/354
---
app/src/main/assets/blocklists/easylist.txt | 2 --
app/src/main/assets/de/about_changelog_dark.html | 2 +-
app/src/main/assets/de/about_changelog_light.html | 2 +-
app/src/main/assets/de/about_licenses_dark.html | 2 +-
app/src/main/assets/de/about_licenses_light.html | 2 +-
app/src/main/assets/en/about_changelog_dark.html | 2 +-
app/src/main/assets/en/about_changelog_light.html | 2 +-
app/src/main/assets/en/about_licenses_dark.html | 2 +-
app/src/main/assets/en/about_licenses_light.html | 2 +-
app/src/main/assets/es/about_changelog_dark.html | 2 +-
app/src/main/assets/es/about_changelog_light.html | 2 +-
app/src/main/assets/it/about_changelog_dark.html | 2 +-
app/src/main/assets/it/about_changelog_light.html | 2 +-
app/src/main/assets/ru/about_changelog_dark.html | 2 +-
app/src/main/assets/ru/about_changelog_light.html | 2 +-
.../privacybrowser/activities/MainWebViewActivity.java | 3 ++-
16 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/app/src/main/assets/blocklists/easylist.txt b/app/src/main/assets/blocklists/easylist.txt
index b21e07b2..264a0a58 100644
--- a/app/src/main/assets/blocklists/easylist.txt
+++ b/app/src/main/assets/blocklists/easylist.txt
@@ -31411,7 +31411,6 @@ coingamez.com,mangaumaru.com,milfzr.com,pencurimovie.cc#@#div[id^="div-gpt-ad"]
||geovisite.com^$third-party
||germarked.info^$third-party
||gestionpub.com^$third-party
-||get.com^$third-party
||getfuneta.info^$third-party
||getgamers.eu^$third-party
||getgscfree.com^$third-party
@@ -32451,7 +32450,6 @@ coingamez.com,mangaumaru.com,milfzr.com,pencurimovie.cc#@#div[id^="div-gpt-ad"]
||nsstatic.net^$third-party
||nster.net^$third-party,domain=~nster.com
||nsvfl7p9.com^$third-party
-||ntent.com^$third-party
||ntv.io^$third-party
||ntvk1.ru^$third-party
||nuclersoncanthinger.info^$third-party
diff --git a/app/src/main/assets/de/about_changelog_dark.html b/app/src/main/assets/de/about_changelog_dark.html
index 179a1204..ae034f08 100644
--- a/app/src/main/assets/de/about_changelog_dark.html
+++ b/app/src/main/assets/de/about_changelog_dark.html
@@ -29,7 +29,7 @@
<body>
<h3>2.14 (version code 37)</h3>
- <p>8. Dezember 2018 - Mindest-API 19, Ziel-API 28</p>
+ <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=57020e5c7cad1eec43c3627f136be1640d07d4aa">8. Dezember 2018</a> - Mindest-API 19, Ziel-API 28</p>
<ul>
<li>Add <a href="https://redmine.stoutner.com/issues/338">encrypted import and export</a> options.</li>
<li>Fix a bug when <a href="https://redmine.stoutner.com/issues/350">importing databases under certain circumstances</a>.</li>
diff --git a/app/src/main/assets/de/about_changelog_light.html b/app/src/main/assets/de/about_changelog_light.html
index e3a7db7c..cc3615e3 100644
--- a/app/src/main/assets/de/about_changelog_light.html
+++ b/app/src/main/assets/de/about_changelog_light.html
@@ -29,7 +29,7 @@
<body>
<h3>2.14 (version code 37)</h3>
- <p>8. Dezember 2018 - Mindest-API 19, Ziel-API 28</p>
+ <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=57020e5c7cad1eec43c3627f136be1640d07d4aa">8. Dezember 2018</a> - Mindest-API 19, Ziel-API 28</p>
<ul>
<li>Add <a href="https://redmine.stoutner.com/issues/338">encrypted import and export</a> options.</li>
<li>Fix a bug when <a href="https://redmine.stoutner.com/issues/350">importing databases under certain circumstances</a>.</li>
diff --git a/app/src/main/assets/de/about_licenses_dark.html b/app/src/main/assets/de/about_licenses_dark.html
index 0ba5306a..dcdc9b09 100644
--- a/app/src/main/assets/de/about_licenses_dark.html
+++ b/app/src/main/assets/de/about_licenses_dark.html
@@ -43,7 +43,7 @@
are released under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported license</a>,
which is <a href="https://www.gnu.org/licenses/license-list.en.html#ccby">compatible with the GPLv3+</a>. The lists are included unchanged in Privacy Browser.</p>
- <p>More information about the block lists can be found on the <a href="https://easylist.to/">EasyList website</a>.</p>
+ <p>More information about the blocklists can be found on the <a href="https://easylist.to/">EasyList website</a>.</p>
<h3>Libraries</h3>
<p>Privacy Browser is built with the <a href="https://developer.android.com/topic/libraries/support-library/index.html">Android Support Library</a>,
diff --git a/app/src/main/assets/de/about_licenses_light.html b/app/src/main/assets/de/about_licenses_light.html
index 15bf1925..63d9c7ac 100644
--- a/app/src/main/assets/de/about_licenses_light.html
+++ b/app/src/main/assets/de/about_licenses_light.html
@@ -42,7 +42,7 @@
are released under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported license</a>,
which is <a href="https://www.gnu.org/licenses/license-list.en.html#ccby">compatible with the GPLv3+</a>. The lists are included unchanged in Privacy Browser.</p>
- <p>More information about the block lists can be found on the <a href="https://easylist.to/">EasyList website</a>.</p>
+ <p>More information about the blocklists can be found on the <a href="https://easylist.to/">EasyList website</a>.</p>
<h3>Libraries</h3>
<p>Privacy Browser is built with the <a href="https://developer.android.com/topic/libraries/support-library/index.html">Android Support Library</a>,
diff --git a/app/src/main/assets/en/about_changelog_dark.html b/app/src/main/assets/en/about_changelog_dark.html
index d5b48a4c..be115a7c 100644
--- a/app/src/main/assets/en/about_changelog_dark.html
+++ b/app/src/main/assets/en/about_changelog_dark.html
@@ -25,7 +25,7 @@
<body>
<h3>2.14 (version code 37)</h3>
- <p>8 December 2018 - minimum API 19, target API 28</p>
+ <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=57020e5c7cad1eec43c3627f136be1640d07d4aa">8 December 2018</a> - minimum API 19, target API 28</p>
<ul>
<li>Add <a href="https://redmine.stoutner.com/issues/338">encrypted import and export</a> options.</li>
<li>Fix a bug when <a href="https://redmine.stoutner.com/issues/350">importing databases under certain circumstances</a>.</li>
diff --git a/app/src/main/assets/en/about_changelog_light.html b/app/src/main/assets/en/about_changelog_light.html
index dd0241a9..29f80016 100644
--- a/app/src/main/assets/en/about_changelog_light.html
+++ b/app/src/main/assets/en/about_changelog_light.html
@@ -25,7 +25,7 @@
<body>
<h3>2.14 (version code 37)</h3>
- <p>8 December 2018 - minimum API 19, target API 28</p>
+ <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=57020e5c7cad1eec43c3627f136be1640d07d4aa">8 December 2018</a> - minimum API 19, target API 28</p>
<ul>
<li>Add <a href="https://redmine.stoutner.com/issues/338">encrypted import and export</a> options.</li>
<li>Fix a bug when <a href="https://redmine.stoutner.com/issues/350">importing databases under certain circumstances</a>.</li>
diff --git a/app/src/main/assets/en/about_licenses_dark.html b/app/src/main/assets/en/about_licenses_dark.html
index 52413da1..a9e0d42a 100644
--- a/app/src/main/assets/en/about_licenses_dark.html
+++ b/app/src/main/assets/en/about_licenses_dark.html
@@ -41,7 +41,7 @@
are released under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported license</a>,
which is <a href="https://www.gnu.org/licenses/license-list.en.html#ccby">compatible with the GPLv3+</a>. The lists are included unchanged in Privacy Browser.</p>
- <p>More information about the block lists can be found on the <a href="https://easylist.to/">EasyList website</a>.</p>
+ <p>More information about the blocklists can be found on the <a href="https://easylist.to/">EasyList website</a>.</p>
<h3>Libraries</h3>
<p>Privacy Browser is built with the <a href="https://developer.android.com/topic/libraries/support-library/index.html">Android Support Library</a>,
diff --git a/app/src/main/assets/en/about_licenses_light.html b/app/src/main/assets/en/about_licenses_light.html
index 9dacc41b..e7d5a258 100644
--- a/app/src/main/assets/en/about_licenses_light.html
+++ b/app/src/main/assets/en/about_licenses_light.html
@@ -41,7 +41,7 @@
are released under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported license</a>,
which is <a href="https://www.gnu.org/licenses/license-list.en.html#ccby">compatible with the GPLv3+</a>. The lists are included unchanged in Privacy Browser.</p>
- <p>More information about the block lists can be found on the <a href="https://easylist.to/">EasyList website</a>.</p>
+ <p>More information about the blocklists can be found on the <a href="https://easylist.to/">EasyList website</a>.</p>
<h3>Libraries</h3>
<p>Privacy Browser is built with the <a href="https://developer.android.com/topic/libraries/support-library/index.html">Android Support Library</a>,
diff --git a/app/src/main/assets/es/about_changelog_dark.html b/app/src/main/assets/es/about_changelog_dark.html
index 0f7a48cc..ddbf2889 100644
--- a/app/src/main/assets/es/about_changelog_dark.html
+++ b/app/src/main/assets/es/about_changelog_dark.html
@@ -27,7 +27,7 @@
<body>
<h3>2.14 (código de versión 37)</h3>
- <p>8 de diciembre de 2018 - API mÃnimo 19, API dirigido 28</p>
+ <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=57020e5c7cad1eec43c3627f136be1640d07d4aa">8 de diciembre de 2018</a> - API mÃnimo 19, API dirigido 28</p>
<ul>
<li>Añadir <a href="https://redmine.stoutner.com/issues/338">opciones de importación y exportación cifradas</a>.</li>
<li>Corregir un error al <a href="https://redmine.stoutner.com/issues/350">importar bases de datos bajo ciertas circunstancias</a>.</li>
diff --git a/app/src/main/assets/es/about_changelog_light.html b/app/src/main/assets/es/about_changelog_light.html
index 8c8a3ddf..07e1233d 100644
--- a/app/src/main/assets/es/about_changelog_light.html
+++ b/app/src/main/assets/es/about_changelog_light.html
@@ -27,7 +27,7 @@
<body>
<h3>2.14 (código de versión 37)</h3>
- <p>8 de diciembre de 2018 - API mÃnimo 19, API dirigido 28</p>
+ <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=57020e5c7cad1eec43c3627f136be1640d07d4aa">8 de diciembre de 2018</a> - API mÃnimo 19, API dirigido 28</p>
<ul>
<li>Añadir <a href="https://redmine.stoutner.com/issues/338">opciones de importación y exportación cifradas</a>.</li>
<li>Corregir un error al <a href="https://redmine.stoutner.com/issues/350">importar bases de datos bajo ciertas circunstancias</a>.</li>
diff --git a/app/src/main/assets/it/about_changelog_dark.html b/app/src/main/assets/it/about_changelog_dark.html
index ffd6c35e..91d23d2e 100644
--- a/app/src/main/assets/it/about_changelog_dark.html
+++ b/app/src/main/assets/it/about_changelog_dark.html
@@ -27,7 +27,7 @@
<body>
<h3>2.14 (versione codice 37)</h3>
- <p>8 Dicembre 2018 - minima API 19, target API 28</p>
+ <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=57020e5c7cad1eec43c3627f136be1640d07d4aa">8 Dicembre 2018</a> - minima API 19, target API 28</p>
<ul>
<li>Aggiunte le opzioni di <a href="https://redmine.stoutner.com/issues/338">importazione ed esportazione criptate</a>.</li>
<li>Correzione di un baco che si verificava quando <a href="https://redmine.stoutner.com/issues/350">si importavano i databases in determinate condizioni</a>.</li>
diff --git a/app/src/main/assets/it/about_changelog_light.html b/app/src/main/assets/it/about_changelog_light.html
index be28dd80..eeaab444 100644
--- a/app/src/main/assets/it/about_changelog_light.html
+++ b/app/src/main/assets/it/about_changelog_light.html
@@ -27,7 +27,7 @@
<body>
<h3>2.14 (versione codice 37)</h3>
- <p>8 Dicembre 2018 - minima API 19, target API 28</p>
+ <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=57020e5c7cad1eec43c3627f136be1640d07d4aa">8 Dicembre 2018</a> - minima API 19, target API 28</p>
<ul>
<li>Aggiunte le opzioni di <a href="https://redmine.stoutner.com/issues/338">importazione ed esportazione criptate</a>.</li>
<li>Correzione di un baco che si verificava quando <a href="https://redmine.stoutner.com/issues/350">si importavano i databases in determinate condizioni</a>.</li>
diff --git a/app/src/main/assets/ru/about_changelog_dark.html b/app/src/main/assets/ru/about_changelog_dark.html
index 3e4937c5..f75c53a0 100644
--- a/app/src/main/assets/ru/about_changelog_dark.html
+++ b/app/src/main/assets/ru/about_changelog_dark.html
@@ -25,7 +25,7 @@
<body>
<h3>2.14 (код веÑÑии 37)</h3>
- <p>8 декабÑÑ 2018 года - minimum API 19, target API 28</p>
+ <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=57020e5c7cad1eec43c3627f136be1640d07d4aa">8 декабÑÑ 2018 года</a> - minimum API 19, target API 28</p>
<ul>
<li>Ðобавлена опÑÐ¸Ñ <a href="https://redmine.stoutner.com/issues/338">заÑиÑÑованного импоÑÑа и ÑкÑпоÑÑа</a>.</li>
<li>ÐÑпÑавлена оÑибка, возникавÑÐ°Ñ <a href="https://redmine.stoutner.com/issues/350">в некоÑоÑÑÑ
ÑлÑÑаÑÑ
пÑи импоÑÑе баз даннÑÑ
</a>.</li>
diff --git a/app/src/main/assets/ru/about_changelog_light.html b/app/src/main/assets/ru/about_changelog_light.html
index ad5314a2..b23ab5fb 100644
--- a/app/src/main/assets/ru/about_changelog_light.html
+++ b/app/src/main/assets/ru/about_changelog_light.html
@@ -25,7 +25,7 @@
<body>
<h3>2.14 (код веÑÑии 37)</h3>
- <p>8 декабÑÑ 2018 года - minimum API 19, target API 28</p>
+ <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=57020e5c7cad1eec43c3627f136be1640d07d4aa">8 декабÑÑ 2018 года</a> - minimum API 19, target API 28</p>
<ul>
<li>Ðобавлена опÑÐ¸Ñ <a href="https://redmine.stoutner.com/issues/338">заÑиÑÑованного импоÑÑа и ÑкÑпоÑÑа</a>.</li>
<li>ÐÑпÑавлена оÑибка, возникавÑÐ°Ñ <a href="https://redmine.stoutner.com/issues/350">в некоÑоÑÑÑ
ÑлÑÑаÑÑ
пÑи импоÑÑе баз даннÑÑ
</a>.</li>
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
index 03bf85ee..d04e9218 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -922,8 +922,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
// Hide the keyboard (if displayed).
inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0);
- // Clear the focus from from the URL text box.
+ // Clear the focus from from the URL text box and the WebView. This removes any text selection markers and context menues, which otherwise draw above the open drawers.
urlTextBox.clearFocus();
+ mainWebView.clearFocus();
}
}
});
--
2.47.2