From 7fdadd3310168d36f7a3e18d3ea0d051d9338442 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Tue, 26 Jun 2018 12:32:31 +0200 Subject: [PATCH] Fix crash with custom artist images --- .../gramophone/util/CustomArtistImageUtil.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java index 05388751..d3e86fa6 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java @@ -22,8 +22,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; import java.util.Locale; /** @@ -124,13 +122,8 @@ public class CustomArtistImageUtil { } private static String getFileName(Artist artist) { - try { - return String.format(Locale.US, "#%d#%s.jpeg", artist.getId(), URLEncoder.encode(artist.getName(), "UTF-8")); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - // UTF-8 should be always valid - return null; - } + // replace everything that is not a letter or a number with _ + return String.format(Locale.US, "#%d#%s.jpeg", artist.getId(), artist.getName().replaceAll("[^a-zA-Z0-9]", "_")); } public static File getFile(Artist artist) {