Fixed a crash when adding to queue from FolderFragment

Author: timusus

app/src/main/java/com/simplecity/amp_library/ui/screens/folders/FolderFragment.java

@@ -660,13 +660,14 @@ public boolean onMenuItemClick(MenuItem menuItem) {
     FolderMenuUtils.Callbacks callbacks = new FolderMenuUtils.Callbacks() {
 
         @Override
-        public void onQueueItemsInserted(int numSongs) {
-            // Todo: Implement
+        public void onSongsAddedToQueue(int numSongs) {
+            Toast.makeText(getContext(), getContext().getResources().getQuantityString(R.plurals.NNNtrackstoqueue, numSongs, numSongs), Toast.LENGTH_SHORT).show();
         }
 
         @Override
         public void onPlaybackFailed() {
-            // Todo: Implement
+            // Todo: Improve error message
+            Toast.makeText(getContext(), R.string.emptyplaylist, Toast.LENGTH_SHORT).show();
         }
 
         @Override

app/src/main/java/com/simplecity/amp_library/utils/menu/folder/FolderMenuUtils.kt

@@ -41,6 +41,8 @@ object FolderMenuUtils {
 
         fun showToast(@StringRes messageResId: Int)
 
+        fun onSongsAddedToQueue(numSongs: Int)
+
         fun onPlaybackFailed()
 
         fun shareSong(song: Song)
@@ -51,8 +53,6 @@ object FolderMenuUtils {
 
         fun onPlaylistItemsInserted()
 
-        fun onQueueItemsInserted(numSongs: Int)
-
         fun showTagEditor(song: Song)
 
         fun onFileNameChanged(folderView: FolderView)
@@ -236,7 +236,7 @@ object FolderMenuUtils {
                     return@OnMenuItemClickListener true
                 }
                 R.id.addToQueue -> {
-                    MenuUtils.addToQueue(mediaManager, getSongsForFolderObject(songsRepository, folderObject)) { callbacks.onQueueItemsInserted(it) }
+                    MenuUtils.addToQueue(mediaManager, getSongsForFolderObject(songsRepository, folderObject)) { callbacks.onSongsAddedToQueue(it) }
                     return@OnMenuItemClickListener true
                 }
                 R.id.scan -> {
@@ -279,7 +279,12 @@ object FolderMenuUtils {
 
             when (menuItem.itemId) {
                 R.id.playNext -> {
-                    getSongForFile(songsRepository, fileObject).subscribe({ song -> mediaManager.playNext(listOf(song)) { callbacks.showToast(it) } }, errorHandler)
+                    getSongForFile(songsRepository, fileObject)
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(
+                            { song -> mediaManager.playNext(listOf(song)) { callbacks.onSongsAddedToQueue(it) } },
+                            errorHandler
+                        )
                     return@OnMenuItemClickListener true
                 }
                 Defs.NEW_PLAYLIST -> {
@@ -302,7 +307,7 @@ object FolderMenuUtils {
                     return@OnMenuItemClickListener true
                 }
                 R.id.addToQueue -> {
-                    getSongForFile(songsRepository, fileObject).subscribe({ song -> MenuUtils.addToQueue(mediaManager, listOf(song), { callbacks.onQueueItemsInserted(it) }) }, errorHandler)
+                    getSongForFile(songsRepository, fileObject).subscribe({ song -> MenuUtils.addToQueue(mediaManager, listOf(song), { callbacks.onSongsAddedToQueue(it) }) }, errorHandler)
                     return@OnMenuItemClickListener true
                 }
                 R.id.scan -> {