From 009567c83e5083571b68dd518f20acee938894d4 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sat, 10 Feb 2018 20:08:57 +0100 Subject: [PATCH] Fix app may use wrong folder to store music. Signed-off-by: Yahor Berdnikau --- .../src/main/java/org/moire/ultrasonic/util/FileUtil.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java index e885d24f..2a64aa10 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java @@ -22,6 +22,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Environment; +import android.text.TextUtils; import android.util.Log; import org.moire.ultrasonic.activity.SubsonicTabActivity; @@ -324,13 +325,10 @@ public class FileUtil File dir; - if (entry.getPath() != null) - { + if (!TextUtils.isEmpty(entry.getPath())) { File f = new File(fileSystemSafeDir(entry.getPath())); dir = new File(String.format("%s/%s", getMusicDirectory(context).getPath(), entry.isDirectory() ? f.getPath() : f.getParent())); - } - else - { + } else { String artist = fileSystemSafe(entry.getArtist()); String album = fileSystemSafe(entry.getAlbum());