Refactor and rename metadata pref/util

2017-07-05 12:36:22 -04:00 · 2017-07-05 12:36:22 -04:00 · 0bd8e4292d
commit 0bd8e4292d
parent cee6e6e83a
37 changed files with 133 additions and 145 deletions
--- a/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java
@ -48,7 +48,7 @@ public class ArtistImageFetcher implements DataFetcher<InputStream> {

    @Override
    public InputStream loadData(Priority priority) throws Exception {
-        if (!MusicUtil.isArtistNameUnknown(model.artistName) && Util.isAllowedToAutoDownload(context)) {
+        if (!MusicUtil.isArtistNameUnknown(model.artistName) && Util.isAllowedToDownloadMetadata(context)) {
            Response<LastFmArtist> response = lastFMRestClient.getApiService().getArtistInfo(model.artistName, null, model.skipOkHttpCache ? "no-cache" : null).execute();

            if (!response.isSuccessful()) {
--- a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java
@ -18,7 +18,6 @@ import okhttp3.Response;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;

-
 /**
 * @author Karim Abou Zeid (kabouzeid)
 */
--- a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/model/LastFmAlbum.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/model/LastFmAlbum.java
@ -1,4 +1,3 @@
-
 package com.kabouzeid.gramophone.lastfm.rest.model;

 import com.google.gson.annotations.Expose;
@ -8,7 +7,6 @@ import java.util.ArrayList;
 import java.util.List;

 public class LastFmAlbum {
-
    @Expose
    private Album album;

@ -21,7 +19,6 @@ public class LastFmAlbum {
    }

    public static class Album {
-
        @Expose
        private List<Image> image = new ArrayList<>();
        @Expose
@ -42,7 +39,6 @@ public class LastFmAlbum {
        }

        public class Wiki {
-
            @Expose
            private String content;

@ -53,11 +49,9 @@ public class LastFmAlbum {
            public void setContent(String content) {
                this.content = content;
            }
-
        }

        public static class Image {
-
            @SerializedName("#text")
            @Expose
            private String Text;
@ -81,5 +75,4 @@ public class LastFmAlbum {
            }
        }
    }
-
 }
--- a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/model/LastFmArtist.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/model/LastFmArtist.java
@ -1,4 +1,3 @@
-
 package com.kabouzeid.gramophone.lastfm.rest.model;

 import com.google.gson.annotations.Expose;
@ -8,7 +7,6 @@ import java.util.ArrayList;
 import java.util.List;

 public class LastFmArtist {
-
    @Expose
    private Artist artist;

@ -21,7 +19,6 @@ public class LastFmArtist {
    }

    public static class Artist {
-
        @Expose
        private List<Image> image = new ArrayList<>();
        @Expose
@ -44,7 +41,6 @@ public class LastFmArtist {
        }

        public class Bio {
-
            @Expose
            private String content;

@ -55,11 +51,9 @@ public class LastFmArtist {
            public void setContent(String content) {
                this.content = content;
            }
-
        }

        public static class Image {
-
            @SerializedName("#text")
            @Expose
            private String Text;
@ -81,9 +75,6 @@ public class LastFmArtist {
            public void setSize(String size) {
                this.size = size;
            }
-
        }
-
    }
-
 }
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
@ -257,45 +257,44 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
    }

    private void loadWiki() {
-        final Callback<LastFmAlbum> wikiCallback = new Callback<LastFmAlbum>(){
-            @Override
-            public void onResponse(Call<LastFmAlbum> call, Response<LastFmAlbum> response) {
-                LastFmAlbum lastFmAlbum = response.body();
-                if (lastFmAlbum.getAlbum().getWiki() != null) {
-                    String wik = lastFmAlbum.getAlbum().getWiki().getContent();
-                    if (wik != null && !wik.trim().equals("")) {
-                        wiki = Html.fromHtml(wik);
-                        wikiReady();
-                        return;
-                    }
-                }
-                if(call.request().url().queryParameter("lang") != null) {
-                    //If the "lang" parameter is set and no wiki is given, retry with default language
-                    lastFMRestClient.getApiService().getAlbumInfo(getAlbum().getTitle(), getAlbum().getArtistName(), null).enqueue(this);
-                    return;
-                }
-                wiki = null;
-                wikiReady();
-            }
-
-            @Override
-            public void onFailure(Call<LastFmAlbum> call, Throwable t) {
-                t.printStackTrace();
-                wiki = null;
-            }
-        };
-        lastFMRestClient.getApiService().getAlbumInfo(getAlbum().getTitle(), getAlbum().getArtistName(), Locale.getDefault().getLanguage()).enqueue(wikiCallback);
+        loadWiki(Locale.getDefault().getLanguage());
    }

-    private void wikiReady(){
-        if(!Util.isAllowedToAutoDownload(AlbumDetailActivity.this)) {
-            if(wiki != null) {
-                wikiDialog.setContent(wiki);
-            } else {
-                wikiDialog.dismiss();
-                Toast.makeText(AlbumDetailActivity.this, getResources().getString(R.string.wiki_unavailable), Toast.LENGTH_SHORT).show();
-            }
-        }
+    private void loadWiki(@Nullable final String lang) {
+        wiki = null;
+
+        lastFMRestClient.getApiService()
+                .getAlbumInfo(getAlbum().getTitle(), getAlbum().getArtistName(), lang)
+                .enqueue(new Callback<LastFmAlbum>() {
+                    @Override
+                    public void onResponse(@NonNull Call<LastFmAlbum> call, @NonNull Response<LastFmAlbum> response) {
+                        final LastFmAlbum lastFmAlbum = response.body();
+                        if (lastFmAlbum != null && lastFmAlbum.getAlbum().getWiki() != null) {
+                            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 (!Util.isAllowedToDownloadMetadata(AlbumDetailActivity.this)) {
+                            if (wiki != null) {
+                                wikiDialog.setContent(wiki);
+                            } else {
+                                wikiDialog.dismiss();
+                                Toast.makeText(AlbumDetailActivity.this, getResources().getString(R.string.wiki_unavailable), Toast.LENGTH_SHORT).show();
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<LastFmAlbum> call, @NonNull Throwable t) {
+                        t.printStackTrace();
+                    }
+                });
    }

    @Override
@ -323,15 +322,20 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
                NavigationUtil.goToArtist(this, getAlbum().getArtistId());
                return true;
            case R.id.action_wiki:
-                if(Util.isAllowedToAutoDownload(AlbumDetailActivity.this)) {
+                if (wikiDialog == null) {
+                    wikiDialog = new MaterialDialog.Builder(this)
+                            .title(album.getTitle())
+                            .positiveText(android.R.string.ok)
+                            .build();
+                }
+                if (Util.isAllowedToDownloadMetadata(this)) {
                    if (wiki != null) {
                        wikiDialog.setContent(wiki);
                        wikiDialog.show();
                    } else {
-                        Toast.makeText(AlbumDetailActivity.this, getResources().getString(R.string.wiki_unavailable), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(this, getResources().getString(R.string.wiki_unavailable), Toast.LENGTH_SHORT).show();
                    }
-                }
-                else {
+                } else {
                    wikiDialog.show();
                    loadWiki();
                }
@ -402,13 +406,11 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
    private void setAlbum(Album album) {
        this.album = album;
        loadAlbumCover();
-        if(Util.isAllowedToAutoDownload(AlbumDetailActivity.this))
+
+        if (Util.isAllowedToDownloadMetadata(this)) {
            loadWiki();
-        wikiDialog=new MaterialDialog.Builder(AlbumDetailActivity.this)
-                .title(album.getTitle())
-                .content("")
-                .positiveText(android.R.string.ok)
-                .build();
+        }
+
        albumTitleView.setText(album.getTitle());
        adapter.swapDataSet(album.songs);
    }
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
@ -117,7 +117,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
        supportPostponeEnterTransition();

        lastFMRestClient = new LastFMRestClient(this);
-        usePalette=PreferenceUtil.getInstance(this).albumArtistColoredFooters();
+        usePalette = PreferenceUtil.getInstance(this).albumArtistColoredFooters();

        initViews();
        setUpObservableListViewParams();
@ -226,45 +226,45 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
    }

    private void loadBiography() {
-        final Callback<LastFmArtist> bioCallback = new Callback<LastFmArtist>(){
-            @Override
-            public void onResponse(Call<LastFmArtist> call, Response<LastFmArtist> response) {
-                LastFmArtist lastFmArtist = response.body();
-                if (lastFmArtist.getArtist() != null) {
-                    String bio = lastFmArtist.getArtist().getBio().getContent();
-                    if (bio != null && !bio.trim().equals("")) {
-                        biography = Html.fromHtml(bio);
-                        biographyReady();
-                        return;
-                    }
-                    else if(call.request().url().queryParameter("lang") != null) {
-                        //If the "lang" parameter is set and no biography is given, retry with default language
-                        lastFMRestClient.getApiService().getArtistInfo(getArtist().getName(), null, null).enqueue(this);
-                        return;
-                    }
-                }
-                biography = null;
-                biographyReady();
-            }
-
-            @Override
-            public void onFailure(Call<LastFmArtist> call, Throwable t) {
-                t.printStackTrace();
-                biography = null;
-            }
-        };
-        lastFMRestClient.getApiService().getArtistInfo(getArtist().getName(), Locale.getDefault().getLanguage(), null).enqueue(bioCallback);
+        loadBiography(Locale.getDefault().getLanguage());
    }

-    private void biographyReady() {
-        if(!Util.isAllowedToAutoDownload(ArtistDetailActivity.this)) {
-            if(biography != null) {
-                biographyDialog.setContent(biography);
-            } else {
-                biographyDialog.dismiss();
-                Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.biography_unavailable), Toast.LENGTH_SHORT).show();
-            }
-        }
+    private void loadBiography(@Nullable final String lang) {
+        biography = null;
+
+        lastFMRestClient.getApiService()
+                .getArtistInfo(getArtist().getName(), lang, null)
+                .enqueue(new Callback<LastFmArtist>() {
+                    @Override
+                    public void onResponse(@NonNull Call<LastFmArtist> call, @NonNull Response<LastFmArtist> 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;
+                            }
+                        }
+
+                        if (!Util.isAllowedToDownloadMetadata(ArtistDetailActivity.this)) {
+                            if (biography != null) {
+                                biographyDialog.setContent(biography);
+                            } else {
+                                biographyDialog.dismiss();
+                                Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.biography_unavailable), Toast.LENGTH_SHORT).show();
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<LastFmArtist> call, @NonNull Throwable t) {
+                        t.printStackTrace();
+                        biography = null;
+                    }
+                });
    }

    private void loadArtistImage(final boolean forceDownload) {
@ -357,15 +357,20 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
                super.onBackPressed();
                return true;
            case R.id.action_biography:
-                if(Util.isAllowedToAutoDownload(ArtistDetailActivity.this)) {
+                if (biographyDialog == null) {
+                    biographyDialog = new MaterialDialog.Builder(this)
+                            .title(artist.getName())
+                            .positiveText(android.R.string.ok)
+                            .build();
+                }
+                if (Util.isAllowedToDownloadMetadata(ArtistDetailActivity.this)) {
                    if (biography != null) {
                        biographyDialog.setContent(biography);
                        biographyDialog.show();
                    } else {
                        Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.biography_unavailable), Toast.LENGTH_SHORT).show();
                    }
-                }
-                else {
+                } else {
                    biographyDialog.show();
                    loadBiography();
                }
@ -435,13 +440,11 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
    private void setArtist(Artist artist) {
        this.artist = artist;
        loadArtistImage(false);
-        if(Util.isAllowedToAutoDownload(ArtistDetailActivity.this))
+
+        if (Util.isAllowedToDownloadMetadata(this)) {
            loadBiography();
-        biographyDialog=new MaterialDialog.Builder(ArtistDetailActivity.this)
-                .title(artist.getName())
-                .content("")
-                .positiveText(android.R.string.ok)
-                .build();
+        }
+
        artistName.setText(artist.getName());
        songAdapter.swapDataSet(artist.getSongs());
        albumAdapter.swapDataSet(artist.albums);
--- a/app/src/main/java/com/kabouzeid/gramophone/util/Util.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/Util.java
@ -121,7 +121,7 @@ public class Util {
        } else return false;
    }

-    public static boolean isAllowedToAutoDownload(final Context context) {
+    public static boolean isAllowedToDownloadMetadata(final Context context) {
        switch (PreferenceUtil.getInstance(context).autoDownloadImagesPolicy()) {
            case "always":
                return true;
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -115,7 +115,7 @@
    <string name="pref_title_navigation_bar">شريط تنقل ملون</string>
    <string name="pref_title_set_default_start_page">صفحة البدء</string>
    <string name="pref_title_album_art_on_lockscreen">أظهر صورة الألبوم</string>
-    <string name="pref_title_auto_download_artist_images">حمل صور الفنانين تلقائياً</string>
+    <string name="pref_title_auto_download_metadata">حمل صور الفنانين تلقائياً</string>
    <string name="pref_title_blurred_album_art">تغييم صورة الألبوم</string>
    <string name="pref_title_colored_notification">إشعار ملون</string>
    <string name="pref_title_ignore_media_store_artwork">تجاهل صور متجر الوسائط</string>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@ -117,7 +117,7 @@
    <string name="pref_title_navigation_bar">Оцветени навигационни бутони</string>
    <string name="pref_title_set_default_start_page">Начална страница</string>
    <string name="pref_title_album_art_on_lockscreen">Покажи обложката на албум</string>
-    <string name="pref_title_auto_download_artist_images">Автоматично изтегляне на изображения на артист</string>
+    <string name="pref_title_auto_download_metadata">Автоматично изтегляне на изображения на артист</string>
    <string name="pref_title_blurred_album_art">Размажи обложката</string>
    <string name="pref_title_colored_notification">Оцвети известията</string>
    <string name="pref_title_ignore_media_store_artwork">Игнорирай вградените обложки</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -122,7 +122,7 @@
    <string name="pref_title_app_shortcuts">Barevné zkratky aplikace</string>
    <string name="pref_title_set_default_start_page">Zvolit výchozí obrazovku</string>
    <string name="pref_title_album_art_on_lockscreen">Obal alba na odemykací obrazovce</string>
-    <string name="pref_title_auto_download_artist_images">Automaticky stahovat obrázky umělců</string>
+    <string name="pref_title_auto_download_metadata">Automaticky stahovat obrázky umělců</string>
    <string name="pref_title_blurred_album_art">Rozostřit obal alba</string>
    <string name="pref_title_colored_notification">Barevné notifikace</string>
    <string name="pref_title_ignore_media_store_artwork">Ignorovat obaly Media Storu</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -122,7 +122,7 @@
    <string name="pref_title_app_shortcuts">Gefärbte App-Shortcuts</string>
    <string name="pref_title_set_default_start_page">Startseite</string>
    <string name="pref_title_album_art_on_lockscreen">Album Cover anzeigen</string>
-    <string name="pref_title_auto_download_artist_images">Interpreten Bilder automatisch herunterladen</string>
+    <string name="pref_title_auto_download_metadata">Interpreten Bilder automatisch herunterladen</string>
    <string name="pref_title_blurred_album_art">Album Cover weichzeichnen</string>
    <string name="pref_title_colored_notification">Gefärbte Benachrichtigung</string>
    <string name="pref_title_ignore_media_store_artwork">Media Store Cover ignorieren</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -118,7 +118,7 @@
    <string name="pref_title_navigation_bar">Έγχρωμη μπάρα πλοήγησης</string>
    <string name="pref_title_set_default_start_page">Αρχική σελίδα</string>
    <string name="pref_title_album_art_on_lockscreen">Εμφάνιση album art</string>
-    <string name="pref_title_auto_download_artist_images">Αυτόματο κατέβασμα πορτρέτων καλλιτεχνών</string>
+    <string name="pref_title_auto_download_metadata">Αυτόματο κατέβασμα πορτρέτων καλλιτεχνών</string>
    <string name="pref_title_blurred_album_art">Θάμπωμα πορτρέτων καλλιτεχνών</string>
    <string name="pref_title_colored_notification">Χρωματιστή πλοήγηση</string>
    <string name="pref_title_ignore_media_store_artwork">Παράληψη των album art στην SD</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -122,7 +122,7 @@
    <string name="pref_title_app_shortcuts">Atajos coloreados de la aplicación</string>
    <string name="pref_title_set_default_start_page">Página de inicio</string>
    <string name="pref_title_album_art_on_lockscreen">Mostrar carátula del álbum</string>
-    <string name="pref_title_auto_download_artist_images">Descargar automaticamente las fotos de los artistas</string>
+    <string name="pref_title_auto_download_metadata">Descargar automaticamente las fotos de los artistas</string>
    <string name="pref_title_blurred_album_art">Desenfocar carátula de álbum</string>
    <string name="pref_title_colored_notification">Notificación coloreada</string>
    <string name="pref_title_ignore_media_store_artwork">Ignorar carátulas provenientes del almacenamiento local</string>
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@ -122,7 +122,7 @@
    <string name="pref_title_app_shortcuts">Accesos directos coloreados</string>
    <string name="pref_title_set_default_start_page">Sección de inicio</string>
    <string name="pref_title_album_art_on_lockscreen">Mostrar carátula del álbum</string>
-    <string name="pref_title_auto_download_artist_images">Descarga automática de imágenes de artistas</string>
+    <string name="pref_title_auto_download_metadata">Descarga automática de imágenes de artistas</string>
    <string name="pref_title_blurred_album_art">Desenfocar imagen de álbum</string>
    <string name="pref_title_colored_notification">Notificación coloreada</string>
    <string name="pref_title_ignore_media_store_artwork">Ignorar imágenes de la librería del sistema</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -117,7 +117,7 @@
    <string name="pref_title_navigation_bar">Värillinen navigointipalkki</string>
    <string name="pref_title_set_default_start_page">Aloitussivu</string>
    <string name="pref_title_album_art_on_lockscreen">Näytä albumin kansi</string>
-    <string name="pref_title_auto_download_artist_images">Lataa automaattisesti artistien kuvat</string>
+    <string name="pref_title_auto_download_metadata">Lataa automaattisesti artistien kuvat</string>
    <string name="pref_title_blurred_album_art">Sumenna albumin kansi</string>
    <string name="pref_title_colored_notification">Värillinen ilmoitus</string>
    <string name="pref_title_ignore_media_store_artwork">Sivuuta Media Storen albumikannet</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -122,7 +122,7 @@
    <string name="pref_title_app_shortcuts">Raccourcis de l\'application colorés</string>
    <string name="pref_title_set_default_start_page">Page d\'accueil</string>
    <string name="pref_title_album_art_on_lockscreen">Afficher la pochette d\'album</string>
-    <string name="pref_title_auto_download_artist_images">Télécharger automatiquement les images</string>
+    <string name="pref_title_auto_download_metadata">Télécharger automatiquement les images</string>
    <string name="pref_title_blurred_album_art">Pochette d\'album floue</string>
    <string name="pref_title_colored_notification">Notification colorée</string>
    <string name="pref_title_ignore_media_store_artwork">Ignorer le stockage des pochettes</string>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -116,7 +116,7 @@
    <string name="pref_title_navigation_bar">סרגל ניווט צבעוני</string>
    <string name="pref_title_set_default_start_page">עמוד פתיחה</string>
    <string name="pref_title_album_art_on_lockscreen">הצג עטיפת אלבום</string>
-    <string name="pref_title_auto_download_artist_images">הורדה אוטומטית של תמונות האמן</string>
+    <string name="pref_title_auto_download_metadata">הורדה אוטומטית של תמונות האמן</string>
    <string name="pref_title_blurred_album_art">טשטוש עטיפת האלבום</string>
    <string name="pref_title_colored_notification">התראה צבעונית</string>
    <string name="pref_title_gapless_playback">ניגון ללא מרווחים בין השירים</string>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -117,7 +117,7 @@
    <string name="pref_title_navigation_bar">Obojena navigacijska traka</string>
    <string name="pref_title_set_default_start_page">Početna stranica</string>
    <string name="pref_title_album_art_on_lockscreen">Prikaži omot albuma na zaklj. zaslonu</string>
-    <string name="pref_title_auto_download_artist_images">Automatski preuzmi slike izvođača</string>
+    <string name="pref_title_auto_download_metadata">Automatski preuzmi slike izvođača</string>
    <string name="pref_title_blurred_album_art">Zamagli omot albuma</string>
    <string name="pref_title_colored_notification">Obojene obavijesti</string>
    <string name="pref_title_ignore_media_store_artwork">Ignoriraj Media Store omote</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -122,7 +122,7 @@
    <string name="pref_title_app_shortcuts">Színes alkalmazás hivatkozások</string>
    <string name="pref_title_set_default_start_page">Kezdő oldal</string>
    <string name="pref_title_album_art_on_lockscreen">Albumboritó megjelenítése</string>
-    <string name="pref_title_auto_download_artist_images">Előadó képének automatikus letöltése</string>
+    <string name="pref_title_auto_download_metadata">Előadó képének automatikus letöltése</string>
    <string name="pref_title_blurred_album_art">Albumborító elhomályosítása</string>
    <string name="pref_title_colored_notification">Színezett értesítés</string>
    <string name="pref_title_ignore_media_store_artwork">A médiában tárolt albumborítók figyelmen kívül hagyása</string>
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@ -117,7 +117,7 @@
    <string name="pref_title_navigation_bar">Warnai alat navigasi di bagian bawah layar</string>
    <string name="pref_title_set_default_start_page">Halaman awal</string>
    <string name="pref_title_album_art_on_lockscreen">Perlihatkan sampul album pada layar kunci</string>
-    <string name="pref_title_auto_download_artist_images">Unduh otomatis gambar-gambar artis</string>
+    <string name="pref_title_auto_download_metadata">Unduh otomatis gambar-gambar artis</string>
    <string name="pref_title_blurred_album_art">Buramkan sampul album</string>
    <string name="pref_title_colored_notification">Notifikasi berwarna</string>
    <string name="pref_title_ignore_media_store_artwork">Abaikan sampul-sampul dari \'Media Store\' android.</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -117,7 +117,7 @@
    <string name="pref_title_navigation_bar">Warnai alat navigasi di bagian bawah layar</string>
    <string name="pref_title_set_default_start_page">Halaman awal</string>
    <string name="pref_title_album_art_on_lockscreen">Perlihatkan sampul album pada layar kunci</string>
-    <string name="pref_title_auto_download_artist_images">Unduh otomatis gambar-gambar artis</string>
+    <string name="pref_title_auto_download_metadata">Unduh otomatis gambar-gambar artis</string>
    <string name="pref_title_blurred_album_art">Buramkan sampul album</string>
    <string name="pref_title_colored_notification">Notifikasi berwarna</string>
    <string name="pref_title_ignore_media_store_artwork">Abaikan sampul-sampul dari \'Media Store\' android.</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -122,7 +122,7 @@
    <string name="pref_title_app_shortcuts">Scorciatoie app colorate</string>
    <string name="pref_title_set_default_start_page">Pagina iniziale</string>
    <string name="pref_title_album_art_on_lockscreen">Mostra copertina album nella schermata di blocco</string>
-    <string name="pref_title_auto_download_artist_images">Scarica automaticamente le immagini degli artisti</string>
+    <string name="pref_title_auto_download_metadata">Scarica automaticamente le immagini degli artisti</string>
    <string name="pref_title_blurred_album_art">Sfoca la copertina</string>
    <string name="pref_title_colored_notification">Notifica colorata</string>
    <string name="pref_title_ignore_media_store_artwork">Ignora le copertine del Media Store</string>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@ -116,7 +116,7 @@
    <string name="pref_title_navigation_bar">סרגל ניווט צבעוני</string>
    <string name="pref_title_set_default_start_page">עמוד פתיחה</string>
    <string name="pref_title_album_art_on_lockscreen">הצג עטיפת אלבום</string>
-    <string name="pref_title_auto_download_artist_images">הורדה אוטומטית של תמונות האמן</string>
+    <string name="pref_title_auto_download_metadata">הורדה אוטומטית של תמונות האמן</string>
    <string name="pref_title_blurred_album_art">טשטוש עטיפת האלבום</string>
    <string name="pref_title_colored_notification">התראה צבעונית</string>
    <string name="pref_title_gapless_playback">ניגון ללא מרווחים בין השירים</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -107,7 +107,7 @@
    <string name="pref_title_navigation_bar">ナビゲーションバーの彩色設定</string>
    <string name="pref_title_set_default_start_page">起動時の画面</string>
    <string name="pref_title_album_art_on_lockscreen">アルバムアートをロック画面に表示する</string>
-    <string name="pref_title_auto_download_artist_images">アーティスト画像の自動ダウンロード</string>
+    <string name="pref_title_auto_download_metadata">アーティスト画像の自動ダウンロード</string>
    <string name="pref_title_blurred_album_art">アルバムアートにぼかし効果をかける</string>
    <string name="pref_title_colored_notification">通知コントロールに色を付ける</string>
    <string name="pref_title_ignore_media_store_artwork">アルバムアートを直接読み込む</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -112,7 +112,7 @@
    <string name="pref_title_navigation_bar">내비게이션 바 색상 틴트</string>
    <string name="pref_title_set_default_start_page">시작 화면</string>
    <string name="pref_title_album_art_on_lockscreen">앨범 커버 보이기</string>
-    <string name="pref_title_auto_download_artist_images">아티스트 이미지 자동 다운로드</string>
+    <string name="pref_title_auto_download_metadata">아티스트 이미지 자동 다운로드</string>
    <string name="pref_title_blurred_album_art">앨범 커버 블러 효과</string>
    <string name="pref_title_colored_notification">알림 색상 틴트</string>
    <string name="pref_title_ignore_media_store_artwork">미디어 스토어 앨범 커버 무시</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -121,7 +121,7 @@
    <string name="pref_title_navigation_bar">Gekleurde navigatiebalk</string>
    <string name="pref_title_set_default_start_page">Startpagina</string>
    <string name="pref_title_album_art_on_lockscreen">Toon albumhoes</string>
-    <string name="pref_title_auto_download_artist_images">Download artiesten afbeeldingen</string>
+    <string name="pref_title_auto_download_metadata">Download artiesten afbeeldingen</string>
    <string name="pref_title_blurred_album_art">Vervaag albumhoes</string>
    <string name="pref_title_colored_notification">Gekleurde notificatie</string>
    <string name="pref_title_ignore_media_store_artwork">Negeer Mediaopslag illustraties</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -117,7 +117,7 @@
    <string name="pref_title_navigation_bar">Kolorowy pasek nawigacyjny</string>
    <string name="pref_title_set_default_start_page">Strona startowa</string>
    <string name="pref_title_album_art_on_lockscreen">Pokazuj okładki albumów</string>
-    <string name="pref_title_auto_download_artist_images">Automatyczne pobieranie zdjęć wykonawców</string>
+    <string name="pref_title_auto_download_metadata">Automatyczne pobieranie zdjęć wykonawców</string>
    <string name="pref_title_blurred_album_art">Rozmywanie okładki albumu</string>
    <string name="pref_title_colored_notification">Kolorowy odtwarzacz w pasku powiadomień</string>
    <string name="pref_title_ignore_media_store_artwork">Ignoruj okładki z Media Store</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -117,7 +117,7 @@
    <string name="pref_title_navigation_bar">Barra de navegação colorida</string>
    <string name="pref_title_set_default_start_page">Página inicial</string>
    <string name="pref_title_album_art_on_lockscreen">Visualizar capa do álbum</string>
-    <string name="pref_title_auto_download_artist_images">Baixar as imagens dos artistas automaticamente</string>
+    <string name="pref_title_auto_download_metadata">Baixar as imagens dos artistas automaticamente</string>
    <string name="pref_title_blurred_album_art">Capa de álbum esmaecida</string>
    <string name="pref_title_colored_notification">Notificação colorida</string>
    <string name="pref_title_ignore_media_store_artwork">Ignorar capas Media Store</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -117,7 +117,7 @@
    <string name="pref_title_navigation_bar">Barra de navegação colorida</string>
    <string name="pref_title_set_default_start_page">Página Inicial</string>
    <string name="pref_title_album_art_on_lockscreen">Mostrar capa do álbum</string>
-    <string name="pref_title_auto_download_artist_images">Download automático das imagens dos artistas</string>
+    <string name="pref_title_auto_download_metadata">Download automático das imagens dos artistas</string>
    <string name="pref_title_blurred_album_art">Desfocar capa do álbum</string>
    <string name="pref_title_colored_notification">Notificação colorida</string>
    <string name="pref_title_ignore_media_store_artwork">Ignorar capas Media Store</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -122,7 +122,7 @@
    <string name="pref_title_app_shortcuts">Цветные шорткаты</string>
    <string name="pref_title_set_default_start_page">Установить начальную страницу</string>
    <string name="pref_title_album_art_on_lockscreen">Показывать обложку альбома</string>
-    <string name="pref_title_auto_download_artist_images">Автоматически загружать изображения исполнителей</string>
+    <string name="pref_title_auto_download_metadata">Автоматически загружать изображения исполнителей</string>
    <string name="pref_title_blurred_album_art">"Размытая обложка альбома "</string>
    <string name="pref_title_colored_notification">Окрашенное уведомление</string>
    <string name="pref_title_ignore_media_store_artwork">Игнорировать хранилище обложек альбомов</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -122,7 +122,7 @@
    <string name="pref_title_app_shortcuts">Renkli uygulama kısayolları</string>
    <string name="pref_title_set_default_start_page">Başlangıç sayfası</string>
    <string name="pref_title_album_art_on_lockscreen">Albüm kapağını göster</string>
-    <string name="pref_title_auto_download_artist_images">Sanatçı resimlerini otomatik indir</string>
+    <string name="pref_title_auto_download_metadata">Sanatçı resimlerini otomatik indir</string>
    <string name="pref_title_blurred_album_art">Bulanık albüm kapağı</string>
    <string name="pref_title_colored_notification">Renkli bildirim</string>
    <string name="pref_title_ignore_media_store_artwork">Media Store albüm kapağını yoksay</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -117,7 +117,7 @@
    <string name="pref_title_navigation_bar">Кольорова панель навігації</string>
    <string name="pref_title_set_default_start_page">Початкова сторінка</string>
    <string name="pref_title_album_art_on_lockscreen">Показати обкладинку альбому</string>
-    <string name="pref_title_auto_download_artist_images">Автоматично завантажувати зображення виконавців</string>
+    <string name="pref_title_auto_download_metadata">Автоматично завантажувати зображення виконавців</string>
    <string name="pref_title_blurred_album_art">Розмити обкладинку альбому</string>
    <string name="pref_title_colored_notification">Кольорове сповіщення</string>
    <string name="pref_title_ignore_media_store_artwork">Ігнорувати обкладинки з Медіасховища.</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -122,7 +122,7 @@
    <string name="pref_title_app_shortcuts">Màu sắc biểu tượng ứng dụng</string>
    <string name="pref_title_set_default_start_page">Trang bắt đầu</string>
    <string name="pref_title_album_art_on_lockscreen">Hiện bìa album</string>
-    <string name="pref_title_auto_download_artist_images">Tự động tải về hình ảnh nghệ sĩ</string>
+    <string name="pref_title_auto_download_metadata">Tự động tải về hình ảnh nghệ sĩ</string>
    <string name="pref_title_blurred_album_art">Làm mờ bìa album</string>
    <string name="pref_title_colored_notification">Màu thông báo</string>
    <string name="pref_title_ignore_media_store_artwork">Bỏ qua kho ảnh bìa trong Kho Phương tiện</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -122,7 +122,7 @@
    <string name="pref_title_app_shortcuts">着色应用快捷方式</string>
    <string name="pref_title_set_default_start_page">起始页</string>
    <string name="pref_title_album_art_on_lockscreen">显示专辑封面</string>
-    <string name="pref_title_auto_download_artist_images">自动下载艺术家图像</string>
+    <string name="pref_title_auto_download_metadata">自动下载艺术家图像</string>
    <string name="pref_title_blurred_album_art">专辑封面模糊化</string>
    <string name="pref_title_colored_notification">启用通知背景着色</string>
    <string name="pref_title_ignore_media_store_artwork">忽略媒体储存中的专辑封面</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -123,7 +123,7 @@
    <string name="pref_title_app_shortcuts">彩色的應用快捷方式</string>
    <string name="pref_title_set_default_start_page">首頁</string>
    <string name="pref_title_album_art_on_lockscreen">顯示專輯封面</string>
-    <string name="pref_title_auto_download_artist_images">自動下載演出者圖片</string>
+    <string name="pref_title_auto_download_metadata">自動下載演出者圖片</string>
    <string name="pref_title_blurred_album_art">將專輯圖片模糊化</string>
    <string name="pref_title_colored_notification">彩色的狀態列</string>
    <string name="pref_title_ignore_media_store_artwork">忽略音訊檔內嵌的專輯封面</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -38,8 +38,8 @@
    <string name="songs">Songs</string>
    <string name="playlists">Playlists</string>
    <string name="unplayable_file">Couldn\u2019t play this song.</string>
-    <string name="biography_unavailable">Couldn\u2019t find the artists biography.</string>
-    <string name="wiki_unavailable">Couldn\u2019t find the albums wiki.</string>
+    <string name="biography_unavailable">Couldn\u2019t find a biography entry for this artist.</string>
+    <string name="wiki_unavailable">Couldn\u2019t find a wiki entry for this album.</string>
    <string name="biography">Biography</string>
    <string name="wiki">Wiki</string>
    <string name="audio_focus_denied">Audio focus denied.</string>
@ -131,7 +131,7 @@
    <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
    <string name="pref_title_set_default_start_page">Start page</string>
    <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
-    <string name="pref_title_auto_download_artist_images">Auto download meta data</string>
+    <string name="pref_title_auto_download_metadata">Auto download metadata</string>
    <string name="pref_title_blurred_album_art">Blur album cover</string>
    <string name="pref_title_colored_notification">Colored notification</string>
    <string name="pref_title_classic_notification">Classic notification design</string>
--- a/app/src/main/res/xml/pref_images.xml
+++ b/app/src/main/res/xml/pref_images.xml
@ -16,7 +16,7 @@
            android:key="auto_download_images_policy"
            android:negativeButtonText="@null"
            android:positiveButtonText="@null"
-            android:title="@string/pref_title_auto_download_artist_images" />
+            android:title="@string/pref_title_auto_download_metadata" />

    </com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>