antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: null checking

Browse source
This commit is contained in:
antonio 2023-05-27 11:58:41 +02:00
parent 24d2d201ad
commit c7151a95a8
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java
View file

@ -58,11 +58,13 @@ public class AlbumRepository {
if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getStarred2() != null) { if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getStarred2() != null) {
List<AlbumID3> albums = response.body().getSubsonicResponse().getStarred2().getAlbums(); List<AlbumID3> albums = response.body().getSubsonicResponse().getStarred2().getAlbums();
if (random) { if (albums != null) {
Collections.shuffle(albums); if (random) {
starredAlbums.setValue(albums.subList(0, Math.min(size, albums.size()))); Collections.shuffle(albums);
} else { starredAlbums.setValue(albums.subList(0, Math.min(size, albums.size())));
starredAlbums.setValue(albums); } else {
starredAlbums.setValue(albums);
}
} }
} }
} }

12
app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java
View file

@ -31,11 +31,13 @@ public class ArtistRepository {
if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getStarred2() != null) { if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getStarred2() != null) {
List<ArtistID3> artists = response.body().getSubsonicResponse().getStarred2().getArtists(); List<ArtistID3> artists = response.body().getSubsonicResponse().getStarred2().getArtists();
if (!random) { if (artists != null) {
getArtistInfo(artists, starredArtists); if (!random) {
} else { getArtistInfo(artists, starredArtists);
Collections.shuffle(artists); } else {
getArtistInfo(artists.subList(0, Math.min(size, artists.size())), starredArtists); Collections.shuffle(artists);
getArtistInfo(artists.subList(0, Math.min(size, artists.size())), starredArtists);
}
} }
} }
} }

7
app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java
View file

@ -17,7 +17,6 @@ import com.cappielloantonio.play.repository.SongRepository;
import com.cappielloantonio.play.subsonic.models.AlbumID3; import com.cappielloantonio.play.subsonic.models.AlbumID3;
import com.cappielloantonio.play.subsonic.models.ArtistID3; import com.cappielloantonio.play.subsonic.models.ArtistID3;
import com.cappielloantonio.play.subsonic.models.Child; import com.cappielloantonio.play.subsonic.models.Child;
import com.cappielloantonio.play.subsonic.models.PodcastEpisode;
import com.cappielloantonio.play.util.Preferences; import com.cappielloantonio.play.util.Preferences;
import java.util.Calendar; import java.util.Calendar;
@ -81,8 +80,10 @@ public class HomeViewModel extends AndroidViewModel {
int currentYear = Calendar.getInstance().get(Calendar.YEAR); int currentYear = Calendar.getInstance().get(Calendar.YEAR);
albumRepository.getAlbums("byYear", 500, currentYear, currentYear).observe(owner, albums -> { albumRepository.getAlbums("byYear", 500, currentYear, currentYear).observe(owner, albums -> {
albums.sort(Comparator.comparing(AlbumID3::getCreated).reversed()); if (albums != null) {
newReleasedAlbum.postValue(albums.subList(0, Math.min(20, albums.size()))); albums.sort(Comparator.comparing(AlbumID3::getCreated).reversed());
newReleasedAlbum.postValue(albums.subList(0, Math.min(20, albums.size())));
}
}); });
} }