From 72aaf3c722da62559349773d4a45a2898a1d5f8a Mon Sep 17 00:00:00 2001 From: Pierre Nicolas <pierre.nicolas@savoirfairelinux.com> Date: Fri, 14 Jul 2023 09:45:31 -0400 Subject: [PATCH] account export: tv: fix account export crash Use AlertDialog instead of MaterialAlertDialogBuilder. The latter needs Theme.AppCompat which is not compatible with Leanback. GitLab: #1324 Change-Id: If71d4dc341d4a33f14c9a6d6ba9b774012b2d095 --- .../java/cx/ring/tv/account/TVAccountExport.kt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/jami-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.kt b/jami-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.kt index 00ef059ce..c179338b8 100644 --- a/jami-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.kt +++ b/jami-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.kt @@ -30,7 +30,6 @@ import android.text.style.StyleSpan import android.view.View import androidx.leanback.widget.GuidanceStylist.Guidance import androidx.leanback.widget.GuidedAction -import com.google.android.material.dialog.MaterialAlertDialogBuilder import cx.ring.R import cx.ring.databinding.ItemProgressDialogBinding import cx.ring.utils.AndroidFileUtils.getMimeType @@ -43,7 +42,7 @@ import java.io.File @AndroidEntryPoint class TVAccountExport : JamiGuidedStepFragment<JamiAccountSummaryPresenter, JamiAccountSummaryView>(), JamiAccountSummaryView { - private var mWaitDialog: androidx.appcompat.app.AlertDialog? = null + private var mWaitDialog: AlertDialog? = null private lateinit var mIdAccount: String private var mHasPassword = false @@ -83,12 +82,12 @@ class TVAccountExport : JamiGuidedStepFragment<JamiAccountSummaryPresenter, Jami } override fun showExportingProgressDialog() { - mWaitDialog = MaterialAlertDialogBuilder(requireContext()) - .setView(ItemProgressDialogBinding.inflate(layoutInflater).root) - .setTitle(R.string.export_account_wait_title) - .setMessage(R.string.export_account_wait_message) - .setCancelable(false) - .show() + mWaitDialog = AlertDialog.Builder(requireActivity()) + .setView(ItemProgressDialogBinding.inflate(layoutInflater).root) + .setTitle(R.string.export_account_wait_title) + .setMessage(R.string.export_account_wait_message) + .setCancelable(false) + .show() } override fun showPasswordProgressDialog() {} -- GitLab