From c4daafea6dc053dcfe4b9beeddd41200445ac9c5 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Mon, 26 Jun 2023 20:20:15 +0200 Subject: [PATCH] fix: rollback AlertDialog --- .../com/kunzisoft/keepass/activities/EntryEditActivity.kt | 6 +++--- .../activities/dialogs/ColorPickerDialogFragment.kt | 4 ++-- .../activities/dialogs/DatabaseChangedDialogFragment.kt | 4 ++-- .../activities/dialogs/DeleteNodesDialogFragment.kt | 4 ++-- .../keepass/activities/dialogs/DuplicateUuidDialog.kt | 4 ++-- .../activities/dialogs/EntryCustomFieldDialogFragment.kt | 3 +-- .../activities/dialogs/FileManagerDialogFragment.kt | 4 ++-- .../keepass/activities/dialogs/FileTooBigDialogFragment.kt | 4 ++-- .../keepass/activities/dialogs/GroupDialogFragment.kt | 4 ++-- .../keepass/activities/dialogs/GroupEditDialogFragment.kt | 3 +-- .../keepass/activities/dialogs/IconEditDialogFragment.kt | 4 ++-- .../activities/dialogs/MainCredentialDialogFragment.kt | 4 ++-- .../activities/dialogs/PasswordEncodingDialogFragment.kt | 4 ++-- .../keepass/activities/dialogs/ProFeatureDialogFragment.kt | 4 ++-- .../activities/dialogs/ReplaceAttachmentDialogFragment.kt | 4 ++-- .../activities/dialogs/SetMainCredentialDialogFragment.kt | 7 +++---- .../keepass/activities/dialogs/SetOTPDialogFragment.kt | 5 ++--- .../keepass/activities/dialogs/SortDialogFragment.kt | 4 ++-- .../activities/dialogs/UnavailableFeatureDialogFragment.kt | 4 ++-- .../dialogs/UnderDevelopmentFeatureDialogFragment.kt | 3 +-- .../keepass/activities/fragments/EntryFragment.kt | 3 +-- .../keepass/activities/legacy/DatabaseLockActivity.kt | 4 ++-- .../com/kunzisoft/keepass/database/DatabaseTaskProvider.kt | 6 +++--- .../com/kunzisoft/keepass/hardware/HardwareKeyActivity.kt | 4 ++-- .../keepass/hardware/HardwareKeyResponseHelper.kt | 4 ++-- .../keepass/settings/NestedAppSettingsFragment.kt | 5 ++--- .../DatabaseColorPreferenceDialogFragmentCompat.kt | 4 ++-- .../kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt | 4 ++-- .../java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt | 4 ++-- 29 files changed, 57 insertions(+), 64 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt index 65447a1b0..599871c6e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt @@ -41,13 +41,13 @@ import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import androidx.annotation.RequiresApi +import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.view.isVisible import androidx.core.widget.NestedScrollView import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar import com.kunzisoft.keepass.R 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.AttachmentFileBinderManager import com.kunzisoft.keepass.timeout.TimeoutHelper -import com.kunzisoft.keepass.utils.getParcelableExtraCompat import com.kunzisoft.keepass.utils.UriUtil.getDocumentFile +import com.kunzisoft.keepass.utils.getParcelableExtraCompat import com.kunzisoft.keepass.view.ToolbarAction import com.kunzisoft.keepass.view.asError import com.kunzisoft.keepass.view.hideByFading @@ -711,7 +711,7 @@ class EntryEditActivity : DatabaseLockActivity(), private fun onApprovedBackPressed(approved: () -> Unit) { if (!backPressedAlreadyApproved) { - MaterialAlertDialogBuilder(this) + AlertDialog.Builder(this) .setMessage(R.string.discard_changes) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(R.string.discard) { _, _ -> diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ColorPickerDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ColorPickerDialogFragment.kt index 29c4ad7d7..2b9e017d3 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ColorPickerDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ColorPickerDialogFragment.kt @@ -5,8 +5,8 @@ import android.graphics.Color import android.os.Bundle import android.widget.CompoundButton import androidx.annotation.ColorInt +import androidx.appcompat.app.AlertDialog import androidx.fragment.app.activityViewModels -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.androidclearchroma.view.ChromaColorView import com.kunzisoft.keepass.R import com.kunzisoft.keepass.viewmodels.ColorPickerViewModel @@ -53,7 +53,7 @@ class ColorPickerDialogFragment : DatabaseDialogFragment() { enableSwitchView.isChecked = true } - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) builder.setView(root) .setPositiveButton(android.R.string.ok) { _, _ -> val color: Int? = if (enableSwitchView.isChecked) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt index 19256a5cf..e646f7bd5 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseChangedDialogFragment.kt @@ -22,7 +22,7 @@ package com.kunzisoft.keepass.activities.dialogs import android.app.Dialog import android.os.Bundle 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.model.SnapFileDatabaseInfo import com.kunzisoft.keepass.utils.getParcelableCompat @@ -46,7 +46,7 @@ class DatabaseChangedDialogFragment : DatabaseDialogFragment() { if (oldSnapFileDatabaseInfo != null && newSnapFileDatabaseInfo != null) { // Use the Builder class for convenient dialog construction - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) val stringBuilder = SpannableStringBuilder() if (newSnapFileDatabaseInfo.exists) { diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DeleteNodesDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DeleteNodesDialogFragment.kt index d64b7cc4a..2c03c412a 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DeleteNodesDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DeleteNodesDialogFragment.kt @@ -21,8 +21,8 @@ package com.kunzisoft.keepass.activities.dialogs import android.app.Dialog import android.os.Bundle +import androidx.appcompat.app.AlertDialog import androidx.fragment.app.activityViewModels -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.R import com.kunzisoft.keepass.database.element.node.Node import com.kunzisoft.keepass.viewmodels.NodesViewModel @@ -44,7 +44,7 @@ class DeleteNodesDialogFragment : DatabaseDialogFragment() { } activity?.let { activity -> // Use the Builder class for convenient dialog construction - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) builder.setMessage(if (recycleBin) getString(R.string.warning_empty_recycle_bin) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DuplicateUuidDialog.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DuplicateUuidDialog.kt index adc18446e..d83b9155d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DuplicateUuidDialog.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DuplicateUuidDialog.kt @@ -21,8 +21,8 @@ package com.kunzisoft.keepass.activities.dialogs import android.app.Dialog import android.os.Bundle +import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.R class DuplicateUuidDialog : DialogFragment() { @@ -32,7 +32,7 @@ class DuplicateUuidDialog : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { activity?.let { activity -> // 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) + "\n\n" + getString(R.string.contains_duplicate_uuid_procedure) setMessage(message) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt index 4163dcd39..c005fc62c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/EntryCustomFieldDialogFragment.kt @@ -31,7 +31,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.annotation.StringRes import androidx.appcompat.app.AlertDialog -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputLayout import com.kunzisoft.keepass.R import com.kunzisoft.keepass.database.element.Field @@ -88,7 +87,7 @@ class EntryCustomFieldDialogFragment: DatabaseDialogFragment() { customFieldDeleteButton?.visibility = View.GONE } - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) builder.setView(root) .setPositiveButton(android.R.string.ok, null) .setNegativeButton(android.R.string.cancel) { _, _ -> } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileManagerDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileManagerDialogFragment.kt index 7664d1100..3b6d5bf7c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileManagerDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileManagerDialogFragment.kt @@ -23,8 +23,8 @@ import android.app.Dialog import android.os.Bundle import android.widget.Button import android.widget.TextView +import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.R import com.kunzisoft.keepass.utils.UriUtil.openUrl @@ -32,7 +32,7 @@ class FileManagerDialogFragment : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { activity?.let { activity -> - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) // Get the layout inflater val root = activity.layoutInflater.inflate(R.layout.fragment_browser_install, null) builder.setView(root) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt index 24de3eeb1..662f2fda2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/FileTooBigDialogFragment.kt @@ -24,8 +24,8 @@ import android.content.Context import android.net.Uri import android.os.Bundle import android.text.SpannableStringBuilder +import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.R import com.kunzisoft.keepass.utils.getParcelableCompat @@ -55,7 +55,7 @@ class FileTooBigDialogFragment : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { activity?.let { activity -> // Use the Builder class for convenient dialog construction - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) builder.setMessage(SpannableStringBuilder().apply { append(getString(R.string.warning_file_too_big)) append("\n\n") diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt index bede4eeda..2403eebbf 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt @@ -26,9 +26,9 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView +import androidx.appcompat.app.AlertDialog import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.R import com.kunzisoft.keepass.adapters.TagsAdapter 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) .setPositiveButton(android.R.string.ok){ _, _ -> // Do nothing diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt index 90c8b0fc2..9ffc40d3d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt @@ -29,7 +29,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.fragment.app.activityViewModels -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputLayout import com.kunzisoft.keepass.R import com.kunzisoft.keepass.activities.dialogs.GroupEditDialogFragment.EditGroupDialogAction.CREATION @@ -197,7 +196,7 @@ class GroupEditDialogFragment : DatabaseDialogFragment() { mGroupEditViewModel.requestDateTimeSelection(dateInstant) } - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) builder.setView(root) .setPositiveButton(android.R.string.ok, null) .setNegativeButton(android.R.string.cancel) { _, _ -> diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconEditDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconEditDialogFragment.kt index d0537ee99..84b881eac 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconEditDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconEditDialogFragment.kt @@ -23,8 +23,8 @@ import android.app.Dialog import android.os.Bundle import android.widget.ImageView import android.widget.TextView +import androidx.appcompat.app.AlertDialog import androidx.fragment.app.activityViewModels -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputLayout import com.kunzisoft.keepass.R 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) .setPositiveButton(android.R.string.ok) { _, _ -> retrieveIconInfoFromViews() diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/MainCredentialDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/MainCredentialDialogFragment.kt index 420dfee05..e00d39563 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/MainCredentialDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/MainCredentialDialogFragment.kt @@ -24,7 +24,7 @@ import android.content.Context import android.net.Uri import android.os.Bundle 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.activities.helpers.ExternalFileHelper import com.kunzisoft.keepass.database.MainCredential @@ -69,7 +69,7 @@ class MainCredentialDialogFragment : DatabaseDialogFragment() { 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) mainCredentialView = root.findViewById(R.id.main_credential_view) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt index 0fe9bdfa0..03a311842 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt @@ -23,8 +23,8 @@ import android.app.Dialog import android.content.Context import android.net.Uri import android.os.Bundle +import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.R import com.kunzisoft.keepass.database.MainCredential import com.kunzisoft.keepass.utils.getParcelableCompat @@ -54,7 +54,7 @@ class PasswordEncodingDialogFragment : DialogFragment() { val mainCredential: MainCredential = savedInstanceState?.getParcelableCompat(MAIN_CREDENTIAL) ?: MainCredential() 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.setPositiveButton(android.R.string.ok) { _, _ -> mListener?.onPasswordEncodingValidateListener( diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ProFeatureDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ProFeatureDialogFragment.kt index 6d7dcf883..d500ae671 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ProFeatureDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ProFeatureDialogFragment.kt @@ -22,10 +22,10 @@ package com.kunzisoft.keepass.activities.dialogs import android.app.Dialog import android.os.Bundle import android.text.SpannableStringBuilder +import androidx.appcompat.app.AlertDialog import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY import androidx.fragment.app.DialogFragment -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.BuildConfig import com.kunzisoft.keepass.R import com.kunzisoft.keepass.utils.UriUtil.openUrl @@ -38,7 +38,7 @@ class ProFeatureDialogFragment : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { activity?.let { activity -> // Use the Builder class for convenient dialog construction - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) val stringBuilder = SpannableStringBuilder() if (BuildConfig.CLOSED_STORE) { diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt index 556a24152..90998b42c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ReplaceAttachmentDialogFragment.kt @@ -24,7 +24,7 @@ import android.content.Context import android.net.Uri import android.os.Bundle 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.database.element.Attachment import com.kunzisoft.keepass.utils.getParcelableCompat @@ -55,7 +55,7 @@ class ReplaceFileDialogFragment : DatabaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { activity?.let { activity -> // Use the Builder class for convenient dialog construction - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) builder.setMessage(SpannableStringBuilder().apply { append(getString(R.string.warning_replace_file)) append("\n\n") diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetMainCredentialDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetMainCredentialDialogFragment.kt index 159c9b4a1..9a28fd940 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetMainCredentialDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetMainCredentialDialogFragment.kt @@ -31,7 +31,6 @@ import android.view.View import android.widget.CompoundButton import android.widget.TextView import androidx.appcompat.app.AlertDialog -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputLayout import com.kunzisoft.keepass.R import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper @@ -314,7 +313,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() { private fun showEmptyPasswordConfirmationDialog() { activity?.let { - val builder = MaterialAlertDialogBuilder(it) + val builder = AlertDialog.Builder(it) builder.setMessage(R.string.warning_empty_password) .setPositiveButton(android.R.string.ok) { _, _ -> mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential()) @@ -328,7 +327,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() { private fun showNoKeyConfirmationDialog() { activity?.let { - val builder = MaterialAlertDialogBuilder(it) + val builder = AlertDialog.Builder(it) builder.setMessage(R.string.warning_no_encryption_key) .setPositiveButton(android.R.string.ok) { _, _ -> mListener?.onAssignKeyDialogPositiveClick(retrieveMainCredential()) @@ -342,7 +341,7 @@ class SetMainCredentialDialogFragment : DatabaseDialogFragment() { private fun showEmptyKeyFileConfirmationDialog() { activity?.let { - val builder = MaterialAlertDialogBuilder(it) + val builder = AlertDialog.Builder(it) builder.setMessage(SpannableStringBuilder().apply { append(getString(R.string.warning_empty_keyfile)) append("\n\n") diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt index 0a07caa1c..167386b81 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SetOTPDialogFragment.kt @@ -31,7 +31,6 @@ import android.view.ViewGroup import android.view.inputmethod.EditorInfo import android.widget.* import androidx.appcompat.app.AlertDialog -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputLayout import com.kunzisoft.keepass.R 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.OtpType 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.openUrl +import com.kunzisoft.keepass.utils.getParcelableCompat import java.util.* class SetOTPDialogFragment : DatabaseDialogFragment() { @@ -232,7 +231,7 @@ class SetOTPDialogFragment : DatabaseDialogFragment() { attachListeners() - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) builder.apply { setView(root) .setPositiveButton(android.R.string.ok) { _, _ -> diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt index da791ecc1..45cbb9db1 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt @@ -26,7 +26,7 @@ import android.view.View import android.widget.CompoundButton import android.widget.RadioGroup 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.database.element.SortNodeEnum @@ -60,7 +60,7 @@ class SortDialogFragment : DatabaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { activity?.let { activity -> - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) var recycleBinAllowed = false diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt index b0260d864..7072b58f9 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnavailableFeatureDialogFragment.kt @@ -25,9 +25,9 @@ import android.os.Bundle import android.text.SpannableStringBuilder import android.text.method.LinkMovementMethod import android.widget.TextView +import androidx.appcompat.app.AlertDialog import androidx.core.text.HtmlCompat import androidx.fragment.app.DialogFragment -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.R class UnavailableFeatureDialogFragment : DialogFragment() { @@ -43,7 +43,7 @@ class UnavailableFeatureDialogFragment : DialogFragment() { val rootView = activity.layoutInflater.inflate(R.layout.fragment_unavailable_feature, null) val messageView = rootView.findViewById(R.id.unavailable_feature_message) - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) val message = SpannableStringBuilder() message.append(getString(R.string.unavailable_feature_text)) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnderDevelopmentFeatureDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnderDevelopmentFeatureDialogFragment.kt index a6df48550..00e39cf2d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnderDevelopmentFeatureDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/UnderDevelopmentFeatureDialogFragment.kt @@ -25,7 +25,6 @@ import android.text.SpannableStringBuilder import androidx.appcompat.app.AlertDialog import androidx.core.text.HtmlCompat import androidx.fragment.app.DialogFragment -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.R import com.kunzisoft.keepass.utils.UriUtil.openUrl @@ -37,7 +36,7 @@ class UnderDevelopmentFeatureDialogFragment : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { activity?.let { activity -> // Use the Builder class for convenient dialog construction - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) val stringBuilder = SpannableStringBuilder() /* diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt index 152c3f5c4..a9352ba0d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt @@ -12,7 +12,6 @@ import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SimpleItemAnimator -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.R import com.kunzisoft.keepass.adapters.EntryAttachmentsItemsAdapter import com.kunzisoft.keepass.database.ContextualDatabase @@ -191,7 +190,7 @@ class EntryFragment: DatabaseFragment() { private fun showClipboardDialog() { context?.let { - MaterialAlertDialogBuilder(it) + AlertDialog.Builder(it) .setMessage( getString(R.string.allow_copy_password_warning) + "\n\n" + diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt index f59c80b0b..de9be999c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt @@ -30,7 +30,7 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast 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.activities.dialogs.DeleteNodesDialogFragment import com.kunzisoft.keepass.activities.dialogs.PasswordEncodingDialogFragment @@ -438,7 +438,7 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(), protected fun lockAndExit() { // Ask confirmation if modification not saved if (mDatabase?.dataModifiedSinceLastLoading == true) { - MaterialAlertDialogBuilder(this) + AlertDialog.Builder(this) .setMessage(R.string.discard_changes) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(R.string.lock) { _, _ -> diff --git a/app/src/main/java/com/kunzisoft/keepass/database/DatabaseTaskProvider.kt b/app/src/main/java/com/kunzisoft/keepass/database/DatabaseTaskProvider.kt index 61d8d4395..ad7022312 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/DatabaseTaskProvider.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/DatabaseTaskProvider.kt @@ -37,11 +37,11 @@ import android.os.IBinder import android.util.Log import android.widget.Toast import androidx.activity.result.contract.ActivityResultContracts +import androidx.appcompat.app.AlertDialog import androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale import androidx.core.content.ContextCompat import androidx.fragment.app.FragmentActivity import androidx.lifecycle.lifecycleScope -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.R import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment 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 startService(bundle, actionTask) } else { - MaterialAlertDialogBuilder(context) + AlertDialog.Builder(context) .setMessage(R.string.warning_database_notification_permission) .setNegativeButton(R.string.later) { _, _ -> // Refuses the notification, so start the service @@ -450,7 +450,7 @@ class DatabaseTaskProvider( fun askToStartDatabaseReload(conditionToAsk: Boolean, approved: () -> Unit) { if (conditionToAsk) { - MaterialAlertDialogBuilder(context) + AlertDialog.Builder(context) .setMessage(R.string.warning_database_info_reloaded) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(android.R.string.ok) { _, _ -> diff --git a/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyActivity.kt b/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyActivity.kt index 43d84ff72..77d802025 100644 --- a/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyActivity.kt @@ -10,7 +10,7 @@ import androidx.activity.result.ActivityResult import androidx.activity.result.ActivityResultCallback import androidx.activity.result.ActivityResultLauncher 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.activities.legacy.DatabaseModeActivity import com.kunzisoft.keepass.database.ContextualDatabase @@ -151,7 +151,7 @@ class HardwareKeyActivity: DatabaseModeActivity(){ hardwareKey: HardwareKey, onDialogDismissed: DialogInterface.OnDismissListener ) { - val builder = MaterialAlertDialogBuilder(context) + val builder = AlertDialog.Builder(context) builder .setMessage( context.getString(R.string.error_driver_required, hardwareKey.toString()) diff --git a/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyResponseHelper.kt b/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyResponseHelper.kt index 45f4795b1..5f00e2138 100644 --- a/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyResponseHelper.kt +++ b/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyResponseHelper.kt @@ -8,10 +8,10 @@ import androidx.activity.result.ActivityResult import androidx.activity.result.ActivityResultCallback import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts +import androidx.appcompat.app.AlertDialog import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.lifecycle.lifecycleScope -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.R import com.kunzisoft.keepass.utils.UriUtil.openExternalApp import kotlinx.coroutines.launch @@ -128,7 +128,7 @@ class HardwareKeyResponseHelper { hardwareKey: HardwareKey ) { activity.lifecycleScope.launch { - val builder = MaterialAlertDialogBuilder(activity) + val builder = AlertDialog.Builder(activity) builder .setMessage( activity.getString(R.string.error_driver_required, hardwareKey.toString()) diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt index 9d2adbe2c..ed2476e2f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt @@ -35,7 +35,6 @@ import androidx.fragment.app.FragmentActivity import androidx.preference.ListPreference import androidx.preference.Preference import androidx.preference.TwoStatePreference -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.BuildConfig import com.kunzisoft.keepass.R import com.kunzisoft.keepass.activities.dialogs.ProFeatureDialogFragment @@ -215,7 +214,7 @@ class NestedAppSettingsFragment : NestedSettingsFragment() { val message = getString(R.string.allow_copy_password_warning) + "\n\n" + getString(R.string.clipboard_warning) - MaterialAlertDialogBuilder(requireContext()) + AlertDialog.Builder(requireContext()) .setMessage(message) .create() .apply { @@ -382,7 +381,7 @@ class NestedAppSettingsFragment : NestedSettingsFragment() { if (deleteKeys) { message += resources.getString(R.string.advanced_unlock_delete_all_key_warning) } - warningAlertDialog = MaterialAlertDialogBuilder(activity) + warningAlertDialog = AlertDialog.Builder(activity) .setMessage(message) .setIcon(android.R.drawable.ic_dialog_alert) .setPositiveButton(resources.getString(android.R.string.ok) diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseColorPreferenceDialogFragmentCompat.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseColorPreferenceDialogFragmentCompat.kt index 6e1f1edea..516fff33e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseColorPreferenceDialogFragmentCompat.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseColorPreferenceDialogFragmentCompat.kt @@ -28,7 +28,7 @@ import android.view.ViewGroup import android.view.Window import android.widget.CompoundButton 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.keepass.R import com.kunzisoft.keepass.database.ContextualDatabase @@ -45,7 +45,7 @@ class DatabaseColorPreferenceDialogFragmentCompat : DatabaseSavePreferenceDialog private var mActivated = false 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) enableSwitchView = rootView.findViewById(R.id.switch_element) diff --git a/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt index 739b326c6..e9240b73e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt @@ -28,10 +28,10 @@ import android.widget.Button import android.widget.ProgressBar import android.widget.TextView import androidx.annotation.StringRes +import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible import androidx.fragment.app.DialogFragment import androidx.lifecycle.lifecycleScope -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.kunzisoft.keepass.R import kotlinx.coroutines.launch @@ -55,7 +55,7 @@ open class ProgressTaskDialogFragment : DialogFragment() { try { activity?.let { - val builder = MaterialAlertDialogBuilder(it) + val builder = AlertDialog.Builder(it) // Get the layout inflater val inflater = it.layoutInflater diff --git a/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt b/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt index 3912b3ca9..9fce0d822 100644 --- a/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt +++ b/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt @@ -31,7 +31,7 @@ import android.text.util.Linkify import android.util.Log import android.widget.TextView 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.settings.PreferencesUtil import java.util.Timer @@ -128,7 +128,7 @@ class ClipboardHelper(context: Context) { } Linkify.addLinks(spannableString, Linkify.WEB_URLS) - MaterialAlertDialogBuilder(mAppContext) + AlertDialog.Builder(mAppContext) .setTitle(R.string.clipboard_error_title) .setView(textView) .setPositiveButton(android.R.string.ok) { dialog, _ -> dialog.dismiss() }