diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java index 48fe52b5..215ca31f 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java @@ -273,13 +273,15 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements final String wikiContent = lastFmAlbum.getAlbum().getWiki().getContent(); if (wikiContent != null && !wikiContent.trim().isEmpty()) { wiki = Html.fromHtml(wikiContent); - } else if (lang != null) { - // If the "lang" parameter is set and no wiki is given, retry with default language - loadWiki(null); - return; } } + // If the "lang" parameter is set and no wiki is given, retry with default language + if (wiki == null && lang != null) { + loadWiki(null); + return; + } + if (!Util.isAllowedToDownloadMetadata(AlbumDetailActivity.this)) { if (wiki != null) { wikiDialog.setContent(wiki); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java index e2807f0f..53443cbd 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java @@ -239,16 +239,18 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement public void onResponse(@NonNull Call call, @NonNull Response response) { final LastFmArtist lastFmArtist = response.body(); if (lastFmArtist != null && lastFmArtist.getArtist() != null) { - String bio = lastFmArtist.getArtist().getBio().getContent(); - if (bio != null && !bio.trim().isEmpty()) { - biography = Html.fromHtml(bio); - } else if (lang != null) { - // If the "lang" parameter is set and no biography is given, retry with default language - loadBiography(null); - return; + final String bioContent = lastFmArtist.getArtist().getBio().getContent(); + if (bioContent != null && !bioContent.trim().isEmpty()) { + biography = Html.fromHtml(bioContent); } } + // If the "lang" parameter is set and no biography is given, retry with default language + if (biography == null && lang != null) { + loadBiography(null); + return; + } + if (!Util.isAllowedToDownloadMetadata(ArtistDetailActivity.this)) { if (biography != null) { biographyDialog.setContent(biography);