From 6362b5d266b79c9a07d9c41bb0571bf4053459b9 Mon Sep 17 00:00:00 2001
From: Joshua Bahnsen <archrival@gmail.com>
Date: Sun, 26 Jan 2014 23:45:21 -0700
Subject: [PATCH] Try to be better with memory when reading bitmaps

---
 res/layout-land/download.xml                           |  2 +-
 .../androidapp/service/DownloadServiceImpl.java        |  2 +-
 .../thejoshwa/ultrasonic/androidapp/util/FileUtil.java | 10 +++++++++-
 .../ultrasonic/androidapp/util/ImageLoader.java        |  7 ++-----
 src/com/thejoshwa/ultrasonic/androidapp/util/Util.java |  6 ++++++
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml
index c6956e11..1fb0425c 100644
--- a/res/layout-land/download.xml
+++ b/res/layout-land/download.xml
@@ -44,7 +44,7 @@
         a:id="@+id/download_control_layout"
         a:layout_width="fill_parent"
         a:layout_height="fill_parent"
-        a:layout_weight="1"
+        a:layout_weight="1.2"
         a:orientation="vertical">
 
         <LinearLayout
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java b/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java
index 14e31535..ad4986f5 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java
@@ -1561,7 +1561,7 @@ public class DownloadServiceImpl extends Service implements DownloadService
 		{
 			MusicDirectory.Entry currentSong = currentPlaying.getSong();
 
-			Bitmap lockScreenBitmap = FileUtil.getAlbumArtBitmap(this, currentSong, 0, true);
+			Bitmap lockScreenBitmap = FileUtil.getAlbumArtBitmap(this, currentSong, Util.getMinDisplayMetric(this), true);
 
 			String artist = currentSong.getArtist();
 			String album = currentSong.getAlbum();
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/FileUtil.java b/src/com/thejoshwa/ultrasonic/androidapp/util/FileUtil.java
index 7ddc713b..d4d9c159 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/util/FileUtil.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/util/FileUtil.java
@@ -169,7 +169,15 @@ public class FileUtil
 				opt.inJustDecodeBounds = false;
 			}
 
-			bitmap = BitmapFactory.decodeFile(albumArtFile.getPath(), opt);
+			try
+			{
+				bitmap = BitmapFactory.decodeFile(albumArtFile.getPath(), opt);
+			}
+			catch (Exception ex)
+			{
+				Log.e(TAG, "Exception in BitmapFactory.decodeFile()", ex);
+			}
+
 			Log.i("getAlbumArtBitmap", String.valueOf(size));
 
 			if (bitmap != null)
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/ImageLoader.java b/src/com/thejoshwa/ultrasonic/androidapp/util/ImageLoader.java
index 5bbb688c..961b78a2 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/util/ImageLoader.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/util/ImageLoader.java
@@ -25,7 +25,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.os.Handler;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
@@ -79,9 +78,7 @@ public class ImageLoader implements Runnable
 			imageSizeDefault = drawable.getIntrinsicHeight();
 		}
 
-		DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-		imageSizeLarge = Math.round(Math.min(metrics.widthPixels, metrics.heightPixels));
-
+		imageSizeLarge = Util.getMaxDisplayMetric(context);
 		createLargeUnknownImage(context);
 	}
 
@@ -195,7 +192,7 @@ public class ImageLoader implements Runnable
 
 		Bitmap bitmap = cache.get(getKey(coverArt, size));
 
-		if (bitmap != null)
+		if (bitmap != null && !bitmap.isRecycled())
 		{
 			Bitmap.Config config = bitmap.getConfig();
 			return bitmap.copy(config, false);
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java b/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java
index 27470e31..e3216912 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java
@@ -1252,6 +1252,12 @@ public class Util extends DownloadActivity
 		return Math.min(metrics.widthPixels, metrics.heightPixels);
 	}
 
+	public static int getMaxDisplayMetric(Context context)
+	{
+		DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+		return Math.max(metrics.widthPixels, metrics.heightPixels);
+	}
+
 	public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight)
 	{
 		// Raw height and width of image