From 4e26c62472e31f84aaac1888be95bd8066c24ab2 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Thu, 16 May 2019 23:32:35 +0530 Subject: [PATCH] Fix crashing on blacklist items clear --- .../preferences/BlacklistPreferenceDialog.kt | 105 ------------------ 1 file changed, 105 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt index f59e6ebb..4e55139e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt @@ -30,7 +30,6 @@ import com.afollestad.materialdialogs.list.listItems import java.io.File import java.util.* - class BlacklistPreference : ATEDialogPreference { constructor(context: Context) : super(context) @@ -107,108 +106,4 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog BlacklistStore.getInstance(context!!).addPath(folder); refreshBlacklistData(); } - - /*public static final String TAG = BlacklistPreferenceDialog.class.getSimpleName(); - - private ArrayList paths; - - public static BlacklistPreferenceDialog newInstance() { - return new BlacklistPreferenceDialog(); - } - - @NonNull - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - BlacklistFolderChooserDialog blacklistFolderChooserDialog = (BlacklistFolderChooserDialog) getChildFragmentManager() - .findFragmentByTag("FOLDER_CHOOSER"); - if (blacklistFolderChooserDialog != null) { - blacklistFolderChooserDialog.setCallback(this); - } - - refreshBlacklistData(); - return new MaterialDialog.Builder(getContext()) - .title(R.string.blacklist) - .positiveText(android.R.string.ok) - .neutralText(R.string.clear_action) - .negativeText(R.string.add_action) - .items(paths) - .autoDismiss(false) - .itemsCallback(new MaterialDialog.ListCallback() { - @Override - public void onSelection(MaterialDialog materialDialog, View view, int i, - final CharSequence charSequence) { - new MaterialDialog.Builder(getContext()) - .title(R.string.remove_from_blacklist) - .content(Html.fromHtml( - getString(R.string.do_you_want_to_remove_from_the_blacklist, charSequence))) - .positiveText(R.string.remove_action) - .negativeText(android.R.string.cancel) - .onPositive(new MaterialDialog.SingleButtonCallback() { - @Override - public void onClick(@NonNull MaterialDialog materialDialog, - @NonNull DialogAction dialogAction) { - BlacklistStore.getInstance(getContext()) - .removePath(new File(charSequence.toString())); - refreshBlacklistData(); - } - }).show(); - } - }) - // clear - .onNeutral(new MaterialDialog.SingleButtonCallback() { - @Override - public void onClick(@NonNull MaterialDialog materialDialog, - @NonNull DialogAction dialogAction) { - new MaterialDialog.Builder(getContext()) - .title(R.string.clear_blacklist) - .content(R.string.do_you_want_to_clear_the_blacklist) - .positiveText(R.string.clear_action) - .negativeText(android.R.string.cancel) - .onPositive(new MaterialDialog.SingleButtonCallback() { - @Override - public void onClick(@NonNull MaterialDialog materialDialog, - @NonNull DialogAction dialogAction) { - BlacklistStore.getInstance(getContext()).clear(); - refreshBlacklistData(); - } - }).show(); - } - }) - // add - .onNegative(new MaterialDialog.SingleButtonCallback() { - @Override - public void onClick(@NonNull MaterialDialog materialDialog, - @NonNull DialogAction dialogAction) { - BlacklistFolderChooserDialog dialog = BlacklistFolderChooserDialog.create(); - dialog.setCallback(BlacklistPreferenceDialog.this); - dialog.show(getChildFragmentManager(), "FOLDER_CHOOSER"); - } - }) - .onPositive(new MaterialDialog.SingleButtonCallback() { - @Override - public void onClick(@NonNull MaterialDialog materialDialog, - @NonNull DialogAction dialogAction) { - dismiss(); - } - }) - .build(); - } - - private void refreshBlacklistData() { - paths = BlacklistStore.getInstance(getContext()).getPaths(); - - MaterialDialog dialog = (MaterialDialog) getDialog(); - if (dialog != null) { - String[] pathArray = new String[paths.size()]; - pathArray = paths.toArray(pathArray); - dialog.setItems((CharSequence[]) pathArray); - } - } - - @Override - public void onFolderSelection(@NonNull BlacklistFolderChooserDialog folderChooserDialog, - @NonNull File file) { - BlacklistStore.getInstance(getContext()).addPath(file); - refreshBlacklistData(); - }*/ }