From b4fa4511de50a7c2790d31b132af71d94d0aa411 Mon Sep 17 00:00:00 2001 From: Materight Date: Sun, 11 Jun 2017 21:10:19 +0200 Subject: [PATCH] Fallback to default if no biography is found --- .../gramophone/ui/activities/ArtistDetailActivity.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 f77c9002..d10b8461 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 @@ -225,7 +225,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement } private void loadBiography() { - lastFMRestClient.getApiService().getArtistInfo(getArtist().getName(), Locale.getDefault().getLanguage(), null).enqueue(new Callback() { + final Callback bioCallback = new Callback(){ @Override public void onResponse(Call call, Response response) { LastFmArtist lastFmArtist = response.body(); @@ -235,6 +235,10 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement biography = Html.fromHtml(bio); return; } + else if(call.request().url().queryParameter("lang") != null){ + //If the "lang" parameter is set and no bio is given, retry with default language + lastFMRestClient.getApiService().getArtistInfo(getArtist().getName(), null, null).enqueue(this); + } } biography = null; } @@ -244,7 +248,8 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement t.printStackTrace(); biography = null; } - }); + }; + lastFMRestClient.getApiService().getArtistInfo(getArtist().getName(), Locale.getDefault().getLanguage(), null).enqueue(bioCallback); } private MaterialDialog getBiographyDialog() {