From 9a492f5a1984e89bd5d5be59e143b247553159f0 Mon Sep 17 00:00:00 2001
From: EthanArmbrust <ethanarm@buffalo.edu>
Date: Mon, 22 Jan 2018 11:15:43 -0500
Subject: [PATCH] Fix ArtistSongAdapter playing the wrong song.

(cherry picked from commit 6b9cb3d)
---
 .../java/com/naman14/timber/adapters/ArtistSongAdapter.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/naman14/timber/adapters/ArtistSongAdapter.java b/app/src/main/java/com/naman14/timber/adapters/ArtistSongAdapter.java
index 8674620..0b4e596 100644
--- a/app/src/main/java/com/naman14/timber/adapters/ArtistSongAdapter.java
+++ b/app/src/main/java/com/naman14/timber/adapters/ArtistSongAdapter.java
@@ -112,7 +112,7 @@ public class ArtistSongAdapter extends BaseSongAdapter<ArtistSongAdapter.ItemHol
                     public boolean onMenuItemClick(MenuItem item) {
                         switch (item.getItemId()) {
                             case R.id.popup_song_play:
-                                MusicPlayer.playAll(mContext, songIDs, position, -1, TimberUtils.IdType.NA, false);
+                                MusicPlayer.playAll(mContext, songIDs, position + 1, -1, TimberUtils.IdType.NA, false);
                                 break;
                             case R.id.popup_song_play_next:
                                 long[] ids = new long[1];
@@ -134,7 +134,7 @@ public class ArtistSongAdapter extends BaseSongAdapter<ArtistSongAdapter.ItemHol
                                 AddPlaylistDialog.newInstance(arraylist.get(position + 1)).show(((AppCompatActivity) mContext).getSupportFragmentManager(), "ADD_PLAYLIST");
                                 break;
                             case R.id.popup_song_share:
-                                TimberUtils.shareTrack(mContext, arraylist.get(position).id);
+                                TimberUtils.shareTrack(mContext, arraylist.get(position + 1).id);
                                 break;
                             case R.id.popup_song_delete:
                                 long[] deleteIds = {arraylist.get(position + 1).id};
@@ -228,7 +228,7 @@ public class ArtistSongAdapter extends BaseSongAdapter<ArtistSongAdapter.ItemHol
             handler.postDelayed(new Runnable() {
                 @Override
                 public void run() {
-                    playAll(mContext, songIDs, getAdapterPosition() - 1, artistID,
+                    playAll(mContext, songIDs, getAdapterPosition(), artistID,
                             TimberUtils.IdType.Artist, false,
                             arraylist.get(getAdapterPosition()), true);
                 }