From 67a23b385e4672625ec1b3c42990bb7c6f2ef708 Mon Sep 17 00:00:00 2001
From: TrackArcher <wvdelzen2009@gmail.com>
Date: Tue, 13 Jan 2026 10:42:19 +0100
Subject: [PATCH] Fixing unchecked operation warnings in
 SongHorizontalAdapter.java.

---
 .../ui/adapter/SongHorizontalAdapter.java     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java
index 1d78f2ea..f3d8575a 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java
@@ -1,6 +1,5 @@
 package com.cappielloantonio.tempo.ui.adapter;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -67,7 +66,8 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
                 currentFilter = filterPattern;
 
                 for (Child item : songsFull) {
-                    if (item.getTitle().toLowerCase().contains(filterPattern)) {
+                    String title = item.getTitle();
+                    if (title != null && title.toLowerCase().contains(filterPattern)) {
                         filteredList.add(item);
                     }
                 }
@@ -80,8 +80,11 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
         }
 
         @Override
+        @SuppressWarnings("unchecked")
         protected void publishResults(CharSequence constraint, FilterResults results) {
-            songs = (List<Child>) results.values;
+            @SuppressWarnings("unchecked")
+            List<Child> filteredList = (List<Child>) results.values;
+            songs = filteredList != null ? filteredList : Collections.emptyList();
             notifyDataSetChanged();
 
             for (int pos : currentPlayingPositions) {
@@ -169,14 +172,18 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
                         (position > 0 && songs.get(position - 1) != null &&
                                 songs.get(position - 1).getDiscNumber() != null &&
                                 songs.get(position).getDiscNumber() != null &&
-                                songs.get(position - 1).getDiscNumber() < songs.get(position).getDiscNumber()
+                                Objects.compare(songs.get(position - 1).getDiscNumber(), songs.get(position).getDiscNumber(), Comparator.naturalOrder()) < 0
                         )
                 )
         ) {
             holder.item.differentDiskDividerSector.setVisibility(View.VISIBLE);
 
-            if (songs.get(position).getDiscNumber() != null && !Objects.requireNonNull(songs.get(position).getDiscNumber()).toString().isBlank()) {
-                holder.item.discTitleTextView.setText(holder.itemView.getContext().getString(R.string.disc_titleless, songs.get(position).getDiscNumber().toString()));
+            Integer discNumber = songs.get(position).getDiscNumber();
+            if (discNumber != null) {
+                String discNumberStr = discNumber.toString();
+                if (!discNumberStr.isBlank()) {
+                    holder.item.discTitleTextView.setText(holder.itemView.getContext().getString(R.string.disc_titleless, discNumberStr));
+                }
             }
 
             if (album.getDiscTitles() != null) {