/*
- * 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.annotation.SuppressLint
import android.app.Dialog
import android.content.Context
import android.content.DialogInterface
-import android.content.Intent
+import android.net.Uri
import android.os.Bundle
import android.text.Editable
import android.text.TextWatcher
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"
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.
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)
- // Set the icon according to the theme.
- dialogBuilder.setIconAttribute(R.attr.proxyBlueIcon)
+ // 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(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)
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)!!
// 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 = "*/*"
-
- // 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)
+ // Launch the file picker.
+ browseActivityResultLauncher.launch("*/*")
}
// Handle clicks on the MHT checkbox.
// 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