From 20c34fd888934562d49374327fcd5c49faef554c Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Thu, 17 Aug 2023 20:39:05 -0600
Subject: [PATCH] music: fix crash on adding to new playlist

Apparently dialog fragments do not change the state of the fragment it
is overlaid on, resulting in it still having active StateFlow
collectors that will intercept new playlist requests before
AddToPlaylistDialog. Once again sharing StateFlows across views has
bit me.

In the future I may try to preserve the navigation idioms by not
stacking NewPlaylistDialog on AddToPlaylistDialog and instead
simply swap them out. I think this would also be better design too
(It's not like I'm allowing other decision dialogs to be exitable
back to their prior dialog).
---
 .../music/decision/AddToPlaylistDialog.kt     | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt
index 7e7aec2ac..51dcfcf6c 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt
@@ -32,10 +32,8 @@ import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.DialogMusicChoicesBinding
 import org.oxycblt.auxio.list.ClickableListListener
 import org.oxycblt.auxio.music.MusicViewModel
-import org.oxycblt.auxio.music.PlaylistDecision
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment
-import org.oxycblt.auxio.util.collect
 import org.oxycblt.auxio.util.collectImmediately
 import org.oxycblt.auxio.util.logD
 import org.oxycblt.auxio.util.navigateSafe
@@ -93,26 +91,16 @@ class AddToPlaylistDialog :
     }
 
     override fun onNewPlaylist() {
-        musicModel.createPlaylist(songs = pickerModel.currentSongsToAdd.value ?: return)
-    }
-
-    private fun handleDecision(decision: PlaylistDecision?) {
-        when (decision) {
-            is PlaylistDecision.Add -> {
-                logD("Navigated to playlist add dialog")
-                musicModel.playlistDecision.consume()
-            }
-            is PlaylistDecision.New -> {
-                logD("Navigating to new playlist dialog")
-                findNavController()
-                    .navigateSafe(
-                        AddToPlaylistDialogDirections.newPlaylist(
-                            decision.songs.map { it.uid }.toTypedArray()))
-            }
-            is PlaylistDecision.Rename,
-            is PlaylistDecision.Delete -> error("Unexpected decision $decision")
-            null -> {}
-        }
+        // TODO: This is a temporary fix. Eventually I want to make this navigate away and
+        //  instead have primary fragments launch navigation to the new playlist dialog.
+        //  This should be better design (dialog layering is uh... probably not good) and
+        //  preserves the existing navigation system.
+        //  I could also roll some kind of new playlist textbox into the dialog, but that's
+        //  a lot harder.
+        val songs = pickerModel.currentSongsToAdd.value ?: return
+        findNavController()
+            .navigateSafe(
+                AddToPlaylistDialogDirections.newPlaylist(songs.map { it.uid }.toTypedArray()))
     }
 
     private fun updatePendingSongs(songs: List<Song>?) {