/*
- * Copyright © 2019-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.Manifest
-import android.annotation.SuppressLint
import android.app.Dialog
import android.content.Context
import android.content.DialogInterface
import android.content.Intent
-import android.content.pm.PackageManager
-import android.content.res.Configuration
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.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
import androidx.fragment.app.DialogFragment
import androidx.preference.PreferenceManager
import com.stoutner.privacybrowser.R
import com.stoutner.privacybrowser.activities.MainWebViewActivity
-import com.stoutner.privacybrowser.helpers.DownloadLocationHelper
-import java.io.File
+// 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 mhtExplanationTextView: TextView
+
// The public interface is used to send information back to the parent activity.
interface OpenListener {
fun onOpen(dialogFragment: 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")
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)
- }
+ dialogBuilder.setIconAttribute(R.attr.proxyBlueIcon)
// 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)
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)
// 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 fileDoesNotExistTextView = alertDialog.findViewById<TextView>(R.id.file_does_not_exist_textview)!!
- val storagePermissionTextView = alertDialog.findViewById<TextView>(R.id.storage_permission_textview)!!
+ 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.
+ openButton.isEnabled = false
+
// Update the status of the open button when the file name changes.
fileNameEditText.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
// Get the current file name.
val fileNameString = fileNameEditText.text.toString()
- // Convert the file name string to a file.
- val file = File(fileNameString)
-
- // Check to see if the file exists.
- if (file.exists()) { // The file exists.
- // Hide the notification that the file does not exist.
- fileDoesNotExistTextView.visibility = View.GONE
-
- // Enable the open button.
- openButton.isEnabled = true
- } else { // The file does not exist.
- // Show the notification that the file does not exist.
- fileDoesNotExistTextView.visibility = View.VISIBLE
-
- // Disable the open button.
- openButton.isEnabled = false
- }
+ // Enable the open button if the file name is populated.
+ openButton.isEnabled = fileNameString.isNotEmpty()
}
})
- // Instantiate the download location helper.
- val downloadLocationHelper = DownloadLocationHelper()
-
- // Get the default file path.
- val defaultFilePath = downloadLocationHelper.getDownloadLocation(context) + "/"
-
- // Display the default file path.
- fileNameEditText.setText(defaultFilePath)
-
- // Move the cursor to the end of the default file path.
- fileNameEditText.setSelection(defaultFilePath.length)
-
- // Hide the storage permission text view if the permission has already been granted.
- if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
- storagePermissionTextView.visibility = View.GONE
- }
-
// 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)
+
// Set the intent MIME type to include all files so that everything is visible.
browseIntent.type = "*/*"
requireActivity().startActivityForResult(browseIntent, MainWebViewActivity.BROWSE_OPEN_REQUEST_CODE)
}
+ // 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
+ }
+ }
+
+ // 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
}
+
+ 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)
+ }
}
\ No newline at end of file
projects / PrivacyBrowserAndroid.git / blobdiff