Funkwhale/ultrasonic-app-subsonic-android
1
0
Fork 0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-02-12 09:40:44 +01:00
Code Issues Releases Wiki Activity

Merge pull request #162 from ultrasonic/bug/fix-cache-dir-not-created

Browse Source 
Fix wrong handling empty strings.
This commit is contained in:
Yahor Berdnikau 2018-02-10 20:14:27 +01:00 committed by GitHub
commit 90ea207e36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicDirectory.java
View File

@ -18,6 +18,8 @@
*/ */
package org.moire.ultrasonic.domain; package org.moire.ultrasonic.domain;
import android.support.annotation.NonNull;
import java.io.Serializable; import java.io.Serializable;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -352,6 +354,7 @@ public class MusicDirectory
this.bitRate = bitRate; this.bitRate = bitRate;
} }
@NonNull
public String getCoverArt() public String getCoverArt()
{ {
return coverArt; return coverArt;

4
ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java
View File

@ -21,6 +21,7 @@ package org.moire.ultrasonic.service;
import android.content.Context; import android.content.Context;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.PowerManager; import android.os.PowerManager;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import org.moire.ultrasonic.domain.MusicDirectory; import org.moire.ultrasonic.domain.MusicDirectory;
@ -457,8 +458,7 @@ public class DownloadFile
{ {
try try
{ {
if (song.getCoverArt() != null) if (!TextUtils.isEmpty(song.getCoverArt())) {
{
int size = Util.getMinDisplayMetric(context); int size = Util.getMinDisplayMetric(context);
musicService.getCoverArt(context, song, size, true, true, null); musicService.getCoverArt(context, song, size, true, true, null);
} }

3
ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java
View File

@ -23,6 +23,7 @@ import android.graphics.Bitmap;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.annotation.StringRes; import android.support.annotation.StringRes;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import org.moire.ultrasonic.R; import org.moire.ultrasonic.R;
@ -654,7 +655,7 @@ public class RESTMusicService implements MusicService {
Log.d(TAG, "Loading cover art for: " + entry); Log.d(TAG, "Loading cover art for: " + entry);
final String id = entry.getCoverArt(); final String id = entry.getCoverArt();
if (id == null || id.isEmpty()) { if (TextUtils.isEmpty(id)) {
return null; // Can't load return null; // Can't load
} }

8
ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java
View File

@ -22,6 +22,7 @@ import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.os.Environment; import android.os.Environment;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import org.moire.ultrasonic.activity.SubsonicTabActivity; import org.moire.ultrasonic.activity.SubsonicTabActivity;
@ -324,13 +325,10 @@ public class FileUtil
File dir; File dir;
if (entry.getPath() != null) if (!TextUtils.isEmpty(entry.getPath())) {
{
File f = new File(fileSystemSafeDir(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())); dir = new File(String.format("%s/%s", getMusicDirectory(context).getPath(), entry.isDirectory() ? f.getPath() : f.getParent()));
} } else {
else
{
String artist = fileSystemSafe(entry.getArtist()); String artist = fileSystemSafe(entry.getArtist());
String album = fileSystemSafe(entry.getAlbum()); String album = fileSystemSafe(entry.getAlbum());

7
ultrasonic/src/main/java/org/moire/ultrasonic/util/ImageLoader.java
View File

@ -25,6 +25,7 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.TransitionDrawable; import android.graphics.drawable.TransitionDrawable;
import android.os.Handler; import android.os.Handler;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
@ -179,8 +180,7 @@ public class ImageLoader implements Runnable
String coverArt = entry.getCoverArt(); String coverArt = entry.getCoverArt();
if (coverArt == null) if (TextUtils.isEmpty(coverArt)) {
{
setUnknownImage(view, large); setUnknownImage(view, large);
return; return;
} }
@ -230,8 +230,7 @@ public class ImageLoader implements Runnable
String coverArt = entry.getCoverArt(); String coverArt = entry.getCoverArt();
if (coverArt == null) if (TextUtils.isEmpty(coverArt)) {
{
return null; return null;
} }