diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabMusicFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabMusicFragment.java index 126028b8..0c2734d8 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabMusicFragment.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabMusicFragment.java @@ -706,7 +706,9 @@ public class HomeTabMusicFragment extends Fragment implements ClickCallback { private void refreshSharesView() { final Handler handler = new Handler(); final Runnable runnable = () -> { - if (Preferences.isSharingEnabled()) homeViewModel.refreshShares(getViewLifecycleOwner()); + if (getView() != null && bind != null && Preferences.isSharingEnabled()) { + homeViewModel.refreshShares(getViewLifecycleOwner()); + } }; handler.postDelayed(runnable, 100); } diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/LibraryFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/LibraryFragment.java index 414d2f7b..b395ab77 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/LibraryFragment.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/LibraryFragment.java @@ -254,7 +254,12 @@ public class LibraryFragment extends Fragment implements ClickCallback { private void refreshPlaylistView() { final Handler handler = new Handler(); - final Runnable runnable = () -> libraryViewModel.refreshPlaylistSample(getViewLifecycleOwner()); + + final Runnable runnable = () -> { + if (getView() != null && bind != null && libraryViewModel != null) + libraryViewModel.refreshPlaylistSample(getViewLifecycleOwner()); + }; + handler.postDelayed(runnable, 100); } diff --git a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/AlbumCatalogueViewModel.java b/app/src/main/java/com/cappielloantonio/tempo/viewmodel/AlbumCatalogueViewModel.java index 1253cc12..7182e5d4 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/AlbumCatalogueViewModel.java +++ b/app/src/main/java/com/cappielloantonio/tempo/viewmodel/AlbumCatalogueViewModel.java @@ -61,9 +61,8 @@ public class AlbumCatalogueViewModel extends AndroidViewModel { .enqueue(new Callback() { @Override public void onResponse(@NonNull Call call, @NonNull retrofit2.Response response) { - if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getAlbumList2() != null) { - List albumList = new ArrayList<>(); - albumList.addAll(response.body().getSubsonicResponse().getAlbumList2().getAlbums()); + if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getAlbumList2() != null && response.body().getSubsonicResponse().getAlbumList2().getAlbums() != null) { + List albumList = new ArrayList<>(response.body().getSubsonicResponse().getAlbumList2().getAlbums()); callback.onLoadMedia(albumList); } }