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=ba42214373d8fe7df0a40cfbf07f001a831fd53e;hp=c8c869f386d96c877eb738a1e3a364c187611134;hb=153a29723774971e62fa0102db87393f1afef193;hpb=568ac6354411aa26c42077d2b80f8770f6e64695 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 c8c869f3..ba422143 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt @@ -1,30 +1,28 @@ /* - * Copyright © 2019-2021 Soren Stoutner . + * Copyright 2019-2022 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.net.Uri import android.os.Bundle import android.text.Editable import android.text.TextWatcher @@ -35,12 +33,12 @@ 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" @@ -50,6 +48,7 @@ class OpenDialog : DialogFragment() { 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. @@ -65,23 +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. - 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) @@ -96,7 +105,7 @@ class OpenDialog : DialogFragment() { 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) @@ -110,7 +119,7 @@ class OpenDialog : DialogFragment() { alertDialog.show() // Get handles for the layout items. - val fileNameEditText = alertDialog.findViewById(R.id.file_name_edittext)!! + fileNameEditText = alertDialog.findViewById(R.id.file_name_edittext)!! val browseButton = alertDialog.findViewById