From 16561be85415ed8809c0ae002258fcb1d1c4686b Mon Sep 17 00:00:00 2001 From: antonio Date: Wed, 13 Sep 2023 16:19:50 +0200 Subject: [PATCH] fix: null checking --- .../tempo/repository/SearchingRepository.java | 12 +++++++----- .../tempo/subsonic/base/ApiResponse.kt | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/tempo/repository/SearchingRepository.java b/app/src/main/java/com/cappielloantonio/tempo/repository/SearchingRepository.java index 34af8540..b52315a1 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/repository/SearchingRepository.java +++ b/app/src/main/java/com/cappielloantonio/tempo/repository/SearchingRepository.java @@ -1,7 +1,5 @@ package com.cappielloantonio.tempo.repository; -import android.util.Log; - import androidx.annotation.NonNull; import androidx.lifecycle.MutableLiveData; @@ -36,7 +34,9 @@ public class SearchingRepository { .enqueue(new Callback() { @Override public void onResponse(@NonNull Call call, @NonNull Response response) { - result.setValue(response.body().getSubsonicResponse().getSearchResult2()); + if (response.isSuccessful() && response.body() != null) { + result.setValue(response.body().getSubsonicResponse().getSearchResult2()); + } } @Override @@ -57,7 +57,9 @@ public class SearchingRepository { .enqueue(new Callback() { @Override public void onResponse(@NonNull Call call, @NonNull Response response) { - result.setValue(response.body().getSubsonicResponse().getSearchResult3()); + if (response.isSuccessful() && response.body() != null) { + result.setValue(response.body().getSubsonicResponse().getSearchResult3()); + } } @Override @@ -80,7 +82,7 @@ public class SearchingRepository { public void onResponse(@NonNull Call call, @NonNull Response response) { List newSuggestions = new ArrayList(); - if (response.isSuccessful() && response.body() != null) { + if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getSearchResult3() != null) { if (response.body().getSubsonicResponse().getSearchResult3().getArtists() != null) { for (ArtistID3 artistID3 : response.body().getSubsonicResponse().getSearchResult3().getArtists()) { newSuggestions.add(artistID3.getName()); diff --git a/app/src/main/java/com/cappielloantonio/tempo/subsonic/base/ApiResponse.kt b/app/src/main/java/com/cappielloantonio/tempo/subsonic/base/ApiResponse.kt index f4a2f113..c6715031 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/subsonic/base/ApiResponse.kt +++ b/app/src/main/java/com/cappielloantonio/tempo/subsonic/base/ApiResponse.kt @@ -7,5 +7,5 @@ import com.google.gson.annotations.SerializedName @Keep class ApiResponse { @SerializedName("subsonic-response") - var subsonicResponse: SubsonicResponse? = null + lateinit var subsonicResponse: SubsonicResponse; } \ No newline at end of file