From 6fa2fbb5a767bbe036daae06b0da883c4bafb798 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Fri, 11 May 2018 12:46:59 -0700 Subject: [PATCH] Remove the add domain dialog when creating a domain from the options menu. --- .../main/assets/de/about_changelog_dark.html | 4 +- .../main/assets/de/about_changelog_light.html | 4 +- .../main/assets/en/about_changelog_dark.html | 4 +- .../main/assets/en/about_changelog_light.html | 4 +- .../main/assets/es/about_changelog_dark.html | 5 +- .../main/assets/es/about_changelog_light.html | 5 +- .../main/assets/it/about_changelog_dark.html | 5 +- .../main/assets/it/about_changelog_light.html | 5 +- .../main/assets/ru/about_changelog_dark.html | 4 +- .../main/assets/ru/about_changelog_light.html | 4 +- .../activities/MainWebViewActivity.java | 63 ++++++++----------- .../dialogs/AddDomainDialog.java | 29 +++++---- .../metadata/android/en-US/changelogs/32.txt | 2 +- .../metadata/android/es-ES/changelogs/32.txt | 2 +- .../metadata/android/it-IT/changelogs/32.txt | 2 +- .../metadata/android/ru-RU/changelogs/32.txt | 2 +- 16 files changed, 71 insertions(+), 73 deletions(-) diff --git a/app/src/main/assets/de/about_changelog_dark.html b/app/src/main/assets/de/about_changelog_dark.html index f595a4a4..7556614f 100644 --- a/app/src/main/assets/de/about_changelog_dark.html +++ b/app/src/main/assets/de/about_changelog_dark.html @@ -29,9 +29,9 @@

2.9 (version code 32)

9. Mai 2018 - Mindest-API 19, Ziel-API 27

Verwendung des Ã¶ffentlichen Download-Ordners.
Verwendung des Ã¶ffentlichen Download-Ordners (requires write storage permission).
Neue Einstellungen fÃ¼r die Block-List in den Domain-Einstellungen.
UnterstÃ¼tzung vom Starten anderer Anwendungen mit Hilfe eigener URLs.
Neue Hilfe zum Lesezeichen-Tab.

2.9 (version code 32)

9. Mai 2018 - Mindest-API 19, Ziel-API 27

Verwendung des Ã¶ffentlichen Download-Ordners.
Verwendung des Ã¶ffentlichen Download-Ordners (requires write storage permission).
Neue Einstellungen fÃ¼r die Block-List in den Domain-Einstellungen.
UnterstÃ¼tzung vom Starten anderer Anwendungen mit Hilfe eigener URLs.
Neue Hilfe zum Lesezeichen-Tab.

2.9 (version code 32)

9 May 2018 - minimum API 19, target API 27

Use the public download directory.
Use the public download directory (requires write storage permission).
Add controls for the block lists to domain settings.
Support launching other apps using custom URLs.
Add a bookmarks tab to the guide.

2.9 (version code 32)

9 May 2018 - minimum API 19, target API 27

Use the public download directory.
Use the public download directory (requires write storage permission).
Add controls for the block lists to domain settings.
Support launching other apps using custom URLs.
Add a bookmarks tab to the guide.

2.9 (cÃ³digo de versiÃ³n 32)

9 de mayo de 2018 - API mÃnimo 19, API dirigido 27

Usar el directorio pÃºblico de descargas.
Usar el directorio pÃºblico de descargas + (requiere el permiso de almacenamiento de escritura).
AÃ±adir controles para las listas de bloqueo a la configuraciÃ³n del dominio.
Soporte para el lanzamiento de otras aplicaciones usando URLs personalizadas.
AÃ±adir una pestaÃ±a de favoritos a la guÃa.

2.9 (cÃ³digo de versiÃ³n 32)

9 de mayo de 2018 - API mÃnimo 19, API dirigido 27

Usar el directorio pÃºblico de descargas.
Usar el directorio pÃºblico de descargas + (requiere el permiso de almacenamiento de escritura).
AÃ±adir controles para las listas de bloqueo a la configuraciÃ³n del dominio.
Soporte para el lanzamiento de otras aplicaciones usando URLs personalizadas.
AÃ±adir una pestaÃ±a de favoritos a la guÃa.

2.9 (versione codice 32)

9 Maggio 2018 - minima API 19, target API 27

Utilizzo della cartella pubblica per il download.
Utilizzo della cartella pubblica per il download + (richiede il permesso di scrittura della memoria).
Aggiunta di controlli delle Block List alle impostazioni dei domini.
Supporto per il lancio di altre App utilizzando URL personalizzate.
Aggiunta di una scheda dei segnalibri nella guida.

2.9 (versione codice 32)

9 Maggio 2018 - minima API 19, target API 27

Utilizzo della cartella pubblica per il download.
Utilizzo della cartella pubblica per il download + (richiede il permesso di scrittura della memoria).
Aggiunta di controlli delle Block List alle impostazioni dei domini.
Supporto per il lancio di altre App utilizzando URL personalizzate.
Aggiunta di una scheda dei segnalibri nella guida.

2.9 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 32)

9 Ð¼Ð°Ñ 2018 Ð³Ð¾Ð´Ð° - minimum API 19, target API 27

ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð±ÑÐµÐ¹ Ð¿Ð°Ð¿ÐºÐ¸ Ð·Ð°Ð³ÑÑÐ·Ð¾Ðº.
ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð±ÑÐµÐ¹ Ð¿Ð°Ð¿ÐºÐ¸ Ð·Ð°Ð³ÑÑÐ·Ð¾Ðº (ÑÑÐµÐ±ÑÐµÑÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ðµ Ð½Ð° Ð´Ð¾ÑÑÑÐ¿ Ðº ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÑ).
ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ñ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÐ¿Ð¸ÑÐºÐ¾Ð² Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð¾Ðº Ð² Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð´Ð¾Ð¼ÐµÐ½Ð°.
ÐÐ¾Ð´Ð´ÐµÑÐ¶ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° ÑÑÐ¾ÑÐ¾Ð½Ð½Ð¸Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ð¿Ð¾ URL-Ð°Ð´ÑÐµÑÑ.
ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° Ð²ÐºÐ»Ð°Ð´ÐºÐ° Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº Ð² ÑÑÐºÐ¾Ð²Ð¾Ð´ÑÑÐ²Ð¾.

2.9 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 32)

9 Ð¼Ð°Ñ 2018 Ð³Ð¾Ð´Ð° - minimum API 19, target API 27

ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð±ÑÐµÐ¹ Ð¿Ð°Ð¿ÐºÐ¸ Ð·Ð°Ð³ÑÑÐ·Ð¾Ðº.
ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð±ÑÐµÐ¹ Ð¿Ð°Ð¿ÐºÐ¸ Ð·Ð°Ð³ÑÑÐ·Ð¾Ðº (ÑÑÐµÐ±ÑÐµÑÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ðµ Ð½Ð° Ð´Ð¾ÑÑÑÐ¿ Ðº ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÑ).
ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ñ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÐ¿Ð¸ÑÐºÐ¾Ð² Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð¾Ðº Ð² Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð´Ð¾Ð¼ÐµÐ½Ð°.
ÐÐ¾Ð´Ð´ÐµÑÐ¶ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° ÑÑÐ¾ÑÐ¾Ð½Ð½Ð¸Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ð¿Ð¾ URL-Ð°Ð´ÑÐµÑÑ.
ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° Ð²ÐºÐ»Ð°Ð´ÐºÐ° Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº Ð² ÑÑÐºÐ¾Ð²Ð¾Ð´ÑÑÐ²Ð¾.

. + * Copyright Â© 2017-2018 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -81,41 +81,44 @@ public class AddDomainDialog extends AppCompatDialogFragment { // Set the title. dialogBuilder.setTitle(R.string.add_domain); - // Set the view. The parent view is `null` because it will be assigned by the `AlertDialog`. + // Remove the incorrect lint warning below that `getActivity()` might be null. + assert getActivity() != null; + + // Set the view. The parent view is `null` because it will be assigned by the alert dialog. dialogBuilder.setView(getActivity().getLayoutInflater().inflate(R.layout.add_domain_dialog, null)); - // Set an `onClick()` listener for the negative button. + // Set a listener for the negative button. dialogBuilder.setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> { // Do nothing. The `AlertDialog` will close automatically. }); - // Set an `onClick()` listener for the positive button. + // Set a listener for the positive button. dialogBuilder.setPositiveButton(R.string.add, (DialogInterface dialog, int which) -> { // Return the `DialogFragment` to the parent activity on add. addDomainListener.onAddDomain(AddDomainDialog.this); }); - // Create an `AlertDialog` from the `AlertDialog.Builder`. + // Create an alert dialog from the builder. final AlertDialog alertDialog = dialogBuilder.create(); - // Remove the warning below that `setSoftInputMode` might produce `java.lang.NullPointerException`. + // Remove the warning below that `setSoftInputMode` might be null. assert alertDialog.getWindow() != null; - // Show the keyboard when the `AlertDialog` is displayed on the screen. + // Show the keyboard when the alert dialog is displayed on the screen. alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); - // The `AlertDialog` must be shown before the contents can be edited. + // The alert dialog must be shown before the contents can be edited. alertDialog.show(); - // Initialize `domainsDatabaseHelper`. The two `nulls` do not specify the database name or a `CursorFactory`. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. + // Initialize `domainsDatabaseHelper`. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. final DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(getContext(), null, null, 0); - // Get handles for the views in `alertDialog`. + // Get handles for the views in the alert dialog. final EditText addDomainEditText = alertDialog.findViewById(R.id.domain_name_edittext); final TextView domainNameAlreadyExistsTextView = alertDialog.findViewById(R.id.domain_name_already_exists_textview); final Button addButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); - // Update the status of the warning text and the `add` button. + // Update the status of the warning text and the add button. addDomainEditText.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { @@ -133,13 +136,13 @@ public class AddDomainDialog extends AppCompatDialogFragment { // Show the warning text. domainNameAlreadyExistsTextView.setVisibility(View.VISIBLE); - // Disable the `add` button. + // Disable the add button. addButton.setEnabled(false); } else { // The domain do not yet exist. // Hide the warning text. domainNameAlreadyExistsTextView.setVisibility(View.GONE); - // Enable the `add` button. + // Enable the add button. addButton.setEnabled(true); } } diff --git a/fastlane/metadata/android/en-US/changelogs/32.txt b/fastlane/metadata/android/en-US/changelogs/32.txt index 163b45f6..9c8a8474 100644 --- a/fastlane/metadata/android/en-US/changelogs/32.txt +++ b/fastlane/metadata/android/en-US/changelogs/32.txt @@ -1,4 +1,4 @@ -â¢ Use the public download directory. +â¢ Use the public download directory (requires write storage permission). â¢ Add controls for the block lists to domain settings. â¢ Support launching other apps using custom URLs. â¢ Add a bookmarks tab to the guide. diff --git a/fastlane/metadata/android/es-ES/changelogs/32.txt b/fastlane/metadata/android/es-ES/changelogs/32.txt index 03f85f2b..48fc181b 100644 --- a/fastlane/metadata/android/es-ES/changelogs/32.txt +++ b/fastlane/metadata/android/es-ES/changelogs/32.txt @@ -1,4 +1,4 @@ -â¢ Usar el directorio pÃºblico de descargas. +â¢ Usar el directorio pÃºblico de descargas (requiere el permiso de almacenamiento de escritura). â¢ AÃ±adir controles para las listas de bloqueo a la configuraciÃ³n del dominio. â¢ Soporte para el lanzamiento de otras aplicaciones usando URLs personalizadas. â¢ AÃ±adir una pestaÃ±a de favoritos a la guÃa. diff --git a/fastlane/metadata/android/it-IT/changelogs/32.txt b/fastlane/metadata/android/it-IT/changelogs/32.txt index b5ed74eb..13468c22 100644 --- a/fastlane/metadata/android/it-IT/changelogs/32.txt +++ b/fastlane/metadata/android/it-IT/changelogs/32.txt @@ -1,4 +1,4 @@ -â¢ Utilizzo della cartella pubblica per il download. +â¢ Utilizzo della cartella pubblica per il download (richiede il permesso di scrittura della memoria). â¢ Aggiunta di controlli delle Block List alle impostazioni dei domini. â¢ Supporto per il lancio di altre App utilizzando URL personalizzate. â¢ Aggiunta di una scheda dei segnalibri nella guida. diff --git a/fastlane/metadata/android/ru-RU/changelogs/32.txt b/fastlane/metadata/android/ru-RU/changelogs/32.txt index fd307bd6..1bffd8e7 100644 --- a/fastlane/metadata/android/ru-RU/changelogs/32.txt +++ b/fastlane/metadata/android/ru-RU/changelogs/32.txt @@ -1,4 +1,4 @@ -â¢ ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð±ÑÐµÐ¹ Ð¿Ð°Ð¿ÐºÐ¸ Ð·Ð°Ð³ÑÑÐ·Ð¾Ðº. +â¢ ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð±ÑÐµÐ¹ Ð¿Ð°Ð¿ÐºÐ¸ Ð·Ð°Ð³ÑÑÐ·Ð¾Ðº (ÑÑÐµÐ±ÑÐµÑÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ðµ Ð½Ð° Ð´Ð¾ÑÑÑÐ¿ Ðº ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÑ). â¢ ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ñ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÐ¿Ð¸ÑÐºÐ¾Ð² Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð¾Ðº Ð² Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð´Ð¾Ð¼ÐµÐ½Ð°. â¢ ÐÐ¾Ð´Ð´ÐµÑÐ¶ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° ÑÑÐ¾ÑÐ¾Ð½Ð½Ð¸Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ð¿Ð¾ URL-Ð°Ð´ÑÐµÑÑ. â¢ ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° Ð²ÐºÐ»Ð°Ð´ÐºÐ° Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº Ð² ÑÑÐºÐ¾Ð²Ð¾Ð´ÑÑÐ²Ð¾. -- 2.45.2

2.9 (version code 32)

2.9 (version code 32)

2.9 (version code 32)

2.9 (version code 32)

2.9 (cÃ³digo de versiÃ³n 32)

2.9 (cÃ³digo de versiÃ³n 32)

2.9 (versione codice 32)

2.9 (versione codice 32)

2.9 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 32)

2.9 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 32)

2.9 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 32)

2.9 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 32)