From: Soren Stoutner Date: Wed, 31 Mar 2021 18:13:09 +0000 (-0700) Subject: Migrate the rest of the dialogs to Kotlin. https://redmine.stoutner.com/issues/683 X-Git-Tag: v3.8~19 X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff_plain;h=031def95c6d9bfc14113fe86b4a5690233d93ce2 Migrate the rest of the dialogs to Kotlin. https://redmine.stoutner.com/issues/683 --- diff --git a/app/build.gradle b/app/build.gradle index 2dff0f45..4eb4f1ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -88,7 +88,7 @@ dependencies { implementation 'androidx.webkit:webkit:1.4.0' // Include the Kotlin standard libraries. This should be the same version number listed in project build.gradle. - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32' // Include the Google material library. implementation 'com.google.android.material:material:1.3.0' diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index 1fafac45..a1d639b8 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -33,8 +33,8 @@ -

3.7 (version code 54)

29. MÃ¤rz 2021 - Mindest-API 19, Ziel-API 30

3.7 (version code 54)

29. MÃ¤rz 2021 - Mindest-API 19, Ziel-API 30

Datei-Zugriff geÃ¤ndert, um "Scoped Storage" und das "Storage Access Framework" nutzen zu kÃ¶nnen. Dies erlaubt, die Ziel-API auf 30 zu erhÃ¶hen und ermÃ¶glicht, die gefÃ¤hrlichen Berechtigungen READ_EXTERNAL_STORAGE und WRITE_EXTERNAL_STORAGE zu vermeiden. @@ -51,7 +51,7 @@
Fehler behoben, durch den das Hamburger-MenÃ¼ zu einem Pfeil wurde, wenn das Navigations-MenÃ¼ beim Neustart der App geÃ¶ffnet war.
Ãffnen des Options-MenÃ¼s beschleunigt.
Aktualisierte deutsche Ãbersetzung von Bernhard G. Keller.
Aktualisierte Brasilianisch Portugiesische Ãbersetzung von Thiago Nazareno ConceiÃ§Ã£o Silva de Jesus.
Aktualisierte brasilianisch-portugiesische Ãbersetzung von Thiago Nazareno ConceiÃ§Ã£o Silva de Jesus.
Aktualisierte franzÃ¶sische Ãbersetzung von KÃ©vin L.
Aktualisierte italienische Ãbersetzung von Francesco Buratti.
Aktualisierte russische Ãbersetzung.

Teilweise Ãbersetzung in brasilianisches Portugiesisch von Thiago Nazareno ConceiÃ§Ã£o Silva de Jesus.
Teilweise Ãbersetzung in brasilianisch-portugiesische von Thiago Nazareno ConceiÃ§Ã£o Silva de Jesus.
Aktualisierte deutsche Ãbersetzung von Bernhard G. Keller.
Aktualisierte italienische Ãbersetzung von Francesco Buratti.

3.7 (version code 54)

29 March 2021 - minimum API 19, target API 30

3.7 (version code 54)

29 March 2021 - minimum API 19, target API 30

Redesign file access to work with scoped storage and the Storage Access Framework. This allows the target API to be bumped to 30 and removes the need for the dangerous READ_EXTERNAL_STORAGE and WRITE_EXTERNAL_STORAGE permissions. diff --git a/app/src/main/assets/es/about_changelog.html b/app/src/main/assets/es/about_changelog.html index d0c8cd6e..364b7bbe 100644 --- a/app/src/main/assets/es/about_changelog.html +++ b/app/src/main/assets/es/about_changelog.html @@ -29,8 +29,8 @@ -
3.7 (cÃ³digo de versiÃ³n 54)
-
29 de marzo de 2021 - API mÃnimo 19, API dirigido 30
+
3.7 (cÃ³digo de versiÃ³n 54)
+
29 de marzo de 2021 - API mÃnimo 19, API dirigido 30
- RediseÃ±ar el acceso a los archivos para que funcione con el almacenamiento de alcance y el marco de acceso al almacenamiento. Esto permite que la API de destino se eleve a 30 y elimina la necesidad de los peligrosos permisos READ_EXTERNAL_STORAGE y WRITE_EXTERNAL_STORAGE. diff --git a/app/src/main/assets/fr/about_changelog.html b/app/src/main/assets/fr/about_changelog.html index d6c292c0..9a963879 100644 --- a/app/src/main/assets/fr/about_changelog.html +++ b/app/src/main/assets/fr/about_changelog.html @@ -29,8 +29,8 @@ -
  3.7 (version du code 54)
  -
  29 Mars 2021 - API minimale : 19, API optimale : 30
  +
  3.7 (version du code 54)
  +
  29 Mars 2021 - API minimale : 19, API optimale : 30
  - Redesign file access to work with scoped storage and the Storage Access Framework. This allows the target API to be bumped to 30 and removes the need for the dangerous READ_EXTERNAL_STORAGE and WRITE_EXTERNAL_STORAGE permissions. diff --git a/app/src/main/assets/it/about_changelog.html b/app/src/main/assets/it/about_changelog.html index 4f3a9a19..7f950afe 100644 --- a/app/src/main/assets/it/about_changelog.html +++ b/app/src/main/assets/it/about_changelog.html @@ -29,8 +29,8 @@ -
    3.7 (versione codice 54)
    -
    29 Marzo 2021 - minima API 19, target API 30
    +
    3.7 (versione codice 54)
    +
    29 Marzo 2021 - minima API 19, target API 30
    - Re-design dell'accesso ai file per funzionare con la scoped storage e lo Storage Access Framework. Questo permette alla target API di essere aggiornata alla 30 ed elimina la necessitÃ di avere le autorizzazioni molto pericolose READ_EXTERNAL_STORAGE e WRITE_EXTERNAL_STORAGE. diff --git a/app/src/main/assets/pt-rBR/about_changelog.html b/app/src/main/assets/pt-rBR/about_changelog.html index 11b056b3..f5a610f2 100644 --- a/app/src/main/assets/pt-rBR/about_changelog.html +++ b/app/src/main/assets/pt-rBR/about_changelog.html @@ -29,8 +29,8 @@ -
      3.7 (cÃ³digo da versÃ£o 54)
      -
      29 March 2021 - minimum API 19, target API 30
      +
      3.7 (cÃ³digo da versÃ£o 54)
      +
      29 March 2021 - minimum API 19, target API 30
      - Redesign file access to work with scoped storage and the Storage Access Framework. This allows the target API to be bumped to 30 and removes the need for the dangerous READ_EXTERNAL_STORAGE and WRITE_EXTERNAL_STORAGE permissions. diff --git a/app/src/main/assets/ru/about_changelog.html b/app/src/main/assets/ru/about_changelog.html index 2686e98a..229a592d 100644 --- a/app/src/main/assets/ru/about_changelog.html +++ b/app/src/main/assets/ru/about_changelog.html @@ -27,8 +27,8 @@ -
        3.7 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 54)
        -
        29 Ð¼Ð°ÑÑÐ° 2021 Ð³Ð¾Ð´Ð° - Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ API 19, ÑÐµÐ»ÐµÐ²Ð¾Ð¹ API 29
        +
        3.7 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 54)
        +
        29 Ð¼Ð°ÑÑÐ° 2021 Ð³Ð¾Ð´Ð° - Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ API 19, ÑÐµÐ»ÐµÐ²Ð¾Ð¹ API 29
        
        ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½ ÑÐµÐ´Ð¸Ð·Ð°Ð¹Ð½ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÐ°Ð¹Ð»Ð°Ð¼ Ð´Ð»Ñ ÑÐ°Ð±Ð¾ÑÑ Ñ Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð½ÑÐ¼Ð¸ Ð¿Ð¾ Ð¼Ð°ÑÑÑÐ°Ð±Ñ ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµÐ¼ Ð¸ ÑÑÐµÐ¹Ð¼Ð²Ð¾ÑÐºÐ¾Ð¼ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÑ. ÐÑÐ¾ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ð¸Ð»Ð¾ ÑÐ²ÐµÐ»Ð¸ÑÐ¸ÑÑ ÑÐµÐ»ÐµÐ²Ð¾Ð¹ API Ð´Ð¾ 30 Ð¸ Ð¸ÑÐºÐ»ÑÑÐ¸ÑÑ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ÑÑÑ Ð² Ð¾Ð¿Ð°ÑÐ½ÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸ÑÑ READ_EXTERNAL_STORAGE Ð¸ WRITE_EXTERNAL_STORAGE. diff --git a/app/src/main/assets/tr/about_changelog.html b/app/src/main/assets/tr/about_changelog.html index e42b3f06..37db0435 100644 --- a/app/src/main/assets/tr/about_changelog.html +++ b/app/src/main/assets/tr/about_changelog.html @@ -27,8 +27,8 @@ -
        3.7 (version code 54)
        -
        29 Mart 2021 - minimum API 19, target API 30
        +
        3.7 (version code 54)
        +
        29 Mart 2021 - minimum API 19, target API 30
        
        Redesign file access to work with scoped storage and the Storage Access Framework. This allows the target API to be bumped to 30 and removes the need for the dangerous READ_EXTERNAL_STORAGE and WRITE_EXTERNAL_STORAGE permissions. 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 88d41867..6b2d7eb0 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -94,6 +94,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.app.AppCompatActivity; @@ -1764,6 +1765,24 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook saveImageFragment.show(getSupportFragmentManager(), getString(R.string.save_dialog)); // Consume the event. + return true; + } else if (menuItemId == R.id.save_archive) { + /* TODO. + try { + // Create an MHT file. + File mhtFile = File.createTempFile("mht_file", ".mht", getCacheDir()); + + // Populate the MHT file. + currentWebView.saveWebArchive(mhtFile.toString()); + + // Check the file length. + Log.i("MHT", "MHT file size: " + mhtFile.length()); + } catch (Exception exception){ + Log.i("MHT", "MHT exception: " + exception.toString()); + } + + */ + return true; } else if (menuItemId == R.id.add_to_homescreen) { // Add to homescreen. // Instantiate the create home screen shortcut dialog. @@ -3008,35 +3027,37 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook } @Override - public void onSaveWebpage(int saveType, String originalUrlString, DialogFragment dialogFragment) { + public void onSaveWebpage(int saveType, @Nullable String originalUrlString, DialogFragment dialogFragment) { // Get the dialog. Dialog dialog = dialogFragment.getDialog(); // Remove the incorrect lint warning below that the dialog might be null. assert dialog != null; - // Get a handle for the edit texts. - EditText dialogUrlEditText = dialog.findViewById(R.id.url_edittext); + // Get a handle for the file name edit text. EditText fileNameEditText = dialog.findViewById(R.id.file_name_edittext); - // Define the save webpage URL. - String saveWebpageUrl; - - // Store the URL. - if ((originalUrlString != null) && originalUrlString.startsWith("data:")) { - // Save the original URL. - saveWebpageUrl = originalUrlString; - } else { - // Get the URL from the edit text, which may have been modified. - saveWebpageUrl = dialogUrlEditText.getText().toString(); - } - // Get the file path from the edit text. String saveWebpageFilePath = fileNameEditText.getText().toString(); //Save the webpage according to the save type. switch (saveType) { case SaveWebpageDialog.SAVE_URL: + // Get a handle for the dialog URL edit text. + EditText dialogUrlEditText = dialog.findViewById(R.id.url_edittext); + + // Define the save webpage URL. + String saveWebpageUrl; + + // Store the URL. + if ((originalUrlString != null) && originalUrlString.startsWith("data:")) { + // Save the original URL. + saveWebpageUrl = originalUrlString; + } else { + // Get the URL from the edit text, which may have been modified. + saveWebpageUrl = dialogUrlEditText.getText().toString(); + } + // Save the URL. new SaveUrl(this, this, saveWebpageFilePath, currentWebView.getSettings().getUserAgentString(), currentWebView.getAcceptFirstPartyCookies()).execute(saveWebpageUrl); break; @@ -3607,7 +3628,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook } @Override - public void navigateHistory(String url, int steps) { + public void navigateHistory(@NonNull String url, int steps) { // Apply the domain settings. applyDomainSettings(currentWebView, url, false, false, false); diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java index 0b9be790..dcb9d66c 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java @@ -1,5 +1,5 @@ /* - * Copyright Â© 2018-2020 Soren Stoutner . + * Copyright Â© 2018-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -263,15 +263,15 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi } @Override - public void onPrevious(int id) { + public void onPrevious(int currentId) { // Show the previous dialog. - launchViewRequestDialog(id -1); + launchViewRequestDialog(currentId -1); } @Override - public void onNext(int id) { + public void onNext(int currentId) { // Show the next dialog. - launchViewRequestDialog(id + 1); + launchViewRequestDialog(currentId + 1); } private void launchViewRequestDialog(int id) { diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveAboutVersionImage.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveAboutVersionImage.java index ed762a14..377ce7be 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveAboutVersionImage.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveAboutVersionImage.java @@ -112,9 +112,6 @@ public class SaveAboutVersionImage extends AsyncTask { // Write the webpage image to the image file. aboutVersionByteArrayOutputStream.writeTo(outputStream); - // Flush the output stream. - outputStream.flush(); - // Close the output stream. outputStream.close(); } catch (Exception exception) { diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java index 7d981c0f..03ab3746 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java @@ -198,9 +198,6 @@ public class SaveUrl extends AsyncTask { } } - // Flush the output stream. - outputStream.flush(); - // Close the output stream. outputStream.close(); } catch (Exception exception) { diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt index 464a24ab..8a602ef5 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt @@ -40,7 +40,7 @@ import androidx.preference.PreferenceManager import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper -// Declare the class constants. +// Define the class constants. private const val URL_STRING = "url_string" class AddDomainDialog : DialogFragment() { @@ -100,7 +100,7 @@ class AddDomainDialog : DialogFragment() { dialogBuilder.setTitle(R.string.add_domain) // Set the view. The parent view is `null` because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.add_domain_dialog, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.add_domain_dialog, null)) // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt index 02832137..e787e1e3 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt @@ -41,7 +41,7 @@ import com.stoutner.privacybrowser.R import java.io.ByteArrayOutputStream -// Declare the class constants. +// Define the class constants. private const val URL_STRING = "url_string" private const val TITLE = "title" private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" @@ -122,7 +122,7 @@ class CreateBookmarkDialog : DialogFragment() { dialogBuilder.setIcon(favoriteIconDrawable) // Set the view. The parent view is `null` because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.create_bookmark_dialog, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.create_bookmark_dialog, null)) // Set a listener on the cancel button. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt index c2b4f5f6..42f9a167 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt @@ -45,7 +45,7 @@ import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper import java.io.ByteArrayOutputStream -// Declare the class constants. +// Define the class constants. private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" class CreateBookmarkFolderDialog : DialogFragment() { @@ -114,7 +114,7 @@ class CreateBookmarkFolderDialog : DialogFragment() { dialogBuilder.setTitle(R.string.create_folder) // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.create_bookmark_folder_dialog, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.create_bookmark_folder_dialog, null)) // Set a listener on the cancel button. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt index b0df47fa..32c4e51a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt @@ -50,7 +50,7 @@ import com.stoutner.privacybrowser.R import java.io.ByteArrayOutputStream -// Declare the class constants. +// Define the class constants. private const val SHORTCUT_NAME = "shortcut_name" private const val URL_STRING = "url_string" private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" @@ -118,7 +118,7 @@ class CreateHomeScreenShortcutDialog : DialogFragment() { dialogBuilder.setIcon(favoriteIconDrawable) // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.create_home_screen_shortcut_dialog, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.create_home_screen_shortcut_dialog, null)) // Set a listener on the close button. Using null closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt index 95d25660..542c4632 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt @@ -56,7 +56,7 @@ import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper import java.io.ByteArrayOutputStream -// Declare the class constants. +// Define the class constants. private const val DATABASE_ID = "database_id" private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" @@ -145,7 +145,7 @@ class EditBookmarkDatabaseViewDialog : DialogFragment() { dialogBuilder.setTitle(R.string.edit_bookmark) // Set the view. The parent view is `null` because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.edit_bookmark_databaseview_dialog, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.edit_bookmark_databaseview_dialog, null)) // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.kt index 8fb3568a..752f5b1c 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.kt @@ -46,7 +46,7 @@ import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper import java.io.ByteArrayOutputStream -// Declare the class constants. +// Define the class constants. private const val DATABASE_ID = "database_id" private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" @@ -133,7 +133,7 @@ class EditBookmarkDialog : DialogFragment() { dialogBuilder.setTitle(R.string.edit_bookmark) // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.edit_bookmark_dialog, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.edit_bookmark_dialog, null)) // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.kt index 63ba8a3c..e15e29ef 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.kt @@ -50,7 +50,7 @@ import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper import java.io.ByteArrayOutputStream -// Declare the class constants. +// Define the class constants. private const val DATABASE_ID = "database_id" private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" @@ -138,7 +138,7 @@ class EditBookmarkFolderDatabaseViewDialog : DialogFragment() { dialogBuilder.setTitle(R.string.edit_folder) // Set the view. The parent view is `null` because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.edit_bookmark_folder_databaseview_dialog, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.edit_bookmark_folder_databaseview_dialog, null)) // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt index 46082b89..1c70b82d 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt @@ -46,7 +46,7 @@ import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper import java.io.ByteArrayOutputStream -// Declare the class constants. +// Define the class constants. private const val DATABASE_ID = "database_id" private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" @@ -134,7 +134,7 @@ class EditBookmarkFolderDialog : DialogFragment() { dialogBuilder.setTitle(R.string.edit_folder) // Set the view. The parent view is `null` because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.edit_bookmark_folder_dialog, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.edit_bookmark_folder_dialog, null)) // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt index 80593fd9..b1c45673 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt @@ -36,7 +36,7 @@ import androidx.preference.PreferenceManager import com.stoutner.privacybrowser.R -// Declare the class constants. +// Define the class constants. private const val FONT_SIZE = "font_size" class FontSizeDialog : DialogFragment() { @@ -93,7 +93,7 @@ class FontSizeDialog : DialogFragment() { dialogBuilder.setTitle(R.string.font_size) // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.font_size_dialog, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.font_size_dialog, null)) // Set the close button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.close, null) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt index b3cf7074..42e43d91 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt @@ -42,7 +42,7 @@ import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.activities.MainWebViewActivity import com.stoutner.privacybrowser.views.NestedScrollWebView -// Declare the class constants. +// Define the class constants. private const val HOST = "host" private const val REALM = "realm" private const val WEBVIEW_FRAGMENT_ID = "webview_fragment_id" @@ -51,7 +51,7 @@ class HttpAuthenticationDialog : DialogFragment() { // Define the class variables. private var dismissDialog: Boolean = false - // Define the class views. + // Declare the class views. private lateinit var usernameEditText: EditText private lateinit var passwordEditText: EditText @@ -115,10 +115,7 @@ class HttpAuthenticationDialog : DialogFragment() { // Set the title. dialogBuilder.setTitle(R.string.http_authentication) - // Get the activity's layout inflater. - val layoutInflater = requireActivity().layoutInflater - - // Set the layout. The parent view is `null` because it will be assigned by the alert dialog. + // Set the view. The parent view is `null` because it will be assigned by the alert dialog. dialogBuilder.setView(layoutInflater.inflate(R.layout.http_authentication_dialog, null)) // Set the close button listener. diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.kt index 84bb7478..c7e7494e 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.kt @@ -53,7 +53,7 @@ import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper import java.io.ByteArrayOutputStream import java.lang.StringBuilder -// Declare the class constants. +// Define the class constants. private const val CURRENT_FOLDER = "current_folder" private const val SELECTED_BOOKMARKS_LONG_ARRAY = "selected_bookmarks_long_array" @@ -125,7 +125,7 @@ class MoveToFolderDialog : DialogFragment() { dialogBuilder.setTitle(R.string.move_to_folder) // Set the view. The parent view is `null` because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.move_to_folder_dialog, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.move_to_folder_dialog, null)) // Set the listener for the cancel button. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt index 5bdf65ac..e62b6fa6 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt @@ -76,7 +76,7 @@ class OpenDialog : DialogFragment() { dialogBuilder.setTitle(R.string.open) // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.open_dialog, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.open_dialog, null)) // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt index 0dd2ce57..c3a5c7fe 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt @@ -43,7 +43,7 @@ import com.stoutner.privacybrowser.adapters.PinnedMismatchPagerAdapter import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper import com.stoutner.privacybrowser.views.NestedScrollWebView -// Declare the class constants. +// Define the class constants. private const val WEBVIEW_FRAGMENT_ID = "webview_fragment_id" class PinnedMismatchDialog : DialogFragment() { @@ -140,7 +140,7 @@ class PinnedMismatchDialog : DialogFragment() { dialogBuilder.setTitle(R.string.pinned_mismatch) // Set the layout. The parent view is `null` because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.pinned_mismatch_linearlayout, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.pinned_mismatch_linearlayout, null)) // Set the update button listener. dialogBuilder.setNeutralButton(R.string.update) { _: DialogInterface?, _: Int -> diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ProxyNotInstalledDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ProxyNotInstalledDialog.kt index d8ed9f19..ee22df72 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ProxyNotInstalledDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ProxyNotInstalledDialog.kt @@ -31,7 +31,7 @@ import androidx.preference.PreferenceManager import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.helpers.ProxyHelper -// Declare the class constants. +// Define the class constants. private const val PROXY_MODE = "proxy_mode" class ProxyNotInstalledDialog : DialogFragment() { diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt index 35eb2e0d..312ebd05 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt @@ -31,12 +31,14 @@ import android.text.TextWatcher import android.view.WindowManager import android.widget.Button import android.widget.EditText + import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager + import com.stoutner.privacybrowser.R -// Declare the class constants. +// Define the class constants. private const val SAVE_TYPE = "save_type" class SaveDialog : DialogFragment() { @@ -58,7 +60,7 @@ class SaveDialog : DialogFragment() { } companion object { - // Declare the companion object constants. These can be moved to class constants once all of the code has transitioned to Kotlin. + // Define the companion object constants. These can be moved to class constants once all of the code has transitioned to Kotlin. const val SAVE_LOGCAT = 0 const val SAVE_ABOUT_VERSION_TEXT = 1 const val SAVE_ABOUT_VERSION_IMAGE = 2 @@ -75,7 +77,7 @@ class SaveDialog : DialogFragment() { // Create a new instance of the save dialog. val saveDialog = SaveDialog() - // Add the arguments bundle to the dialog. + // Add the arguments bundle to the new dialog. saveDialog.arguments = argumentsBundle // Return the new dialog. @@ -135,7 +137,7 @@ class SaveDialog : DialogFragment() { } // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.save_dialog, null)) + dialogBuilder.setView(layoutInflater.inflate(R.layout.save_dialog, null)) // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.java deleted file mode 100644 index 40fdbda6..00000000 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.java +++ /dev/null @@ -1,334 +0,0 @@ -/* - * Copyright Â© 2019-2021 Soren Stoutner . - * - * This file is part of Privacy Browser . - * - * Privacy Browser is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Privacy Browser is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Privacy Browser. If not, see . - */ - -package com.stoutner.privacybrowser.dialogs; - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.SharedPreferences; -import android.content.res.Configuration; -import android.os.AsyncTask; -import android.os.Bundle; -import android.text.Editable; -import android.text.InputType; -import android.text.TextWatcher; -import android.view.View; -import android.view.WindowManager; -import android.widget.Button; -import android.widget.EditText; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.DialogFragment; -import androidx.preference.PreferenceManager; - -import com.google.android.material.textfield.TextInputLayout; -import com.stoutner.privacybrowser.R; -import com.stoutner.privacybrowser.activities.MainWebViewActivity; -import com.stoutner.privacybrowser.asynctasks.GetUrlSize; - -public class SaveWebpageDialog extends DialogFragment { - public static final int SAVE_URL = 0; - public static final int SAVE_IMAGE = 1; - - // Define the save webpage listener. - private SaveWebpageListener saveWebpageListener; - - // The public interface is used to send information back to the parent activity. - public interface SaveWebpageListener { - void onSaveWebpage(int saveType, String originalUrlString, DialogFragment dialogFragment); - } - - // Define the get URL size AsyncTask. This allows previous instances of the task to be cancelled if a new one is run. - @SuppressWarnings("rawtypes") - private AsyncTask getUrlSize; - - @Override - public void onAttach(@NonNull Context context) { - // Run the default commands. - super.onAttach(context); - - // Get a handle for the save webpage listener from the launching context. - saveWebpageListener = (SaveWebpageListener) context; - } - - public static SaveWebpageDialog saveWebpage(int saveType, String urlString, String fileSizeString, String contentDispositionFileNameString, String userAgentString, boolean cookiesEnabled) { - // Create an arguments bundle. - Bundle argumentsBundle = new Bundle(); - - // Store the arguments in the bundle. - argumentsBundle.putInt("save_type", saveType); - argumentsBundle.putString("url_string", urlString); - argumentsBundle.putString("file_size_string", fileSizeString); - argumentsBundle.putString("content_disposition_file_name_string", contentDispositionFileNameString); - argumentsBundle.putString("user_agent_string", userAgentString); - argumentsBundle.putBoolean("cookies_enabled", cookiesEnabled); - - // Create a new instance of the save webpage dialog. - SaveWebpageDialog saveWebpageDialog = new SaveWebpageDialog(); - - // Add the arguments bundle to the new dialog. - saveWebpageDialog.setArguments(argumentsBundle); - - // Return the new dialog. - return saveWebpageDialog; - } - - // `@SuppressLint("InflateParams")` removes the warning about using null as the parent view group when inflating the alert dialog. - @SuppressLint("InflateParams") - @Override - @NonNull - public Dialog onCreateDialog(Bundle savedInstanceState) { - // Get a handle for the arguments. - Bundle arguments = getArguments(); - - // Remove the incorrect lint warning that the arguments might be null. - assert arguments != null; - - // Get the arguments from the bundle. - int saveType = arguments.getInt("save_type"); - String originalUrlString = arguments.getString("url_string"); - String fileSizeString = arguments.getString("file_size_string"); - String contentDispositionFileNameString = arguments.getString("content_disposition_file_name_string"); - String userAgentString = arguments.getString("user_agent_string"); - boolean cookiesEnabled = arguments.getBoolean("cookies_enabled"); - - // Get handles for the context and the activity. - Context context = requireContext(); - Activity activity = requireActivity(); - - // Use an alert dialog builder to create the alert dialog. - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context, R.style.PrivacyBrowserAlertDialog); - - // Get the current theme status. - int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; - - // Set the title and icon according to the save type. - switch (saveType) { - case SAVE_URL: - // Set the title. - dialogBuilder.setTitle(R.string.save_url); - - // Set the icon according to the theme. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { - dialogBuilder.setIcon(R.drawable.copy_enabled_day); - } else { - dialogBuilder.setIcon(R.drawable.copy_enabled_night); - } - break; - - case SAVE_IMAGE: - // Set the title. - dialogBuilder.setTitle(R.string.save_image); - - // Set the icon according to the theme. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { - dialogBuilder.setIcon(R.drawable.images_enabled_day); - } else { - - dialogBuilder.setIcon(R.drawable.images_enabled_night); - } - break; - } - - // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(activity.getLayoutInflater().inflate(R.layout.save_webpage_dialog, null)); - - // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. - dialogBuilder.setNegativeButton(R.string.cancel, null); - - // Set the save button listener. - dialogBuilder.setPositiveButton(R.string.save, (DialogInterface dialog, int which) -> { - // Return the dialog fragment to the parent activity. - saveWebpageListener.onSaveWebpage(saveType, originalUrlString, this); - }); - - // Create an alert dialog from the builder. - AlertDialog alertDialog = dialogBuilder.create(); - - // Remove the incorrect lint warning below that the window might be null. - assert alertDialog.getWindow() != null; - - // Get a handle for the shared preferences. - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); - - // Get the screenshot preference. - boolean allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false); - - // Disable screenshots if not allowed. - if (!allowScreenshots) { - alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); - } - - // The alert dialog must be shown before items in the layout can be modified. - alertDialog.show(); - - // Get handles for the layout items. - TextInputLayout urlTextInputLayout = alertDialog.findViewById(R.id.url_textinputlayout); - EditText urlEditText = alertDialog.findViewById(R.id.url_edittext); - EditText fileNameEditText = alertDialog.findViewById(R.id.file_name_edittext); - Button browseButton = alertDialog.findViewById(R.id.browse_button); - TextView fileSizeTextView = alertDialog.findViewById(R.id.file_size_textview); - Button saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); - - // Remove the incorrect warnings that the views might be null. - assert urlTextInputLayout != null; - assert urlEditText != null; - assert fileNameEditText != null; - assert browseButton != null; - assert fileSizeTextView != null; - - // Set the file size text view. - fileSizeTextView.setText(fileSizeString); - - // Modify the layout based on the save type. - if (saveType == SAVE_URL) { // A URL is being saved. - // Remove the incorrect lint error below that the URL string might be null. - assert originalUrlString != null; - - // Populate the URL edit text according to the type. This must be done before the text change listener is created below so that the file size isn't requested again. - if (originalUrlString.startsWith("data:")) { // The URL contains the entire data of an image. - // Get a substring of the data URL with the first 100 characters. Otherwise, the user interface will freeze while trying to layout the edit text. - String urlSubstring = originalUrlString.substring(0, 100) + "â¦"; - - // Populate the URL edit text with the truncated URL. - urlEditText.setText(urlSubstring); - - // Disable the editing of the URL edit text. - urlEditText.setInputType(InputType.TYPE_NULL); - } else { // The URL contains a reference to the location of the data. - // Populate the URL edit text with the full URL. - urlEditText.setText(originalUrlString); - } - - // Update the file size and the status of the save button when the URL changes. - urlEditText.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { - // Do nothing. - } - - @Override - public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { - // Do nothing. - } - - @Override - public void afterTextChanged(Editable editable) { - // Cancel the get URL size AsyncTask if it is running. - if ((getUrlSize != null)) { - getUrlSize.cancel(true); - } - - // Get the current URL to save. - String urlToSave = urlEditText.getText().toString(); - - // Wipe the file size text view. - fileSizeTextView.setText(""); - - // Get the file size for the current URL. - getUrlSize = new GetUrlSize(context, alertDialog, userAgentString, cookiesEnabled).execute(urlToSave); - - // Enable the save button if the URL and file name are populated. - saveButton.setEnabled(!urlToSave.isEmpty() && !fileNameEditText.getText().toString().isEmpty()); - } - }); - } else { // An archive or an image is being saved. - // Hide the URL edit text and the file size text view. - urlTextInputLayout.setVisibility(View.GONE); - fileSizeTextView.setVisibility(View.GONE); - } - - // Initially disable the save button. - saveButton.setEnabled(false); - - // Update the status of the save button when the file name changes. - fileNameEditText.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - // Do nothing. - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - // Do nothing. - } - - @Override - public void afterTextChanged(Editable s) { - // Get the current file name. - String fileNameString = fileNameEditText.getText().toString(); - - // Enable the save button based on the save type. - if (saveType == SAVE_URL) { // A URL is being saved. - // Enable the save button if the file name and the URL is populated. - saveButton.setEnabled(!fileNameString.isEmpty() && !urlEditText.getText().toString().isEmpty()); - } else { // An archive or an image is being saved. - // Enable the save button if the file name is populated. - saveButton.setEnabled(!fileNameString.isEmpty()); - } - } - }); - - // Create a file name string. - String fileName = ""; - - // Set the file name according to the type. - switch (saveType) { - case SAVE_URL: - // Use the file name from the content disposition. - fileName = contentDispositionFileNameString; - break; - - case SAVE_IMAGE: - // Use a file name ending in `.png`. - fileName = getString(R.string.webpage_png); - break; - } - - // Save the file name as the default file name. This must be final to be used in the lambda below. - final String defaultFileName = fileName; - - // Handle clicks on the browse button. - browseButton.setOnClickListener((View view) -> { - // Create the file picker intent. - Intent browseIntent = new Intent(Intent.ACTION_CREATE_DOCUMENT); - - // Set the intent MIME type to include all files so that everything is visible. - browseIntent.setType("*/*"); - - // Set the initial file name according to the type. - browseIntent.putExtra(Intent.EXTRA_TITLE, defaultFileName); - - // Request a file that can be opened. - browseIntent.addCategory(Intent.CATEGORY_OPENABLE); - - // Start the file picker. This must be started under `activity` so that the request code is returned correctly. - activity.startActivityForResult(browseIntent, MainWebViewActivity.BROWSE_SAVE_WEBPAGE_REQUEST_CODE); - }); - - // Return the alert dialog. - return alertDialog; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.kt new file mode 100644 index 00000000..b27e1703 --- /dev/null +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.kt @@ -0,0 +1,289 @@ +/* + * Copyright Â© 2019-2021 Soren Stoutner . + * + * This file is part of Privacy Browser . + * + * Privacy Browser is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privacy Browser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Privacy Browser. If not, see . + */ + +package com.stoutner.privacybrowser.dialogs + +import android.annotation.SuppressLint +import android.app.Dialog +import android.content.Context +import android.content.DialogInterface +import android.content.Intent +import android.content.res.Configuration +import android.os.AsyncTask +import android.os.Bundle +import android.text.Editable +import android.text.InputType +import android.text.TextWatcher +import android.view.View +import android.view.WindowManager +import android.widget.Button +import android.widget.EditText +import android.widget.TextView + +import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.DialogFragment +import androidx.preference.PreferenceManager + +import com.google.android.material.textfield.TextInputLayout + +import com.stoutner.privacybrowser.R +import com.stoutner.privacybrowser.activities.MainWebViewActivity +import com.stoutner.privacybrowser.asynctasks.GetUrlSize + +// Define the class constants. +private const val SAVE_TYPE = "save_type" +private const val URL_STRING = "url_string" +private const val FILE_SIZE_STRING = "file_size_string" +private const val FILE_NAME_STRING = "file_name_string" +private const val USER_AGENT_STRING = "user_agent_string" +private const val COOKIES_ENABLED = "cookies_enabled" + +class SaveWebpageDialog : DialogFragment() { + // Declare the class variables. + private lateinit var saveWebpageListener: SaveWebpageListener + + // Define the class variables. + private var getUrlSize: AsyncTask<*, *, *>? = null + + // The public interface is used to send information back to the parent activity. + interface SaveWebpageListener { + fun onSaveWebpage(saveType: Int, originalUrlString: String?, dialogFragment: DialogFragment) + } + + override fun onAttach(context: Context) { + // Run the default commands. + super.onAttach(context) + + // Get a handle for the save webpage listener from the launching context. + saveWebpageListener = context as SaveWebpageListener + } + + companion object { + // Define the companion object constants. These can be moved to class constants once all of the code has transitioned to Kotlin. + const val SAVE_URL = 0 + const val SAVE_IMAGE = 1 + + // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. + @JvmStatic + fun saveWebpage(saveType: Int, urlString: String?, fileSizeString: String?, fileNameString: String, userAgentString: String?, cookiesEnabled: Boolean): SaveWebpageDialog { + // Create an arguments bundle. + val argumentsBundle = Bundle() + + // Store the arguments in the bundle. + argumentsBundle.putInt(SAVE_TYPE, saveType) + argumentsBundle.putString(URL_STRING, urlString) + argumentsBundle.putString(FILE_SIZE_STRING, fileSizeString) + argumentsBundle.putString(FILE_NAME_STRING, fileNameString) + argumentsBundle.putString(USER_AGENT_STRING, userAgentString) + argumentsBundle.putBoolean(COOKIES_ENABLED, cookiesEnabled) + + // Create a new instance of the save webpage dialog. + val saveWebpageDialog = SaveWebpageDialog() + + // Add the arguments bundle to the new dialog. + saveWebpageDialog.arguments = argumentsBundle + + // Return the new dialog. + return saveWebpageDialog + } + } + + // `@SuppressLint("InflateParams")` removes the warning about using null as the parent view group when inflating the alert dialog. + @SuppressLint("InflateParams") + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + // Get the arguments from the bundle. + val saveType = requireArguments().getInt(SAVE_TYPE) + val originalUrlString = requireArguments().getString(URL_STRING) + val fileSizeString = requireArguments().getString(FILE_SIZE_STRING) + val fileNameString = requireArguments().getString(FILE_NAME_STRING)!! + val userAgentString = requireArguments().getString(USER_AGENT_STRING) + val cookiesEnabled = requireArguments().getBoolean(COOKIES_ENABLED) + + // Use an alert dialog builder to create the alert dialog. + val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) + + // Get the current theme status. + val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK + + // Set the title and icon according to the save type. + when (saveType) { + SAVE_URL -> { + // Set the title. + dialogBuilder.setTitle(R.string.save_url) + + // Set the icon according to the theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + dialogBuilder.setIcon(R.drawable.copy_enabled_day) + } else { + dialogBuilder.setIcon(R.drawable.copy_enabled_night) + } + } + + SAVE_IMAGE -> { + // Set the title. + dialogBuilder.setTitle(R.string.save_image) + + // Set the icon according to the theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + dialogBuilder.setIcon(R.drawable.images_enabled_day) + } else { + dialogBuilder.setIcon(R.drawable.images_enabled_night) + } + } + } + + // Set the view. The parent view is null because it will be assigned by the alert dialog. + dialogBuilder.setView(layoutInflater.inflate(R.layout.save_webpage_dialog, null)) + + // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. + dialogBuilder.setNegativeButton(R.string.cancel, null) + + // Set the save button listener. + dialogBuilder.setPositiveButton(R.string.save) { _: DialogInterface, _: Int -> + // Return the dialog fragment to the parent activity. + saveWebpageListener.onSaveWebpage(saveType, originalUrlString, this) + } + + // Create an alert dialog from the builder. + val alertDialog = dialogBuilder.create() + + // Get a handle for the shared preferences. + val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + + // Get the screenshot preference. + val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false) + + // Disable screenshots if not allowed. + if (!allowScreenshots) { + alertDialog.window!!.addFlags(WindowManager.LayoutParams.FLAG_SECURE) + } + + // The alert dialog must be shown before items in the layout can be modified. + alertDialog.show() + + // Get handles for the layout items. + val urlTextInputLayout = alertDialog.findViewById(R.id.url_textinputlayout)!! + val urlEditText = alertDialog.findViewById(R.id.url_edittext)!! + val fileNameEditText = alertDialog.findViewById(R.id.file_name_edittext)!! + val browseButton = alertDialog.findViewById

3.7 (version code 54)

3.7 (version code 54)

3.7 (version code 54)

3.7 (version code 54)

3.7 (cÃ³digo de versiÃ³n 54)

3.7 (cÃ³digo de versiÃ³n 54)

3.7 (version du code 54)

3.7 (version du code 54)

3.7 (versione codice 54)

3.7 (versione codice 54)

3.7 (cÃ³digo da versÃ£o 54)

3.7 (cÃ³digo da versÃ£o 54)

3.7 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 54)

3.7 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 54)

3.7 (version code 54)

3.7 (version code 54)

3.7 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 54)

3.7 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 54)