third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-25 13:12:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Resolve a reported crash, fix deprecated method call

Browse Source
This commit is contained in:
Joshua Bahnsen 2013-12-08 00:27:34 -07:00
parent ab088f4f86
commit 13d9af0990
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/thejoshwa/ultrasonic/androidapp/util/FileUtil.java
View File

@ -113,13 +113,20 @@ public class FileUtil
public static File getAlbumArtFile(File albumDir)
{
File albumArtDir = getAlbumArtDirectory();
return new File(albumArtDir, String.format("%s.jpeg", Util.md5Hex(albumDir.getPath())));
if (albumArtDir == null || albumDir == null)
{
return null;
}
String md5Hex = Util.md5Hex(albumDir.getPath());
return new File(albumArtDir, String.format("%s.jpeg", md5Hex));
}
public static Bitmap getAlbumArtBitmap(Context context, MusicDirectory.Entry entry, int size, boolean highQuality) {
File albumArtFile = getAlbumArtFile(context, entry);
if (albumArtFile.exists()) {
if (albumArtFile != null && albumArtFile.exists()) {
final BitmapFactory.Options opt = new BitmapFactory.Options();
if (size > 0) {
@ -434,6 +441,7 @@ public class FileUtil
}
}
@SuppressWarnings({"unchecked"})
public static <T extends Serializable> T deserialize(Context context, String fileName)
{
File file = new File(context.getCacheDir(), fileName);
@ -448,7 +456,8 @@ public class FileUtil
try
{
in = new ObjectInputStream(new FileInputStream(file));
T result = (T) in.readObject();
Object object = in.readObject();
T result = (T) object;
Log.i(TAG, String.format("Deserialized object from %s", file));
return result;
}

2
src/com/thejoshwa/ultrasonic/androidapp/util/Util.java
View File

@ -883,7 +883,7 @@ public class Util extends DownloadActivity
}
catch (Throwable x)
{
return new BitmapDrawable(bitmap);
return new BitmapDrawable(context.getResources(), bitmap);
}
}