From 38919c77d15eeacbee96ab337afc62b30ddc74ca Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Mon, 28 Mar 2022 16:44:10 -0700 Subject: [PATCH] Bump the target API to 32 (Android 12L). https://redmine.stoutner.com/issues/828 --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 12 +- app/src/main/assets/de/about_changelog.html | 6 - app/src/main/assets/en/about_changelog.html | 6 - app/src/main/assets/es/about_changelog.html | 6 - app/src/main/assets/fr/about_changelog.html | 6 - app/src/main/assets/it/about_changelog.html | 6 - .../main/assets/pt-rBR/about_changelog.html | 6 - .../main/assets/pt-rBR/about_permissions.html | 8 +- .../assets/pt-rBR/about_privacy_policy.html | 82 +- app/src/main/assets/ru/about_changelog.html | 6 - app/src/main/assets/tr/about_changelog.html | 6 - .../activities/BookmarksActivity.java | 11 +- .../BookmarksDatabaseViewActivity.java | 14 +- .../activities/DomainsActivity.java | 8 +- .../activities/MainWebViewActivity.java | 36 +- .../adapters/PinnedMismatchPagerAdapter.kt | 23 +- .../privacybrowser/dialogs/AddDomainDialog.kt | 4 +- .../dialogs/CreateBookmarkFolderDialog.kt | 4 +- .../dialogs/EditBookmarkDatabaseViewDialog.kt | 8 +- .../dialogs/EditBookmarkDialog.kt | 4 +- .../EditBookmarkFolderDatabaseViewDialog.kt | 8 +- .../dialogs/EditBookmarkFolderDialog.kt | 4 +- .../dialogs/MoveToFolderDialog.kt | 6 +- .../dialogs/PinnedMismatchDialog.kt | 4 +- .../fragments/DomainSettingsFragment.java | 4 +- .../helpers/BookmarksDatabaseHelper.java | 802 ------------------ .../helpers/BookmarksDatabaseHelper.kt | 748 ++++++++++++++++ ...lper.java => CheckPinnedMismatchHelper.kt} | 140 ++- .../helpers/DomainsDatabaseHelper.java | 462 ---------- .../helpers/DomainsDatabaseHelper.kt | 459 ++++++++++ .../helpers/ImportExportDatabaseHelper.java | 16 +- .../views/NestedScrollWebView.kt | 13 +- app/src/main/res/values-night/colors.xml | 85 -- 34 files changed, 1402 insertions(+), 1613 deletions(-) delete mode 100644 app/src/main/java/com/stoutner/privacybrowser/helpers/BookmarksDatabaseHelper.java create mode 100644 app/src/main/java/com/stoutner/privacybrowser/helpers/BookmarksDatabaseHelper.kt rename app/src/main/java/com/stoutner/privacybrowser/helpers/{CheckPinnedMismatchHelper.java => CheckPinnedMismatchHelper.kt} (52%) delete mode 100644 app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java create mode 100644 app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt diff --git a/app/build.gradle b/app/build.gradle index 441cc71a..8469c24d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,7 +27,7 @@ android { defaultConfig { minSdk 23 - targetSdk 31 + targetSdk 32 versionCode 59 versionName "3.10.1" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a773e56f..a9747840 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + + tools:ignore="DataExtractionRules,UnusedAttribute" >

- - - -

3.10.2 (version code 60)

4 MÃ¤rz 2022 - Mindest-API 23, Ziel-API 31

Work around a scrolling bug in Android System Webview >= 99.0.4844.48.

3.10.1 (version code 59)

2 MÃ¤rz 2022 - Mindest-API 23, Ziel-API 31

3.10.2 (version code 60)

4 March 2022 - minimum API 23, target API 31

Work around a scrolling bug in Android System Webview >= 99.0.4844.48.

3.10.1 (version code 59)

2 March 2022 - minimum API 23, target API 31

3.10.2 (cÃ³digo de versiÃ³n 60)

4 de marzo de 2022 - API mÃnimo 23, API objetivo 31

Work around a scrolling bug in Android System Webview >= 99.0.4844.48.

3.10.1 (cÃ³digo de versiÃ³n 59)

2 de marzo de 2022 - API mÃnimo 23, API objetivo 31

3.10.2 (version du code 60)

4 Mars 2022 - API minimale : 23, API optimale : 31

Work around a scrolling bug in Android System Webview >= 99.0.4844.48.

3.10.1 (version du code 59)

2 Mars 2022 - API minimale : 23, API optimale : 31

3.10.2 (versione codice 60)

4 Marzo 2022 - minima API 23, target API 31

Work around a scrolling bug in Android System Webview >= 99.0.4844.48.

3.10.1 (versione codice 59)

2 Marzo 2022 - minima API 23, target API 31

3.10.2 (cÃ³digo da versÃ£o 60)

4 March 2022 - API mÃnimo 23, API alvo 31

Work around a scrolling bug in Android System Webview >= 99.0.4844.48.

3.10.1 (cÃ³digo da versÃ£o 59)

2 March 2022 - API mÃnimo 23, API alvo 31

Have full network access

Tenha acesso total Ã rede

android.permission.INTERNET

Required for the WebView to access the internet. Without this permission, Privacy Browser would be âNo Browser: Protecting Your Privacy by Staying Completely Off the Internetâ.

NecessÃ¡rio para o WebView acessar a internet. Sem essa permissÃ£o, o Privacy Browser seria âAnti-navegador: protegendo sua privacidade ficando completamente fora da Internetâ.

Install shortcuts

Instalar atalhos

com.android.launcher.permission.INSTALL_SHORTCUT

Required to add shortcuts for websites to the launcher desktop.

NecessÃ¡rio para adicionar atalhos para sites na Ã¡rea de trabalho inicial.

Privacy Browser

Privacy Browser does not collect any user information.

Privacy Browser nÃ£o coleta nenhuma informaÃ§Ã£o do usuÃ¡rio.

Google Play

Google Play has its own privacy policy. - Google provides anonymized summary installation information to developers, including the number of installs organized by the following categories.

Google Play tem sua prÃ³pria polÃtica de privacidade. + Google fornece informaÃ§Ãµes de instalaÃ§Ã£o resumidas anÃ´nimas aos desenvolvedores, incluindo o nÃºmero de instalaÃ§Ãµes organizadas pelas categorias a seguir.

Android version (eg. Android 7.1)
Device (eg. Samsung Galaxy S6 [zeroflte])
Tablets (eg. Tablets 10" and above)
Country (eg. United States)
Language (eg. English [United States])
App version (eg. 14)
Carrier (eg. T-Mobile - US)
VersÃ£o do Android (eg. Android 7.1)
Dispositivo (eg. Samsung Galaxy S6 [zeroflte])
Tablets (eg. Tablets 10" e superior)
PaÃs (eg. Estados Unidos)
Idioma (eg. InglÃªs [Estados Unidos])
VersÃ£o do aplicativo (eg. 14)
Operadora (eg. T-Mobile - US)

Google Play Ratings

Google Play has its own privacy policy. - Google provides developers with anonymized summaries of the following information related to user ratings.

ClassificaÃ§Ãµes do Google Play

Google Play tem sua prÃ³pria polÃtica de privacidade. + Google fornece aos desenvolvedores resumos anÃ´nimos das seguintes informaÃ§Ãµes relacionadas Ã s classificaÃ§Ãµes dos usuÃ¡rios.

Country (eg. United States)
Language (eg. English)
App version (eg. 14)
Android version (eg. Android 7.1)
Device (eg. Google Nexus 5X [bullhead])
Tablets (eg. Tablets 10" and above)
PaÃs (eg. Estados Unidos)
Idioma (eg. InglÃªs)
VersÃ£o do Aplicativo (eg. 14)
VersÃ£o do Android (eg. Android 7.1)
Dispositivo (eg. Google Nexus 5X [bullhead])
Tablets (eg. Tablets 10" e superior)

Google Play Reviews

Google Play has its own privacy policy. - In addition to the name of the reviewer, the rating, and the text of the review (which are all available publicly), Google provides some or all of the following information to the developer.

AvaliaÃ§Ãµes do Google Play

Google Play tem sua prÃ³pria polÃtica de privacidade. + AlÃ©m do nome do avaliador, da classificaÃ§Ã£o e do texto da avaliaÃ§Ã£o (todos disponÃveis publicamente), o Google fornece algumas ou todas as informaÃ§Ãµes a seguir ao desenvolvedor.

Version code (eg. 7)
Version name (eg. 1.6)
Android version (eg. Android 5.1)
Device (eg. Galaxy S6 Edge+ [zenlte])
Manufacturer (eg. Samsung)
Device type (eg. Phone)
CPU make (eg. Samsung)
CPU model (eg. Exynos 7420)
Screen density (eg. 560 dpi)
Screen size (eg. 2560 x 1440)
CÃ³digo da versÃ£o (eg. 7)
Nome da versÃ£o (eg. 1.6)
VersÃ£o do Android (eg. Android 5.1)
Dispositivo (eg. Galaxy S6 Edge+ [zenlte])
Fabricante (eg. Samsung)
Tipo de dispositivo (eg. Phone)
Fabricante da CPU (eg. Samsung)
Modelo da CPU (eg. Exynos 7420)
Densidade da tela (eg. 560 dpi)
Tamanho da tela (eg. 2560 x 1440)
RAM (eg. 4096 MB)
Native platform (eg. armeabi-v7a,armeabi,arm64v8a)
OpenGL ES version (eg. 3.1)
Device language (eg. English)
Plataforma nativa (eg. armeabi-v7a,armeabi,arm64v8a)
VersÃ£o OpenGL ES (eg. 3.1)
Idioma do dispositivo (eg. InglÃªs)

Direct Communications

Users may choose to send direct communications to Stoutner, like email messages and comments on stoutner.com.

ComunicaÃ§Ãµes Diretas

Os usuÃ¡rios podem optar por enviar comunicaÃ§Ãµes diretas Ã Stoutner, como mensagens de e-mail e comentÃ¡rios em stoutner.com.

Use of Information

Stoutner may use this information to assist in the development of Privacy Browser and communicate the status of the project to users. - Stoutner will never sell this information nor transfer it to any third party that would use it for advertising or marketing.

Uso de informaÃ§Ãµes

Stoutner pode usar essas informaÃ§Ãµes para auxiliar no desenvolvimento do Privacy Browser e comunicar o status do projeto aos usuÃ¡rios. + A Stoutner nunca venderÃ¡ essas informaÃ§Ãµes nem as transferirÃ¡ para terceiros que as usariam para publicidade ou marketing.

Revision 1.7, 14 May 2019

RevisÃ£o 1.7, 14 de Maio de 2019

3.10.2 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 60)

Work around a scrolling bug in Android System Webview >= 99.0.4844.48.

3.10.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 59)

3.10.2 (version code 60)

4 Mart 2022 - minimum API 23, target API 31

Work around a scrolling bug in Android System Webview >= 99.0.4844.48.

3.10.1 (version code 59)

2 Mart 2022 - minimum API 23, target API 31

. + WebView.enableSlowWholeDocumentDraw(); // Set the theme. setTheme(R.style.PrivacyBrowser); @@ -1933,8 +1934,8 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook Uri currentUri = Uri.parse(currentWebView.getUrl()); String currentDomain = currentUri.getHost(); - // Initialize the database handler. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. - DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(this, null, null, 0); + // Initialize the database handler. + DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(this); // Create the domain and store the database ID. int newDomainDatabaseId = domainsDatabaseHelper.addDomain(currentDomain); @@ -3363,8 +3364,8 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook drawerLayout.setDrawerTitle(GravityCompat.START, getString(R.string.navigation_drawer)); drawerLayout.setDrawerTitle(GravityCompat.END, getString(R.string.bookmarks)); - // Initialize the bookmarks database helper. The `0` specifies a database version, but that is ignored and set instead using a constant in `BookmarksDatabaseHelper`. - bookmarksDatabaseHelper = new BookmarksDatabaseHelper(this, null, null, 0); + // Initialize the bookmarks database helper. + bookmarksDatabaseHelper = new BookmarksDatabaseHelper(this); // Initialize `currentBookmarksFolder`. `""` is the home folder in the database. currentBookmarksFolder = ""; @@ -3700,8 +3701,8 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook } } - // Initialize the database handler. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. - DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(this, null, null, 0); + // Initialize the database handler. + DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(this); // Get a full cursor from `domainsDatabaseHelper`. Cursor domainNameCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomain(); @@ -3712,7 +3713,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Get the domain name column index. int domainNameColumnIndex = domainNameCursor.getColumnIndexOrThrow(DomainsDatabaseHelper.DOMAIN_NAME); - // Populate `domainSettingsSet`. + // Populate the domain settings set. for (int i = 0; i < domainNameCursor.getCount(); i++) { // Move the domains cursor to the current row. domainNameCursor.moveToPosition(i); @@ -3721,7 +3722,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook domainSettingsSet.add(domainNameCursor.getString(domainNameColumnIndex)); } - // Close `domainNameCursor. + // Close the domain name cursor. domainNameCursor.close(); // Initialize the domain name in database variable. @@ -3740,7 +3741,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook } // Check all the subdomains of the host name against wildcard domains in the domain cursor. - while (!nestedScrollWebView.getDomainSettingsApplied() && newHostName.contains(".")) { // Stop checking if domain settings are already applied or there are no more `.` in the host name. + while (!nestedScrollWebView.getDomainSettingsApplied() && newHostName.contains(".")) { // Stop checking if domain settings are already applied or there are no more `.` in the hostname. if (domainSettingsSet.contains("*." + newHostName)) { // Check the host name prepended by `*.`. // Set the domain settings applied tracker to true. nestedScrollWebView.setDomainSettingsApplied(true); @@ -3776,12 +3777,17 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook String[] userAgentDataArray = getResources().getStringArray(R.array.user_agent_data); if (nestedScrollWebView.getDomainSettingsApplied()) { // The url has custom domain settings. - // Get a cursor for the current host and move it to the first position. + // Remove the incorrect lint warning below that the domain name in database might be null. + assert domainNameInDatabase != null; + + // Get a cursor for the current host. Cursor currentDomainSettingsCursor = domainsDatabaseHelper.getCursorForDomainName(domainNameInDatabase); + + // Move to the first position. currentDomainSettingsCursor.moveToFirst(); // Get the settings from the cursor. - nestedScrollWebView.setDomainSettingsDatabaseId(currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(DomainsDatabaseHelper._ID))); + nestedScrollWebView.setDomainSettingsDatabaseId(currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(DomainsDatabaseHelper.ID))); nestedScrollWebView.getSettings().setJavaScriptEnabled(currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(DomainsDatabaseHelper.ENABLE_JAVASCRIPT)) == 1); nestedScrollWebView.setAcceptCookies(currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(DomainsDatabaseHelper.COOKIES)) == 1); nestedScrollWebView.getSettings().setDomStorageEnabled(currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(DomainsDatabaseHelper.ENABLE_DOM_STORAGE)) == 1); @@ -6095,11 +6101,11 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Proceed to the website if the current SSL website certificate matches the pinned domain certificate. if (nestedScrollWebView.hasPinnedSslCertificate()) { // Get the pinned SSL certificate. - ArrayList

3.10.2 (version code 60)

3.10.1 (version code 59)

3.10.2 (version code 60)

3.10.1 (version code 59)

3.10.2 (cÃ³digo de versiÃ³n 60)

3.10.1 (cÃ³digo de versiÃ³n 59)

3.10.2 (version du code 60)

3.10.1 (version du code 59)

3.10.2 (versione codice 60)

3.10.1 (versione codice 59)

3.10.2 (cÃ³digo da versÃ£o 60)

3.10.1 (cÃ³digo da versÃ£o 59)

Have full network access

Tenha acesso total Ã rede

Install shortcuts

Instalar atalhos

Privacy Browser

Google Play

Google Play Ratings

ClassificaÃ§Ãµes do Google Play

Google Play Reviews

AvaliaÃ§Ãµes do Google Play

Direct Communications

ComunicaÃ§Ãµes Diretas

Use of Information

Uso de informaÃ§Ãµes

3.10.2 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 60)

3.10.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 59)

3.10.2 (version code 60)

3.10.1 (version code 59)

3.10.2 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 60)

3.10.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 59)