X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSaveDialog.kt;h=1aa31dd00c7ce94fc117dde1fcb5f64d1b24ae32;hp=35eb2e0db537786fabb4416fdb2d96e9be66f0c1;hb=aba828cabddd0a277271c90816b50292bb64baf1;hpb=d4f39c36beb5e6c3568a1e075274ad66defd8e8e

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..1aa31dd0 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,88 @@
 /*
- * Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2019-2022 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 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.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
+import com.stoutner.privacybrowser.asynctasks.GetUrlSize
 
-// Declare the class constants.
-private const val SAVE_TYPE = "save_type"
+// Define the 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() {
     // Declare the class variables.
     private lateinit var saveListener: SaveListener
-    private lateinit var fileName: String
+
+    // Define the class variables.
+    private var getUrlSize: AsyncTask<*, *, *>? = null
 
     // The public interface is used to send information back to the parent activity.
     interface SaveListener {
-        fun onSave(saveType: Int, dialogFragment: DialogFragment)
+        fun onSaveUrl(originalUrlString: String, fileNameString: String, dialogFragment: DialogFragment)
     }
 
     override fun onAttach(context: Context) {
         // Run the default commands.
         super.onAttach(context)
 
-        // Get a handle for the save listener from the launching context.
+        // Get a handle for the save webpage listener from the launching context.
         saveListener = context as SaveListener
     }
 
     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, fileSizeString: String, fileNameString: 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_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 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 +90,40 @@ 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)
+        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 the icon according to the save type.
-        when (saveType) {
-            SAVE_LOGCAT -> {
-                // Set the title.
-                dialogBuilder.setTitle(R.string.save_logcat)
-
-                // 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)
-                }
-            }
+        // Set the title.
+        dialogBuilder.setTitle(R.string.save_url)
 
-            SAVE_ABOUT_VERSION_TEXT -> {
-                // Set the title.
-                dialogBuilder.setTitle(R.string.save_text)
-
-                // 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)
-                }
-            }
-
-            SAVE_ABOUT_VERSION_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 icon according to the theme.
+        dialogBuilder.setIconAttribute(R.attr.copyBlueIcon)
 
-        // 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.onSaveUrl(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,56 +137,57 @@ class SaveDialog : DialogFragment() {
         alertDialog.show()
 
         // Get handles for the layout items.
-        val fileNameEditText = alertDialog.findViewById<EditText>(R.id.file_name_edittext)!!
-        val browseButton = alertDialog.findViewById<Button>(R.id.browse_button)!!
+        val urlEditText = alertDialog.findViewById<EditText>(R.id.url_edittext)!!
+        val fileSizeTextView = alertDialog.findViewById<TextView>(R.id.file_size_textview)!!
         val saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
 
-        // Initially disable the save button.
-        saveButton.isEnabled = false
+        // Set the file size text view.
+        fileSizeTextView.text = fileSizeString
 
-        // Update the status of the save button when the file name changes.
-        fileNameEditText.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
-                // Do nothing.
-            }
+        // 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.
+            val urlSubstring = originalUrlString.substring(0, 100) + "…"
 
-            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-                // Do nothing.
-            }
+            // Populate the URL edit text with the truncated URL.
+            urlEditText.setText(urlSubstring)
 
-            override fun afterTextChanged(s: Editable) {
-                // Get the current file name.
-                val fileNameString = fileNameEditText.text.toString()
+            // Disable the editing of the URL edit text.
+            urlEditText.inputType = 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)
+        }
 
-                // Enable the save button if the file name is populated.
-                saveButton.isEnabled = fileNameString.isNotEmpty()
+        // Update the file size when the URL changes.
+        urlEditText.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
+                // Do nothing.
             }
-        })
 
-        // Set the file name according to the type.
-        when (saveType) {
-            SAVE_LOGCAT -> fileName = getString(R.string.privacy_browser_logcat_txt)
-            SAVE_ABOUT_VERSION_TEXT -> fileName = getString(R.string.privacy_browser_version_txt)
-            SAVE_ABOUT_VERSION_IMAGE -> fileName = getString(R.string.privacy_browser_version_png)
-        }
+            override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
+                // Do nothing.
+            }
 
-        // Handle clicks on the browse button.
-        browseButton.setOnClickListener {
-            // Create the file picker intent.
-            val browseIntent = Intent(Intent.ACTION_CREATE_DOCUMENT)
+            override fun afterTextChanged(editable: Editable) {
+                // Cancel the get URL size AsyncTask if it is running.
+                if (getUrlSize != null) {
+                    getUrlSize!!.cancel(true)
+                }
 
-            // Set the intent MIME type to include all files so that everything is visible.
-            browseIntent.type = "*/*"
+                // Get the current URL to save.
+                val urlToSave = urlEditText.text.toString()
 
-            // Set the initial file name.
-            browseIntent.putExtra(Intent.EXTRA_TITLE, fileName)
+                // Wipe the file size text view.
+                fileSizeTextView.text = ""
 
-            // Request a file that can be opened.
-            browseIntent.addCategory(Intent.CATEGORY_OPENABLE)
+                // Get the file size for the current URL.
+                getUrlSize = GetUrlSize(context, alertDialog, userAgentString, cookiesEnabled).execute(urlToSave)
 
-            // Launch the file picker.  There is only one `startActivityForResult()`, so the request code is simply set to 0, but it must be run under `activity` so the response is processed correctly.
-            requireActivity().startActivityForResult(browseIntent, 0)
-        }
+                // Enable the save button if the URL is populated.
+                saveButton.isEnabled = urlToSave.isNotEmpty()
+            }
+        })
 
         // Return the alert dialog.
         return alertDialog