X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FEditBookmarkDialog.kt;h=361fdd0ed6f79d6e206866409c62646732ff3d5a;hb=5dd60cebd26469bcc597e1ccede8706fb403dfc1;hp=752f5b1c9eefa3ce538c9bf2918864f417be5473;hpb=031def95c6d9bfc14113fe86b4a5690233d93ce2;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.kt index 752f5b1c..361fdd0e 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDialog.kt @@ -1,25 +1,24 @@ /* - * Copyright © 2016-2021 Soren Stoutner . + * Copyright © 2016-2023 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 @@ -51,31 +50,7 @@ private const val DATABASE_ID = "database_id" private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" class EditBookmarkDialog : DialogFragment() { - // Declare the class variables. - private lateinit var editBookmarkListener: EditBookmarkListener - - // Declare the class views. - private lateinit var webpageFavoriteIconRadioButton: RadioButton - private lateinit var nameEditText: EditText - private lateinit var urlEditText: EditText - private lateinit var saveButton: Button - - // The public interface is used to send information back to the parent activity. - interface EditBookmarkListener { - fun onSaveBookmark(dialogFragment: DialogFragment, selectedBookmarkDatabaseId: Int, favoriteIconBitmap: Bitmap) - } - - override fun onAttach(context: Context) { - // Run the default commands. - super.onAttach(context) - - // Get a handle for the edit bookmark listener from the launching context. - editBookmarkListener = context as EditBookmarkListener - } - companion object { - // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. - @JvmStatic fun bookmarkDatabaseId(databaseId: Int, favoriteIconBitmap: Bitmap): EditBookmarkDialog { // Create a favorite icon byte array output stream. val favoriteIconByteArrayOutputStream = ByteArrayOutputStream() @@ -104,8 +79,28 @@ class EditBookmarkDialog : DialogFragment() { } } - // `@SuppressLint("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog. - @SuppressLint("InflateParams") + // Declare the class variables. + private lateinit var editBookmarkListener: EditBookmarkListener + + // Declare the class views. + private lateinit var webpageFavoriteIconRadioButton: RadioButton + private lateinit var nameEditText: EditText + private lateinit var urlEditText: EditText + private lateinit var saveButton: Button + + // The public interface is used to send information back to the parent activity. + interface EditBookmarkListener { + fun onSaveBookmark(dialogFragment: DialogFragment, selectedBookmarkDatabaseId: Int, favoriteIconBitmap: Bitmap) + } + + override fun onAttach(context: Context) { + // Run the default commands. + super.onAttach(context) + + // Get a handle for the edit bookmark listener from the launching context. + editBookmarkListener = context as EditBookmarkListener + } + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments. val arguments = requireArguments() @@ -117,8 +112,8 @@ class EditBookmarkDialog : DialogFragment() { // Convert the favorite icon byte array to a bitmap. val favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.size) - // Initialize the bookmarks database helper. The `0` specifies a database version, but that is ignored and set instead using a constant in `BookmarksDatabaseHelper`. - val bookmarksDatabaseHelper = BookmarksDatabaseHelper(context, null, null, 0) + // Initialize the bookmarks database helper. + val bookmarksDatabaseHelper = BookmarksDatabaseHelper(requireContext()) // Get a cursor with the selected bookmark. val bookmarkCursor = bookmarksDatabaseHelper.getBookmark(selectedBookmarkDatabaseId) @@ -132,8 +127,8 @@ class EditBookmarkDialog : DialogFragment() { // Set the title. dialogBuilder.setTitle(R.string.edit_bookmark) - // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(layoutInflater.inflate(R.layout.edit_bookmark_dialog, null)) + // Set the view. + dialogBuilder.setView(R.layout.edit_bookmark_dialog) // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) @@ -148,7 +143,7 @@ class EditBookmarkDialog : 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) @@ -173,7 +168,7 @@ class EditBookmarkDialog : DialogFragment() { saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) // Get the current favorite icon byte array from the cursor. - val currentIconByteArray = bookmarkCursor.getBlob(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON)) + val currentIconByteArray = bookmarkCursor.getBlob(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.FAVORITE_ICON)) // Convert the byte array to a bitmap beginning at the first byte and ending at the last. val currentIconBitmap = BitmapFactory.decodeByteArray(currentIconByteArray, 0, currentIconByteArray.size) @@ -185,8 +180,8 @@ class EditBookmarkDialog : DialogFragment() { webpageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap) // Store the current bookmark name and URL. - val currentName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) - val currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL)) + val currentName = bookmarkCursor.getString(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME)) + val currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_URL)) // Populate the edit texts. nameEditText.setText(currentName)