rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: rollback AlertDialog

Browse Source
This commit is contained in:
J-Jamet
2023-06-26 20:20:15 +02:00
parent c8f07ffa7c
commit c4daafea6d
29 changed files with 57 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
View File

@@ -41,13 +41,13 @@ import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.core.widget.NestedScrollView import androidx.core.widget.NestedScrollView
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.dialogs.ColorPickerDialogFragment import com.kunzisoft.keepass.activities.dialogs.ColorPickerDialogFragment
@@ -90,8 +90,8 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
import com.kunzisoft.keepass.tasks.ActionRunnable import com.kunzisoft.keepass.tasks.ActionRunnable
import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager
import com.kunzisoft.keepass.timeout.TimeoutHelper import com.kunzisoft.keepass.timeout.TimeoutHelper
import com.kunzisoft.keepass.utils.getParcelableExtraCompat
import com.kunzisoft.keepass.utils.UriUtil.getDocumentFile import com.kunzisoft.keepass.utils.UriUtil.getDocumentFile
import com.kunzisoft.keepass.utils.getParcelableExtraCompat
import com.kunzisoft.keepass.view.ToolbarAction import com.kunzisoft.keepass.view.ToolbarAction
import com.kunzisoft.keepass.view.asError import com.kunzisoft.keepass.view.asError
import com.kunzisoft.keepass.view.hideByFading import com.kunzisoft.keepass.view.hideByFading
@@ -711,7 +711,7 @@ class EntryEditActivity : DatabaseLockActivity(),
private fun onApprovedBackPressed(approved: () -> Unit) { private fun onApprovedBackPressed(approved: () -> Unit) {
if (!backPressedAlreadyApproved) { if (!backPressedAlreadyApproved) {
MaterialAlertDialogBuilder(this) AlertDialog.Builder(this)
.setMessage(R.string.discard_changes) .setMessage(R.string.discard_changes)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(R.string.discard) { _, _ -> .setPositiveButton(R.string.discard) { _, _ ->

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ColorPickerDialogFragment.kt
View File

@@ -5,8 +5,8 @@ import android.graphics.Color
import android.os.Bundle import android.os.Bundle
import android.widget.CompoundButton import android.widget.CompoundButton
import androidx.annotation.ColorInt import androidx.annotation.ColorInt
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.androidclearchroma.view.ChromaColorView import com.kunzisoft.androidclearchroma.view.ChromaColorView
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.viewmodels.ColorPickerViewModel import com.kunzisoft.keepass.viewmodels.ColorPickerViewModel
@@ -53,7 +53,7 @@ class ColorPickerDialogFragment : DatabaseDialogFragment() {
enableSwitchView.isChecked = true enableSwitchView.isChecked = true
} }
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
builder.setView(root) builder.setView(root)
.setPositiveButton(android.R.string.ok) { _, _ -> .setPositiveButton(android.R.string.ok) { _, _ ->
val color: Int? = if (enableSwitchView.isChecked) val color: Int? = if (enableSwitchView.isChecked)

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt
View File

@@ -22,7 +22,7 @@ package com.kunzisoft.keepass.activities.dialogs
import android.app.Dialog import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import android.text.SpannableStringBuilder import android.text.SpannableStringBuilder
import com.google.android.material.dialog.MaterialAlertDialogBuilder import androidx.appcompat.app.AlertDialog
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.model.SnapFileDatabaseInfo import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
import com.kunzisoft.keepass.utils.getParcelableCompat import com.kunzisoft.keepass.utils.getParcelableCompat
@@ -46,7 +46,7 @@ class DatabaseChangedDialogFragment : DatabaseDialogFragment() {
if (oldSnapFileDatabaseInfo != null && newSnapFileDatabaseInfo != null) { if (oldSnapFileDatabaseInfo != null && newSnapFileDatabaseInfo != null) {
// Use the Builder class for convenient dialog construction // Use the Builder class for convenient dialog construction
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
val stringBuilder = SpannableStringBuilder() val stringBuilder = SpannableStringBuilder()
if (newSnapFileDatabaseInfo.exists) { if (newSnapFileDatabaseInfo.exists) {

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DeleteNodesDialogFragment.kt
View File

@@ -21,8 +21,8 @@ package com.kunzisoft.keepass.activities.dialogs
import android.app.Dialog import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.database.element.node.Node import com.kunzisoft.keepass.database.element.node.Node
import com.kunzisoft.keepass.viewmodels.NodesViewModel import com.kunzisoft.keepass.viewmodels.NodesViewModel
@@ -44,7 +44,7 @@ class DeleteNodesDialogFragment : DatabaseDialogFragment() {
} }
activity?.let { activity -> activity?.let { activity ->
// Use the Builder class for convenient dialog construction // Use the Builder class for convenient dialog construction
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
builder.setMessage(if (recycleBin) builder.setMessage(if (recycleBin)
getString(R.string.warning_empty_recycle_bin) getString(R.string.warning_empty_recycle_bin)

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DuplicateUuidDialog.kt
View File

@@ -21,8 +21,8 @@ package com.kunzisoft.keepass.activities.dialogs
import android.app.Dialog import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
class DuplicateUuidDialog : DialogFragment() { class DuplicateUuidDialog : DialogFragment() {
@@ -32,7 +32,7 @@ class DuplicateUuidDialog : DialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
activity?.let { activity -> activity?.let { activity ->
// Use the Builder class for convenient dialog construction // Use the Builder class for convenient dialog construction
val builder = MaterialAlertDialogBuilder(activity).apply { val builder = AlertDialog.Builder(activity).apply {
val message = getString(R.string.contains_duplicate_uuid) + val message = getString(R.string.contains_duplicate_uuid) +
"\n\n" + getString(R.string.contains_duplicate_uuid_procedure) "\n\n" + getString(R.string.contains_duplicate_uuid_procedure)
setMessage(message) setMessage(message)

3
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt
View File

@@ -31,7 +31,6 @@ import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.database.element.Field import com.kunzisoft.keepass.database.element.Field
@@ -88,7 +87,7 @@ class EntryCustomFieldDialogFragment: DatabaseDialogFragment() {
customFieldDeleteButton?.visibility = View.GONE customFieldDeleteButton?.visibility = View.GONE
} }
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
builder.setView(root) builder.setView(root)
.setPositiveButton(android.R.string.ok, null) .setPositiveButton(android.R.string.ok, null)
.setNegativeButton(android.R.string.cancel) { _, _ -> } .setNegativeButton(android.R.string.cancel) { _, _ -> }

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileManagerDialogFragment.kt
View File

@@ -23,8 +23,8 @@ import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import android.widget.Button import android.widget.Button
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.utils.UriUtil.openUrl import com.kunzisoft.keepass.utils.UriUtil.openUrl
@@ -32,7 +32,7 @@ class FileManagerDialogFragment : DialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
activity?.let { activity -> activity?.let { activity ->
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
// Get the layout inflater // Get the layout inflater
val root = activity.layoutInflater.inflate(R.layout.fragment_browser_install, null) val root = activity.layoutInflater.inflate(R.layout.fragment_browser_install, null)
builder.setView(root) builder.setView(root)

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt
View File

@@ -24,8 +24,8 @@ import android.content.Context
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.text.SpannableStringBuilder import android.text.SpannableStringBuilder
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.utils.getParcelableCompat import com.kunzisoft.keepass.utils.getParcelableCompat
@@ -55,7 +55,7 @@ class FileTooBigDialogFragment : DialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
activity?.let { activity -> activity?.let { activity ->
// Use the Builder class for convenient dialog construction // Use the Builder class for convenient dialog construction
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
builder.setMessage(SpannableStringBuilder().apply { builder.setMessage(SpannableStringBuilder().apply {
append(getString(R.string.warning_file_too_big)) append(getString(R.string.warning_file_too_big))
append("\n\n") append("\n\n")

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
View File

@@ -26,9 +26,9 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.adapters.TagsAdapter import com.kunzisoft.keepass.adapters.TagsAdapter
import com.kunzisoft.keepass.database.ContextualDatabase import com.kunzisoft.keepass.database.ContextualDatabase
@@ -165,7 +165,7 @@ class GroupDialogFragment : DatabaseDialogFragment() {
} }
} }
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
builder.setView(root) builder.setView(root)
.setPositiveButton(android.R.string.ok){ _, _ -> .setPositiveButton(android.R.string.ok){ _, _ ->
// Do nothing // Do nothing

3
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt
View File

@@ -29,7 +29,6 @@ import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.CREATION import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.CREATION
@@ -197,7 +196,7 @@ class GroupEditDialogFragment : DatabaseDialogFragment() {
mGroupEditViewModel.requestDateTimeSelection(dateInstant) mGroupEditViewModel.requestDateTimeSelection(dateInstant)
} }
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
builder.setView(root) builder.setView(root)
.setPositiveButton(android.R.string.ok, null) .setPositiveButton(android.R.string.ok, null)
.setNegativeButton(android.R.string.cancel) { _, _ -> .setNegativeButton(android.R.string.cancel) { _, _ ->

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconEditDialogFragment.kt
View File

@@ -23,8 +23,8 @@ import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.database.ContextualDatabase import com.kunzisoft.keepass.database.ContextualDatabase
@@ -73,7 +73,7 @@ class IconEditDialogFragment : DatabaseDialogFragment() {
} }
} }
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
builder.setView(root) builder.setView(root)
.setPositiveButton(android.R.string.ok) { _, _ -> .setPositiveButton(android.R.string.ok) { _, _ ->
retrieveIconInfoFromViews() retrieveIconInfoFromViews()

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/MainCredentialDialogFragment.kt
View File

@@ -24,7 +24,7 @@ import android.content.Context
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.widget.TextView import android.widget.TextView
import com.google.android.material.dialog.MaterialAlertDialogBuilder import androidx.appcompat.app.AlertDialog
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
import com.kunzisoft.keepass.database.MainCredential import com.kunzisoft.keepass.database.MainCredential
@@ -69,7 +69,7 @@ class MainCredentialDialogFragment : DatabaseDialogFragment() {
databaseUri = getParcelableCompat(KEY_ASK_CREDENTIAL_URI) databaseUri = getParcelableCompat(KEY_ASK_CREDENTIAL_URI)
} }
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
val root = activity.layoutInflater.inflate(R.layout.fragment_main_credential, null) val root = activity.layoutInflater.inflate(R.layout.fragment_main_credential, null)
mainCredentialView = root.findViewById(R.id.main_credential_view) mainCredentialView = root.findViewById(R.id.main_credential_view)

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt
View File

@@ -23,8 +23,8 @@ import android.app.Dialog
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.database.MainCredential import com.kunzisoft.keepass.database.MainCredential
import com.kunzisoft.keepass.utils.getParcelableCompat import com.kunzisoft.keepass.utils.getParcelableCompat
@@ -54,7 +54,7 @@ class PasswordEncodingDialogFragment : DialogFragment() {
val mainCredential: MainCredential = savedInstanceState?.getParcelableCompat(MAIN_CREDENTIAL) ?: MainCredential() val mainCredential: MainCredential = savedInstanceState?.getParcelableCompat(MAIN_CREDENTIAL) ?: MainCredential()
activity?.let { activity -> activity?.let { activity ->
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
builder.setMessage(activity.getString(R.string.warning_password_encoding)).setTitle(R.string.warning) builder.setMessage(activity.getString(R.string.warning_password_encoding)).setTitle(R.string.warning)
builder.setPositiveButton(android.R.string.ok) { _, _ -> builder.setPositiveButton(android.R.string.ok) { _, _ ->
mListener?.onPasswordEncodingValidateListener( mListener?.onPasswordEncodingValidateListener(

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ProFeatureDialogFragment.kt
View File

@@ -22,10 +22,10 @@ package com.kunzisoft.keepass.activities.dialogs
import android.app.Dialog import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import android.text.SpannableStringBuilder import android.text.SpannableStringBuilder
import androidx.appcompat.app.AlertDialog
import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat
import androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY import androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.BuildConfig import com.kunzisoft.keepass.BuildConfig
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.utils.UriUtil.openUrl import com.kunzisoft.keepass.utils.UriUtil.openUrl
@@ -38,7 +38,7 @@ class ProFeatureDialogFragment : DialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
activity?.let { activity -> activity?.let { activity ->
// Use the Builder class for convenient dialog construction // Use the Builder class for convenient dialog construction
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
val stringBuilder = SpannableStringBuilder() val stringBuilder = SpannableStringBuilder()
if (BuildConfig.CLOSED_STORE) { if (BuildConfig.CLOSED_STORE) {

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt
View File

@@ -24,7 +24,7 @@ import android.content.Context
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.text.SpannableStringBuilder import android.text.SpannableStringBuilder
import com.google.android.material.dialog.MaterialAlertDialogBuilder import androidx.appcompat.app.AlertDialog
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.database.element.Attachment import com.kunzisoft.keepass.database.element.Attachment
import com.kunzisoft.keepass.utils.getParcelableCompat import com.kunzisoft.keepass.utils.getParcelableCompat
@@ -55,7 +55,7 @@ class ReplaceFileDialogFragment : DatabaseDialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
activity?.let { activity -> activity?.let { activity ->
// Use the Builder class for convenient dialog construction // Use the Builder class for convenient dialog construction
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
builder.setMessage(SpannableStringBuilder().apply { builder.setMessage(SpannableStringBuilder().apply {
append(getString(R.string.warning_replace_file)) append(getString(R.string.warning_replace_file))
append("\n\n") append("\n\n")

7
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetMainCredentialDialogFragment.kt
View File

@@ -31,7 +31,6 @@ import android.view.View
import android.widget.CompoundButton import android.widget.CompoundButton
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper
@@ -314,7 +313,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
private fun showEmptyPasswordConfirmationDialog() { private fun showEmptyPasswordConfirmationDialog() {
activity?.let { activity?.let {
val builder = MaterialAlertDialogBuilder(it) val builder = AlertDialog.Builder(it)
builder.setMessage(R.string.warning_empty_password) builder.setMessage(R.string.warning_empty_password)
.setPositiveButton(android.R.string.ok) { _, _ -> .setPositiveButton(android.R.string.ok) { _, _ ->
mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential()) mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
@@ -328,7 +327,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
private fun showNoKeyConfirmationDialog() { private fun showNoKeyConfirmationDialog() {
activity?.let { activity?.let {
val builder = MaterialAlertDialogBuilder(it) val builder = AlertDialog.Builder(it)
builder.setMessage(R.string.warning_no_encryption_key) builder.setMessage(R.string.warning_no_encryption_key)
.setPositiveButton(android.R.string.ok) { _, _ -> .setPositiveButton(android.R.string.ok) { _, _ ->
mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential()) mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential())
@@ -342,7 +341,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() {
private fun showEmptyKeyFileConfirmationDialog() { private fun showEmptyKeyFileConfirmationDialog() {
activity?.let { activity?.let {
val builder = MaterialAlertDialogBuilder(it) val builder = AlertDialog.Builder(it)
builder.setMessage(SpannableStringBuilder().apply { builder.setMessage(SpannableStringBuilder().apply {
append(getString(R.string.warning_empty_keyfile)) append(getString(R.string.warning_empty_keyfile))
append("\n\n") append("\n\n")

5
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt
View File

@@ -31,7 +31,6 @@ import android.view.ViewGroup
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import android.widget.* import android.widget.*
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.model.OtpModel import com.kunzisoft.keepass.model.OtpModel
@@ -45,9 +44,9 @@ import com.kunzisoft.keepass.otp.OtpElement.Companion.MIN_TOTP_PERIOD
import com.kunzisoft.keepass.otp.OtpTokenType import com.kunzisoft.keepass.otp.OtpTokenType
import com.kunzisoft.keepass.otp.OtpType import com.kunzisoft.keepass.otp.OtpType
import com.kunzisoft.keepass.otp.TokenCalculator import com.kunzisoft.keepass.otp.TokenCalculator
import com.kunzisoft.keepass.utils.getParcelableCompat
import com.kunzisoft.keepass.utils.UriUtil.isContributingUser import com.kunzisoft.keepass.utils.UriUtil.isContributingUser
import com.kunzisoft.keepass.utils.UriUtil.openUrl import com.kunzisoft.keepass.utils.UriUtil.openUrl
import com.kunzisoft.keepass.utils.getParcelableCompat
import java.util.* import java.util.*
class SetOTPDialogFragment : DatabaseDialogFragment() { class SetOTPDialogFragment : DatabaseDialogFragment() {
@@ -232,7 +231,7 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
attachListeners() attachListeners()
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
builder.apply { builder.apply {
setView(root) setView(root)
.setPositiveButton(android.R.string.ok) { _, _ -> .setPositiveButton(android.R.string.ok) { _, _ ->

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt
View File

@@ -26,7 +26,7 @@ import android.view.View
import android.widget.CompoundButton import android.widget.CompoundButton
import android.widget.RadioGroup import android.widget.RadioGroup
import androidx.annotation.IdRes import androidx.annotation.IdRes
import com.google.android.material.dialog.MaterialAlertDialogBuilder import androidx.appcompat.app.AlertDialog
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.database.element.SortNodeEnum import com.kunzisoft.keepass.database.element.SortNodeEnum
@@ -60,7 +60,7 @@ class SortDialogFragment : DatabaseDialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
activity?.let { activity -> activity?.let { activity ->
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
var recycleBinAllowed = false var recycleBinAllowed = false

4
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt
View File

@@ -25,9 +25,9 @@ import android.os.Bundle
import android.text.SpannableStringBuilder import android.text.SpannableStringBuilder
import android.text.method.LinkMovementMethod import android.text.method.LinkMovementMethod
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
class UnavailableFeatureDialogFragment : DialogFragment() { class UnavailableFeatureDialogFragment : DialogFragment() {
@@ -43,7 +43,7 @@ class UnavailableFeatureDialogFragment : DialogFragment() {
val rootView = activity.layoutInflater.inflate(R.layout.fragment_unavailable_feature, null) val rootView = activity.layoutInflater.inflate(R.layout.fragment_unavailable_feature, null)
val messageView = rootView.findViewById<TextView>(R.id.unavailable_feature_message) val messageView = rootView.findViewById<TextView>(R.id.unavailable_feature_message)
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
val message = SpannableStringBuilder() val message = SpannableStringBuilder()
message.append(getString(R.string.unavailable_feature_text)) message.append(getString(R.string.unavailable_feature_text))

3
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnderDevelopmentFeatureDialogFragment.kt
View File

@@ -25,7 +25,6 @@ import android.text.SpannableStringBuilder
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.utils.UriUtil.openUrl import com.kunzisoft.keepass.utils.UriUtil.openUrl
@@ -37,7 +36,7 @@ class UnderDevelopmentFeatureDialogFragment : DialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
activity?.let { activity -> activity?.let { activity ->
// Use the Builder class for convenient dialog construction // Use the Builder class for convenient dialog construction
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
val stringBuilder = SpannableStringBuilder() val stringBuilder = SpannableStringBuilder()
/* /*

3
app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt
View File

@@ -12,7 +12,6 @@ import androidx.fragment.app.activityViewModels
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.SimpleItemAnimator import androidx.recyclerview.widget.SimpleItemAnimator
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.adapters.EntryAttachmentsItemsAdapter import com.kunzisoft.keepass.adapters.EntryAttachmentsItemsAdapter
import com.kunzisoft.keepass.database.ContextualDatabase import com.kunzisoft.keepass.database.ContextualDatabase
@@ -191,7 +190,7 @@ class EntryFragment: DatabaseFragment() {
private fun showClipboardDialog() { private fun showClipboardDialog() {
context?.let { context?.let {
MaterialAlertDialogBuilder(it) AlertDialog.Builder(it)
.setMessage( .setMessage(
getString(R.string.allow_copy_password_warning) + getString(R.string.allow_copy_password_warning) +
"\n\n" + "\n\n" +

4
app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt
View File

@@ -30,7 +30,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.Toast import android.widget.Toast
import androidx.activity.viewModels import androidx.activity.viewModels
import com.google.android.material.dialog.MaterialAlertDialogBuilder import androidx.appcompat.app.AlertDialog
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.dialogs.DeleteNodesDialogFragment import com.kunzisoft.keepass.activities.dialogs.DeleteNodesDialogFragment
import com.kunzisoft.keepass.activities.dialogs.PasswordEncodingDialogFragment import com.kunzisoft.keepass.activities.dialogs.PasswordEncodingDialogFragment
@@ -438,7 +438,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
protected fun lockAndExit() { protected fun lockAndExit() {
// Ask confirmation if modification not saved // Ask confirmation if modification not saved
if (mDatabase?.dataModifiedSinceLastLoading == true) { if (mDatabase?.dataModifiedSinceLastLoading == true) {
MaterialAlertDialogBuilder(this) AlertDialog.Builder(this)
.setMessage(R.string.discard_changes) .setMessage(R.string.discard_changes)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(R.string.lock) { _, _ -> .setPositiveButton(R.string.lock) { _, _ ->

6
app/src/main/java/com/kunzisoft/keepass/database/DatabaseTaskProvider.kt
View File

@@ -37,11 +37,11 @@ import android.os.IBinder
import android.util.Log import android.util.Log
import android.widget.Toast import android.widget.Toast
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AlertDialog
import androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale import androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment
import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment.Companion.DATABASE_CHANGED_DIALOG_TAG import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment.Companion.DATABASE_CHANGED_DIALOG_TAG
@@ -370,7 +370,7 @@ class DatabaseTaskProvider(
// it's not the first time, so the user deliberately chooses not to display the notification // it's not the first time, so the user deliberately chooses not to display the notification
startService(bundle, actionTask) startService(bundle, actionTask)
} else { } else {
MaterialAlertDialogBuilder(context) AlertDialog.Builder(context)
.setMessage(R.string.warning_database_notification_permission) .setMessage(R.string.warning_database_notification_permission)
.setNegativeButton(R.string.later) { _, _ -> .setNegativeButton(R.string.later) { _, _ ->
// Refuses the notification, so start the service // Refuses the notification, so start the service
@@ -450,7 +450,7 @@ class DatabaseTaskProvider(
fun askToStartDatabaseReload(conditionToAsk: Boolean, approved: () -> Unit) { fun askToStartDatabaseReload(conditionToAsk: Boolean, approved: () -> Unit) {
if (conditionToAsk) { if (conditionToAsk) {
MaterialAlertDialogBuilder(context) AlertDialog.Builder(context)
.setMessage(R.string.warning_database_info_reloaded) .setMessage(R.string.warning_database_info_reloaded)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok) { _, _ -> .setPositiveButton(android.R.string.ok) { _, _ ->

4
app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyActivity.kt
View File

@@ -10,7 +10,7 @@ import androidx.activity.result.ActivityResult
import androidx.activity.result.ActivityResultCallback import androidx.activity.result.ActivityResultCallback
import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import com.google.android.material.dialog.MaterialAlertDialogBuilder import androidx.appcompat.app.AlertDialog
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
import com.kunzisoft.keepass.database.ContextualDatabase import com.kunzisoft.keepass.database.ContextualDatabase
@@ -151,7 +151,7 @@ class HardwareKeyActivity: DatabaseModeActivity(){
hardwareKey: HardwareKey, hardwareKey: HardwareKey,
onDialogDismissed: DialogInterface.OnDismissListener onDialogDismissed: DialogInterface.OnDismissListener
) { ) {
val builder = MaterialAlertDialogBuilder(context) val builder = AlertDialog.Builder(context)
builder builder
.setMessage( .setMessage(
context.getString(R.string.error_driver_required, hardwareKey.toString()) context.getString(R.string.error_driver_required, hardwareKey.toString())

4
app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyResponseHelper.kt
View File

@@ -8,10 +8,10 @@ import androidx.activity.result.ActivityResult
import androidx.activity.result.ActivityResultCallback import androidx.activity.result.ActivityResultCallback
import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.utils.UriUtil.openExternalApp import com.kunzisoft.keepass.utils.UriUtil.openExternalApp
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@@ -128,7 +128,7 @@ class HardwareKeyResponseHelper {
hardwareKey: HardwareKey hardwareKey: HardwareKey
) { ) {
activity.lifecycleScope.launch { activity.lifecycleScope.launch {
val builder = MaterialAlertDialogBuilder(activity) val builder = AlertDialog.Builder(activity)
builder builder
.setMessage( .setMessage(
activity.getString(R.string.error_driver_required, hardwareKey.toString()) activity.getString(R.string.error_driver_required, hardwareKey.toString())

5
app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt
View File

@@ -35,7 +35,6 @@ import androidx.fragment.app.FragmentActivity
import androidx.preference.ListPreference import androidx.preference.ListPreference
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.TwoStatePreference import androidx.preference.TwoStatePreference
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.BuildConfig import com.kunzisoft.keepass.BuildConfig
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.dialogs.ProFeatureDialogFragment import com.kunzisoft.keepass.activities.dialogs.ProFeatureDialogFragment
@@ -215,7 +214,7 @@ class NestedAppSettingsFragment : NestedSettingsFragment() {
val message = getString(R.string.allow_copy_password_warning) + val message = getString(R.string.allow_copy_password_warning) +
"\n\n" + "\n\n" +
getString(R.string.clipboard_warning) getString(R.string.clipboard_warning)
MaterialAlertDialogBuilder(requireContext()) AlertDialog.Builder(requireContext())
.setMessage(message) .setMessage(message)
.create() .create()
.apply { .apply {
@@ -382,7 +381,7 @@ class NestedAppSettingsFragment : NestedSettingsFragment() {
if (deleteKeys) { if (deleteKeys) {
message += resources.getString(R.string.advanced_unlock_delete_all_key_warning) message += resources.getString(R.string.advanced_unlock_delete_all_key_warning)
} }
warningAlertDialog = MaterialAlertDialogBuilder(activity) warningAlertDialog = AlertDialog.Builder(activity)
.setMessage(message) .setMessage(message)
.setIcon(android.R.drawable.ic_dialog_alert) .setIcon(android.R.drawable.ic_dialog_alert)
.setPositiveButton(resources.getString(android.R.string.ok) .setPositiveButton(resources.getString(android.R.string.ok)

4
app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseColorPreferenceDialogFragmentCompat.kt
View File

@@ -28,7 +28,7 @@ import android.view.ViewGroup
import android.view.Window import android.view.Window
import android.widget.CompoundButton import android.widget.CompoundButton
import androidx.annotation.ColorInt import androidx.annotation.ColorInt
import com.google.android.material.dialog.MaterialAlertDialogBuilder import androidx.appcompat.app.AlertDialog
import com.kunzisoft.androidclearchroma.view.ChromaColorView import com.kunzisoft.androidclearchroma.view.ChromaColorView
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.database.ContextualDatabase import com.kunzisoft.keepass.database.ContextualDatabase
@@ -45,7 +45,7 @@ class DatabaseColorPreferenceDialogFragmentCompat : DatabaseSavePreferenceDialog
private var mActivated = false private var mActivated = false
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val alertDialogBuilder = MaterialAlertDialogBuilder(requireActivity()) val alertDialogBuilder = AlertDialog.Builder(requireActivity())
rootView = requireActivity().layoutInflater.inflate(R.layout.fragment_color_picker, null) rootView = requireActivity().layoutInflater.inflate(R.layout.fragment_color_picker, null)
enableSwitchView = rootView.findViewById(R.id.switch_element) enableSwitchView = rootView.findViewById(R.id.switch_element)

4
app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt
View File

@@ -28,10 +28,10 @@ import android.widget.Button
import android.widget.ProgressBar import android.widget.ProgressBar
import android.widget.TextView import android.widget.TextView
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.appcompat.app.AlertDialog
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@@ -55,7 +55,7 @@ open class ProgressTaskDialogFragment : DialogFragment() {
try { try {
activity?.let { activity?.let {
val builder = MaterialAlertDialogBuilder(it) val builder = AlertDialog.Builder(it)
// Get the layout inflater // Get the layout inflater
val inflater = it.layoutInflater val inflater = it.layoutInflater

4
app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt
View File

@@ -31,7 +31,7 @@ import android.text.util.Linkify
import android.util.Log import android.util.Log
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import com.google.android.material.dialog.MaterialAlertDialogBuilder import androidx.appcompat.app.AlertDialog
import com.kunzisoft.keepass.R import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.settings.PreferencesUtil
import java.util.Timer import java.util.Timer
@@ -128,7 +128,7 @@ class ClipboardHelper(context: Context) {
} }
Linkify.addLinks(spannableString, Linkify.WEB_URLS) Linkify.addLinks(spannableString, Linkify.WEB_URLS)
MaterialAlertDialogBuilder(mAppContext) AlertDialog.Builder(mAppContext)
.setTitle(R.string.clipboard_error_title) .setTitle(R.string.clipboard_error_title)
.setView(textView) .setView(textView)
.setPositiveButton(android.R.string.ok) { dialog, _ -> dialog.dismiss() } .setPositiveButton(android.R.string.ok) { dialog, _ -> dialog.dismiss() }