Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix crash when performing any action in the blacklist dialog

Browse source 
Closes #2
This commit is contained in:
Muntashir Al-Islam 2020-06-29 13:26:30 +06:00
parent 84c9614eae
commit 5e449ab7dc
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/io/github/muntashirakon/music/preferences/BlacklistPreferenceDialog.kt
View file

@ -22,6 +22,7 @@ import androidx.core.graphics.BlendModeColorFilterCompat
import androidx.core.graphics.BlendModeCompat.SRC_IN import androidx.core.graphics.BlendModeCompat.SRC_IN
import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentActivity
import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
import io.github.muntashirakon.music.R import io.github.muntashirakon.music.R
import io.github.muntashirakon.music.dialogs.BlacklistFolderChooserDialog import io.github.muntashirakon.music.dialogs.BlacklistFolderChooserDialog
@ -49,18 +50,23 @@ class BlacklistPreference @JvmOverloads constructor(
class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog.FolderCallback { class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog.FolderCallback {
companion object { companion object {
private var mContext: Context? = null
private var mActivity: FragmentActivity? = null
fun newInstance(): BlacklistPreferenceDialog { fun newInstance(): BlacklistPreferenceDialog {
return BlacklistPreferenceDialog() return BlacklistPreferenceDialog()
} }
} }
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
mContext = requireContext()
mActivity = requireActivity()
val chooserDialog = val chooserDialog =
childFragmentManager.findFragmentByTag("FOLDER_CHOOSER") as BlacklistFolderChooserDialog? childFragmentManager.findFragmentByTag("FOLDER_CHOOSER") as BlacklistFolderChooserDialog?
chooserDialog?.setCallback(this) chooserDialog?.setCallback(this)
refreshBlacklistData() refreshBlacklistData()
return MaterialAlertDialogBuilder( return MaterialAlertDialogBuilder(
requireActivity(), mActivity!!,
R.style.ThemeOverlay_MaterialComponents_Dialog_Alert R.style.ThemeOverlay_MaterialComponents_Dialog_Alert
) )
.setTitle(R.string.blacklist) .setTitle(R.string.blacklist)
@ -69,15 +75,13 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
} }
.setNeutralButton(R.string.clear_action) { _, _ -> .setNeutralButton(R.string.clear_action) { _, _ ->
MaterialAlertDialogBuilder( MaterialAlertDialogBuilder(
requireActivity(), mActivity!!,
R.style.ThemeOverlay_MaterialComponents_Dialog_Alert R.style.ThemeOverlay_MaterialComponents_Dialog_Alert
) )
.setTitle(R.string.clear_blacklist) .setTitle(R.string.clear_blacklist)
.setMessage(R.string.do_you_want_to_clear_the_blacklist) .setMessage(R.string.do_you_want_to_clear_the_blacklist)
.setPositiveButton(R.string.clear_action) { _, _ -> .setPositiveButton(R.string.clear_action) { _, _ ->
BlacklistStore.getInstance( BlacklistStore.getInstance(mContext!!).clear()
requireContext()
).clear()
} }
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.show() .show()
@ -85,11 +89,11 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
.setNegativeButton(R.string.add_action) { _, _ -> .setNegativeButton(R.string.add_action) { _, _ ->
val dialog = BlacklistFolderChooserDialog.create() val dialog = BlacklistFolderChooserDialog.create()
dialog.setCallback(this@BlacklistPreferenceDialog) dialog.setCallback(this@BlacklistPreferenceDialog)
dialog.show(requireActivity().supportFragmentManager, "FOLDER_CHOOSER") dialog.show(mActivity!!.supportFragmentManager, "FOLDER_CHOOSER")
} }
.setItems(paths.toTypedArray()) { _, which -> .setItems(paths.toTypedArray()) { _, which ->
MaterialAlertDialogBuilder( MaterialAlertDialogBuilder(
requireActivity(), mActivity!!,
R.style.ThemeOverlay_MaterialComponents_Dialog_Alert R.style.ThemeOverlay_MaterialComponents_Dialog_Alert
) )
.setTitle(R.string.remove_from_blacklist) .setTitle(R.string.remove_from_blacklist)
@ -105,7 +109,7 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
) )
) )
.setPositiveButton(R.string.remove_action) { _, _ -> .setPositiveButton(R.string.remove_action) { _, _ ->
BlacklistStore.getInstance(requireContext()) BlacklistStore.getInstance(mContext!!)
.removePath(File(paths[which])) .removePath(File(paths[which]))
refreshBlacklistData() refreshBlacklistData()
} }
@ -118,13 +122,13 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
private lateinit var paths: ArrayList<String> private lateinit var paths: ArrayList<String>
private fun refreshBlacklistData() { private fun refreshBlacklistData() {
this.paths = BlacklistStore.getInstance(requireContext()).paths this.paths = BlacklistStore.getInstance(mContext!!).paths
val dialog = dialog as MaterialAlertDialogBuilder? val dialog = dialog as MaterialAlertDialogBuilder?
dialog?.setItems(paths.toTypedArray(), null) dialog?.setItems(paths.toTypedArray(), null)
} }
override fun onFolderSelection(dialog: BlacklistFolderChooserDialog, folder: File) { override fun onFolderSelection(dialog: BlacklistFolderChooserDialog, folder: File) {
BlacklistStore.getInstance(requireContext()).addPath(folder) BlacklistStore.getInstance(mContext!!).addPath(folder)
refreshBlacklistData() refreshBlacklistData()
} }
} }