X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSaveDialog.kt;h=faae1819df68bf38582d8fe1888ac64beacd5d1c;hb=3b5b81db53b0ee6f448ac3144a176c6d9042f4c8;hp=35eb2e0db537786fabb4416fdb2d96e9be66f0c1;hpb=d4f39c36beb5e6c3568a1e075274ad66defd8e8e;p=PrivacyBrowserAndroid.git 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..faae1819 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt @@ -1,81 +1,71 @@ /* - * Copyright © 2016-2021 Soren Stoutner . + * Copyright 2019-2023 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of Privacy Browser Android . * - * Privacy Browser is free software: you can redistribute it and/or modify + * Privacy Browser Android is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * 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, + * Privacy Browser Android 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 . + * along with Privacy Browser Android. 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.Bundle import android.text.Editable +import android.text.InputType import android.text.TextWatcher 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.stoutner.privacybrowser.R - -// Declare the class constants. -private const val SAVE_TYPE = "save_type" - -class SaveDialog : DialogFragment() { - // Declare the class variables. - private lateinit var saveListener: SaveListener - private lateinit var fileName: String - // The public interface is used to send information back to the parent activity. - interface SaveListener { - fun onSave(saveType: Int, dialogFragment: DialogFragment) - } +import com.stoutner.privacybrowser.R +import com.stoutner.privacybrowser.helpers.UrlHelper - override fun onAttach(context: Context) { - // Run the default commands. - super.onAttach(context) +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext - // Get a handle for the save listener from the launching context. - saveListener = context as SaveListener - } +// Define the private class constants. +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 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. - const val SAVE_LOGCAT = 0 - const val SAVE_ABOUT_VERSION_TEXT = 1 - const val SAVE_ABOUT_VERSION_IMAGE = 2 - - // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. - @JvmStatic - fun save(saveType: Int): SaveDialog { + fun saveUrl(urlString: String, fileNameString: String, fileSizeString: String, userAgentString: String, cookiesEnabled: Boolean): SaveDialog { // 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_NAME_STRING, fileNameString) + argumentsBundle.putString(FILE_SIZE_STRING, fileSizeString) + argumentsBundle.putString(USER_AGENT_STRING, userAgentString) + argumentsBundle.putBoolean(COOKIES_ENABLED, cookiesEnabled) - // Create a new instance of the save dialog. + // Create a new instance of the save webpage 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. @@ -83,74 +73,56 @@ class SaveDialog : DialogFragment() { } } - // `@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) - - // Use an alert dialog builder to create the alert dialog. - val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) + // Declare the class variables. + private lateinit var saveListener: SaveListener - // Get the current theme status. - val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK + // The public interface is used to send information back to the parent activity. + interface SaveListener { + fun saveUrl(originalUrlString: String, fileNameString: String, dialogFragment: DialogFragment) + } - // Set the title and the icon according to the save type. - when (saveType) { - SAVE_LOGCAT -> { - // Set the title. - dialogBuilder.setTitle(R.string.save_logcat) + override fun onAttach(context: Context) { + // Run the default commands. + super.onAttach(context) - // Set the icon according to the theme. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { - dialogBuilder.setIcon(R.drawable.save_dialog_day) - } else { - dialogBuilder.setIcon(R.drawable.save_dialog_night) - } - } + // Get a handle for the save webpage listener from the launching context. + saveListener = context as SaveListener + } - SAVE_ABOUT_VERSION_TEXT -> { - // Set the title. - dialogBuilder.setTitle(R.string.save_text) + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + // Get the arguments from the bundle. + val originalUrlString = requireArguments().getString(URL_STRING)!! + var fileNameString = requireArguments().getString(FILE_NAME_STRING)!! + val fileSizeString = requireArguments().getString(FILE_SIZE_STRING)!! + val userAgentString = requireArguments().getString(USER_AGENT_STRING)!! + val cookiesEnabled = requireArguments().getBoolean(COOKIES_ENABLED) - // Set the icon according to the theme. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { - dialogBuilder.setIcon(R.drawable.save_text_blue_day) - } else { - dialogBuilder.setIcon(R.drawable.save_text_blue_night) - } - } + // Use an alert dialog builder to create the alert dialog. + val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) - SAVE_ABOUT_VERSION_IMAGE -> { - // Set the title. - dialogBuilder.setTitle(R.string.save_image) + // 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.images_enabled_day) - } else { - dialogBuilder.setIcon(R.drawable.images_enabled_night) - } - } - } + // Set the icon. + dialogBuilder.setIcon(R.drawable.download) - // 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)) + // Set the view. + dialogBuilder.setView(R.layout.save_dialog) // 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 -> + dialogBuilder.setPositiveButton(R.string.save) { _: DialogInterface, _: Int -> // Return the dialog fragment to the parent activity. - saveListener.onSave(saveType, this) + saveListener.saveUrl(originalUrlString, fileNameString, this) } // Create an alert dialog from the builder. val alertDialog = dialogBuilder.create() // Get a handle for the shared preferences. - val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) // Get the screenshot preference. val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false) @@ -164,58 +136,65 @@ class SaveDialog : DialogFragment() { alertDialog.show() // Get handles for the layout items. - val fileNameEditText = alertDialog.findViewById(R.id.file_name_edittext)!! - val browseButton = alertDialog.findViewById