X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FOpenDialog.kt;h=6e1db124fbc0249cb80c06f0534f92e4d3acd46d;hp=5bdf65acba0caa4ad4205f459fd667d727a735c1;hb=HEAD;hpb=d4f39c36beb5e6c3568a1e075274ad66defd8e8e

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..c112a917 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt
@@ -1,51 +1,59 @@
 /*
- * Copyright © 2019-2021 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2019-2023 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.net.Uri
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
+import android.view.View
 import android.view.WindowManager
 import android.widget.Button
+import android.widget.CheckBox
 import android.widget.EditText
+import android.widget.TextView
 
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
 
 import com.stoutner.privacybrowser.R
-import com.stoutner.privacybrowser.activities.MainWebViewActivity
+
+// Define the class constants.
+private const val MHT_EXPLANATION_VISIBILITY = "mht_explanation_visibility"
 
 class OpenDialog : DialogFragment() {
-    // Define the open listener.
+    // Declare the class variables.
     private lateinit var openListener: OpenListener
 
+    // Declare the class views.
+    private lateinit var fileNameEditText: EditText
+    private lateinit var mhtExplanationTextView: TextView
+
     // The public interface is used to send information back to the parent activity.
     interface OpenListener {
-        fun onOpen(dialogFragment: DialogFragment)
+        fun openFile(dialogFragment: DialogFragment)
     }
 
     override fun onAttach(context: Context) {
@@ -56,27 +64,33 @@ class OpenDialog : DialogFragment() {
         openListener = context as OpenListener
     }
 
-    // `@SuppressLint("InflateParams")` removes the warning about using null as the parent view group when inflating the alert dialog.
-    @SuppressLint("InflateParams")
+    // Define the browse activity result launcher.
+    private val browseActivityResultLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { fileUri: Uri? ->
+        // Only do something if the user didn't press back from the file picker.
+        if (fileUri != null) {
+            // Get the file name string from the URI.
+            val fileNameString = fileUri.toString()
+
+            // Set the file name text.
+            fileNameEditText.setText(fileNameString)
+
+            // Move the cursor to the end of the file name edit text.
+            fileNameEditText.setSelection(fileNameString.length)
+        }
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // 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 icon according to the theme.
-        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-            dialogBuilder.setIcon(R.drawable.proxy_enabled_day)
-        } else {
-            dialogBuilder.setIcon(R.drawable.proxy_enabled_night)
-        }
+        // Set the icon.
+        dialogBuilder.setIcon(R.drawable.proxy_enabled)
 
         // Set the title.
         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))
+        // Set the view.
+        dialogBuilder.setView(R.layout.open_dialog)
 
         // Set the cancel button listener.  Using `null` as the listener closes the dialog without doing anything else.
         dialogBuilder.setNegativeButton(R.string.cancel, null)
@@ -84,14 +98,14 @@ class OpenDialog : DialogFragment() {
         // Set the open button listener.
         dialogBuilder.setPositiveButton(R.string.open) { _: DialogInterface?, _: Int ->
             // Return the dialog fragment to the parent activity.
-            openListener.onOpen(this)
+            openListener.openFile(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)
@@ -105,8 +119,10 @@ class OpenDialog : DialogFragment() {
         alertDialog.show()
 
         // Get handles for the layout items.
-        val fileNameEditText = alertDialog.findViewById<EditText>(R.id.file_name_edittext)!!
+        fileNameEditText = alertDialog.findViewById(R.id.file_name_edittext)!!
         val browseButton = alertDialog.findViewById<Button>(R.id.browse_button)!!
+        val mhtCheckBox = alertDialog.findViewById<CheckBox>(R.id.mht_checkbox)!!
+        mhtExplanationTextView = alertDialog.findViewById(R.id.mht_explanation_textview)!!
         val openButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
 
         // Initially disable the open button.
@@ -133,20 +149,39 @@ class OpenDialog : DialogFragment() {
 
         // Handle clicks on the browse button.
         browseButton.setOnClickListener {
-            // Create the file picker intent.
-            val browseIntent = Intent(Intent.ACTION_OPEN_DOCUMENT)
-
-            // Only display files that can be opened.
-            browseIntent.addCategory(Intent.CATEGORY_OPENABLE)
+            // Launch the file picker.
+            browseActivityResultLauncher.launch("*/*")
+        }
 
-            // Set the intent MIME type to include all files so that everything is visible.
-            browseIntent.type = "*/*"
+        // Handle clicks on the MHT checkbox.
+        mhtCheckBox.setOnClickListener {
+            // Update the visibility of the MHT explanation text view.
+            if (mhtCheckBox.isChecked) {
+                mhtExplanationTextView.visibility = View.VISIBLE
+            } else {
+                mhtExplanationTextView.visibility = View.GONE
+            }
+        }
 
-            // Start the file picker.  This must be started under `activity` to that the request code is returned correctly.
-            requireActivity().startActivityForResult(browseIntent, MainWebViewActivity.BROWSE_OPEN_REQUEST_CODE)
+        // Restore the MHT explanation text view visibility if the saved instance state is not null.
+        if (savedInstanceState != null) {
+            // Restore the MHT explanation text view visibility.
+            if (savedInstanceState.getBoolean(MHT_EXPLANATION_VISIBILITY)) {
+                mhtExplanationTextView.visibility = View.VISIBLE
+            } else {
+                mhtExplanationTextView.visibility = View.GONE
+            }
         }
 
         // Return the alert dialog.
         return alertDialog
     }
-}
\ No newline at end of file
+
+    override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        // Run the default commands.
+        super.onSaveInstanceState(savedInstanceState)
+
+        // Add the MHT explanation visibility status to the bundle.
+        savedInstanceState.putBoolean(MHT_EXPLANATION_VISIBILITY, mhtExplanationTextView.visibility == View.VISIBLE)
+    }
+}