fix: address duplicate track bug, wrong order in queue, and updated album instant mix

app/src/main/java/com/cappielloantonio/tempo/repository/SongRepository.java

@@ -1,5 +1,7 @@
 package com.cappielloantonio.tempo.repository;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
 
@@ -22,6 +24,7 @@ import retrofit2.Response;
 
 public class SongRepository {
 
+    private static final String TAG = "SongRepository";
     public interface MediaCallbackInternal {
         void onSongsAvailable(List<Child> songs);
     }
@@ -126,7 +129,6 @@ public class SongRepository {
                 originalCallback.onSongsAvailable(new ArrayList<>(accumulatedSongs));
                 if (accumulatedSongs.size() >= targetCount) {
                     isComplete = true;
-                    android.util.Log.d("SongRepository", "Reached target of " + targetCount + " songs");
                 }
             }
         }
@@ -150,28 +152,61 @@ public class SongRepository {
         App.getSubsonicClientInstance(false).getBrowsingClient().getAlbum(albumId).enqueue(new Callback<ApiResponse>() {
             @Override
             public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getAlbum() != null) {
+                if (response.isSuccessful() && response.body() != null && 
+                    response.body().getSubsonicResponse().getAlbum() != null) {
                     List<Child> albumSongs = response.body().getSubsonicResponse().getAlbum().getSongs();
                     if (albumSongs != null && !albumSongs.isEmpty()) {
-                        List<Child> limitedAlbumSongs = albumSongs.subList(0, Math.min(count, albumSongs.size()));
+                        int fromAlbum = Math.min(count, albumSongs.size());
+                        List<Child> limitedAlbumSongs = albumSongs.subList(0, fromAlbum);
                         callback.onSongsAvailable(new ArrayList<>(limitedAlbumSongs));
                     
-                        // If we need more, get similar songs
+                        int remaining = count - fromAlbum;
-                        int remaining = count - limitedAlbumSongs.size();
+                        if (remaining > 0 && albumSongs.get(0).getArtistId() != null) {
-                        if (remaining > 0) {
                             fetchSimilarByArtist(albumSongs.get(0).getArtistId(), remaining, callback);
+                        } else if (remaining > 0) {
+                            Log.d(TAG, "No artistId available, skipping similar artist fetch");
                         }
                         return;
                     }
                 }
+                
+                Log.d(TAG, "Album fetch failed or empty, calling fillWithRandom");
                 fillWithRandom(count, callback);
             }
-            @Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+            
+            @Override 
+            public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                Log.d(TAG, "Album fetch failed: " + t.getMessage());
                 fillWithRandom(count, callback);
             }
         });
     }
 
+    private void fetchSimilarByArtist(String artistId, final int count, final MediaCallbackInternal callback) {
+        App.getSubsonicClientInstance(false)
+                .getBrowsingClient()
+                .getSimilarSongs2(artistId, count)
+                .enqueue(new Callback<ApiResponse>() {
+                    @Override
+                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+                        List<Child> similar = extractSongs(response, "similarSongs2");
+                        if (!similar.isEmpty()) {
+                            List<Child> limitedSimilar = similar.subList(0, Math.min(count, similar.size()));
+                            callback.onSongsAvailable(limitedSimilar);
+                        } else {
+                            Log.d(TAG, "No similar songs, calling fillWithRandom");
+                            fillWithRandom(count, callback);
+                        }
+                    }
+                    
+                    @Override 
+                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
+                        Log.d(TAG, "getSimilarSongs2 failed: " + t.getMessage());
+                        fillWithRandom(count, callback);
+                    }
+                });
+    }
+
     private void fetchSingleTrackThenSimilar(String trackId, int count, MediaCallbackInternal callback) {
         App.getSubsonicClientInstance(false).getBrowsingClient().getSong(trackId).enqueue(new Callback<ApiResponse>() {
             @Override
@@ -195,45 +230,25 @@ public class SongRepository {
         });
     }
 
-private void fetchSimilarOnly(String id, int count, MediaCallbackInternal callback) {
+    private void fetchSimilarOnly(String id, int count, MediaCallbackInternal callback) {
-    App.getSubsonicClientInstance(false).getBrowsingClient().getSimilarSongs(id, count).enqueue(new Callback<ApiResponse>() {
+        App.getSubsonicClientInstance(false).getBrowsingClient().getSimilarSongs(id, count).enqueue(new Callback<ApiResponse>() {
-        @Override
+            @Override
-        public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
+            public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-            List<Child> songs = extractSongs(response, "similarSongs");
+                List<Child> songs = extractSongs(response, "similarSongs");
-            if (!songs.isEmpty()) {
+                if (!songs.isEmpty()) {
-                List<Child> limitedSongs = songs.subList(0, Math.min(count, songs.size()));
+                    List<Child> limitedSongs = songs.subList(0, Math.min(count, songs.size()));
-                callback.onSongsAvailable(limitedSongs);
+                    callback.onSongsAvailable(limitedSongs);
-            } else {
+                } else {
+                    fillWithRandom(count, callback);
+                }
+            }
+            @Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
                 fillWithRandom(count, callback);
             }
-        }
+        });
-        @Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-            fillWithRandom(count, callback);
-        }
-    });
-}
-    private void fetchSimilarByArtist(String artistId, final int count, final MediaCallbackInternal callback) {
-        App.getSubsonicClientInstance(false)
-                .getBrowsingClient()
-                .getSimilarSongs2(artistId, count)
-                .enqueue(new Callback<ApiResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        List<Child> similar = extractSongs(response, "similarSongs2");
-                        if (!similar.isEmpty()) {
-                            List<Child> limitedSimilar = similar.subList(0, Math.min(count, similar.size()));
-                            callback.onSongsAvailable(limitedSimilar);
-                        } else {
-                            fillWithRandom(count, callback);
-                        }
-                    }
-                    @Override 
-                    public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
-                        fillWithRandom(count, callback);
-                    }
-                });
     }
 
+
     private void fillWithRandom(int target, final MediaCallbackInternal callback) {
         App.getSubsonicClientInstance(false)
                 .getAlbumSongListClient()

app/src/main/java/com/cappielloantonio/tempo/service/MediaManager.java

@@ -184,44 +184,33 @@ public class MediaManager {
     @OptIn(markerClass = UnstableApi.class)
     public static void startQueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, List<Child> media, int startIndex) {
         if (mediaBrowserListenableFuture != null) {
-            Log.d(TAG, "startQueue called with " + (media != null ? media.size() : 0) + " songs");
 
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
                     if (mediaBrowserListenableFuture.isDone()) {
-                        Log.d(TAG, "MediaBrowser future is done");
                         final MediaBrowser browser = mediaBrowserListenableFuture.get();
-                        Log.d(TAG, "Got MediaBrowser, connected: " + browser.isConnected());
-                        
                         final List<MediaItem> items = MappingUtil.mapMediaItems(media);
-                        Log.d(TAG, "Mapped " + items.size() + " media items");
                         
                         new Handler(Looper.getMainLooper()).post(() -> {
-                            Log.d(TAG, "Setting " + items.size() + " media items at index " + startIndex);
                             justStarted.set(true);
                             browser.setMediaItems(items, startIndex, 0);
                             browser.prepare();
-                            Log.d(TAG, "setMediaItems and prepare called");
 
                             Player.Listener timelineListener = new Player.Listener() {
                                 @Override
                                 public void onTimelineChanged(Timeline timeline, int reason) {
-                                    Log.d(TAG, "onTimelineChanged: itemCount=" + browser.getMediaItemCount() + ", reason=" + reason);
                                     
                                     int itemCount = browser.getMediaItemCount();
                                     if (itemCount > 0 && startIndex >= 0 && startIndex < itemCount) {
-                                        Log.d(TAG, "Seeking to " + startIndex + " and playing");
                                         browser.seekTo(startIndex, 0);
                                         browser.play();
                                         browser.removeListener(this);
-                                        Log.d(TAG, "Playback started");
                                     } else {
                                         Log.d(TAG, "Cannot start playback: itemCount=" + itemCount + ", startIndex=" + startIndex);
                                     }
                                 }
                             };
                             
-                            Log.d(TAG, "Adding timeline listener");
                             browser.addListener(timelineListener);
                         });
 

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabMusicFragment.java

@@ -5,6 +5,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -1253,20 +1255,25 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback {
         MediaBrowser.releaseFuture(mediaBrowserListenableFuture);
     }
 
-    @Override
     public void onMediaClick(Bundle bundle) {
         if (bundle.containsKey(Constants.MEDIA_MIX)) {
-            MediaManager.startQueue(mediaBrowserListenableFuture, bundle.getParcelable(Constants.TRACK_OBJECT));
+            Child track = bundle.getParcelable(Constants.TRACK_OBJECT);
             activity.setBottomSheetInPeek(true);
 
             if (mediaBrowserListenableFuture != null) {
-                homeViewModel.getMediaInstantMix(getViewLifecycleOwner(), bundle.getParcelable(Constants.TRACK_OBJECT)).observe(getViewLifecycleOwner(), songs -> {
+                final boolean[] playbackStarted = {false};
-                    MusicUtil.ratingFilter(songs);
 
-                    if (songs != null && !songs.isEmpty()) {
+                homeViewModel.getMediaInstantMix(getViewLifecycleOwner(), track)
-                        MediaManager.enqueue(mediaBrowserListenableFuture, songs, true);
+                        .observe(getViewLifecycleOwner(), songs -> {
-                    }
+                            if (playbackStarted[0] || songs == null || songs.isEmpty()) return;
-                });
+
+                            new Handler(Looper.getMainLooper()).postDelayed(() -> {
+                                if (playbackStarted[0]) return;
+
+                                MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
+                                playbackStarted[0] = true;
+                            }, 300);
+                        });
             }
         } else if (bundle.containsKey(Constants.MEDIA_CHRONOLOGY)) {
             List<Child> media = bundle.getParcelableArrayList(Constants.TRACKS_OBJECT);

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java

@@ -5,6 +5,8 @@ import android.content.ClipboardManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -61,6 +63,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
     private List<MediaItem> currentAlbumMediaItems = Collections.emptyList();
 
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
+    private static final String TAG = "AlbumBottomSheetDialog";
 
     @Nullable
     @Override
@@ -116,12 +119,11 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
         favoriteToggle.setOnClickListener(v -> albumBottomSheetViewModel.setFavorite(requireContext()));
 
         TextView playRadio = view.findViewById(R.id.play_radio_text_view);
-            playRadio.setOnClickListener(v -> {
+        playRadio.setOnClickListener(v -> {
-            AlbumRepository albumRepository = new AlbumRepository();
+            new AlbumRepository().getInstantMix(album, 20, new MediaCallback() {
-            albumRepository.getInstantMix(album, 20, new MediaCallback() {
                 @Override
                 public void onError(Exception exception) {
-                    exception.printStackTrace();
+                    Log.e(TAG, "Error: " + exception.getMessage());
                 }
 
                 @Override
@@ -140,19 +142,19 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
                     }
 
                     view.postDelayed(() -> {
-                                try {
+                        try {
-                                    if (mediaBrowserListenableFuture.isDone()) {
+                            if (mediaBrowserListenableFuture.isDone()) {
-                                        MediaBrowser browser = mediaBrowserListenableFuture.get();
+                                MediaBrowser browser = mediaBrowserListenableFuture.get();
-                                        if (browser != null && browser.isPlaying()) {
+                                if (browser != null && browser.isPlaying()) {
-                                            dismissBottomSheet();
+                                    dismissBottomSheet();
-                                            return;
+                                    return;
-                                        }
-                                    }
-                                } catch (Exception e) {
-                                    // Ignore
                                 }
-                                view.postDelayed(() -> dismissBottomSheet(), 200);
+                            }
-                            }, 300);
+                        } catch (Exception e) {
+                            Log.e(TAG, "Error checking playback: " + e.getMessage());
+                        }
+                        view.postDelayed(() -> dismissBottomSheet(), 200);
+                    }, 300);
                 }
             });
         });

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java

@@ -89,7 +89,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
 
         TextView playRadio = view.findViewById(R.id.play_radio_text_view);
         playRadio.setOnClickListener(v -> {
-                Log.d(TAG, "Artist instant mix clicked");
+            Log.d(TAG, "Artist instant mix clicked");
     
             ArtistRepository artistRepository = new ArtistRepository();
             artistRepository.getInstantMix(artist, 20)

app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java

@@ -5,6 +5,8 @@ import android.content.ClipboardManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -143,21 +145,36 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
 
         TextView playRadio = view.findViewById(R.id.play_radio_text_view);
         playRadio.setOnClickListener(v -> {
-            MediaManager.startQueue(mediaBrowserListenableFuture, song);
             ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
 
+            final boolean[] playbackStarted = {false};
+
             songBottomSheetViewModel.getInstantMix(getViewLifecycleOwner(), song).observe(getViewLifecycleOwner(), songs -> {
-                MusicUtil.ratingFilter(songs);
+                if (playbackStarted[0] || songs == null || songs.isEmpty()) return;
 
-                if (songs == null) {
+                new Handler(Looper.getMainLooper()).postDelayed(() -> {
-                    dismissBottomSheet();
+                    if (playbackStarted[0]) return;
-                    return;
-                }
 
-                if (!songs.isEmpty()) {
+                    MusicUtil.ratingFilter(songs);
-                    MediaManager.enqueue(mediaBrowserListenableFuture, songs, true);
+
-                    dismissBottomSheet();
+                    MediaManager.startQueue(mediaBrowserListenableFuture, songs, 0);
-                }
+                    playbackStarted[0] = true;
+
+                    view.postDelayed(() -> {
+                        try {
+                            if (mediaBrowserListenableFuture.isDone()) {
+                                MediaBrowser browser = mediaBrowserListenableFuture.get();
+                                if (browser != null && browser.isPlaying()) {
+                                    dismissBottomSheet();
+                                    return;
+                                }
+                            }
+                        } catch (Exception e) {
+                            // Ignore
+                        }
+                        view.postDelayed(() -> dismissBottomSheet(), 200);
+                    }, 300);
+                }, 300);
             });
         });