CHanged API: Removed ImageLoaderConfiguration.offOutOfMemoryHandling().

Not handle OOM by default (but still catch).

Author: nostra13

library/src/com/nostra13/universalimageloader/core/ImageLoaderConfiguration.java

@@ -25,8 +25,6 @@
 import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiscCache;
 import com.nostra13.universalimageloader.cache.disc.naming.FileNameGenerator;
 import com.nostra13.universalimageloader.cache.memory.MemoryCacheAware;
-import com.nostra13.universalimageloader.core.assist.FailReason;
-import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
 import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
 import com.nostra13.universalimageloader.core.download.ImageDownloader;
 import com.nostra13.universalimageloader.core.download.NetworkDeniedImageDownloader;
@@ -64,7 +62,6 @@ public final class ImageLoaderConfiguration {
 	final int threadPoolSize;
 	final int threadPriority;
 	final QueueProcessingType tasksProcessingType;
-	final boolean handleOutOfMemory;
 
 	final MemoryCacheAware<String, Bitmap> memoryCache;
 	final DiscCacheAware discCache;
@@ -89,7 +86,6 @@ private ImageLoaderConfiguration(final Builder builder) {
 		threadPoolSize = builder.threadPoolSize;
 		threadPriority = builder.threadPriority;
 		tasksProcessingType = builder.tasksProcessingType;
-		handleOutOfMemory = builder.handleOutOfMemory;
 		discCache = builder.discCache;
 		memoryCache = builder.memoryCache;
 		defaultDisplayImageOptions = builder.defaultDisplayImageOptions;
@@ -168,7 +164,6 @@ public static class Builder {
 		private int threadPoolSize = DEFAULT_THREAD_POOL_SIZE;
 		private int threadPriority = DEFAULT_THREAD_PRIORITY;
 		private boolean denyCacheImageMultipleSizesInMemory = false;
-		private boolean handleOutOfMemory = true;
 		private QueueProcessingType tasksProcessingType = DEFAULT_TASK_PROCESSING_TYPE;
 
 		private int memoryCacheSize = DEFAULT_MEMORY_CACHE_SIZE;
@@ -317,17 +312,6 @@ public Builder denyCacheImageMultipleSizesInMemory() {
 			return this;
 		}
 
-		/**
-		 * ImageLoader try clean memory and re-display image it self when {@link OutOfMemoryError} occurs. You can
-		 * switch off this feature by this method and process error by your way (you can know that
-		 * {@link OutOfMemoryError} occurred if you got {@link FailReason#OUT_OF_MEMORY} in
-		 * {@link ImageLoadingListener#onLoadingFailed(FailReason)}).
-		 */
-		public Builder offOutOfMemoryHandling() {
-			this.handleOutOfMemory = false;
-			return this;
-		}
-
 		/**
 		 * Sets type of queue processing for tasks for loading and displaying images.<br />
 		 * Default value - {@link QueueProcessingType#FIFO}

library/src/com/nostra13/universalimageloader/core/LoadAndDisplayImageTask.java

@@ -44,7 +44,6 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Handler;
-import android.os.SystemClock;
 import android.widget.ImageView;
 
 import com.nostra13.universalimageloader.cache.disc.DiscCacheAware;
@@ -69,7 +68,6 @@
  */
 final class LoadAndDisplayImageTask implements Runnable {
 
-	private static final int ATTEMPT_COUNT_TO_DECODE_BITMAP = 3;
 	private static final int BUFFER_SIZE = 8 * 1024; // 8 Kb
 
 	private static final String ALLOWED_URI_CHARS = "@#&=*+-_.,:!?()/~'%";
@@ -271,48 +269,10 @@ private Bitmap tryLoadBitmap() {
 	}
 
 	private Bitmap decodeImage(URI imageUri) throws IOException {
-		Bitmap bmp = null;
-
-		if (configuration.handleOutOfMemory) {
-			bmp = decodeWithOOMHandling(imageUri);
-		} else {
-			ImageDecoder decoder = new ImageDecoder(imageUri, getDownloader(), options);
-			decoder.setLoggingEnabled(loggingEnabled);
-			ViewScaleType viewScaleType = ViewScaleType.fromImageView(imageView);
-			bmp = decoder.decode(targetSize, options.getImageScaleType(), viewScaleType);
-		}
-		return bmp;
-	}
-
-	private Bitmap decodeWithOOMHandling(URI imageUri) throws IOException {
-		Bitmap result = null;
 		ImageDecoder decoder = new ImageDecoder(imageUri, getDownloader(), options);
 		decoder.setLoggingEnabled(loggingEnabled);
-		for (int attempt = 1; attempt <= ATTEMPT_COUNT_TO_DECODE_BITMAP; attempt++) {
-			try {
-				ViewScaleType viewScaleType = ViewScaleType.fromImageView(imageView);
-				result = decoder.decode(targetSize, options.getImageScaleType(), viewScaleType);
-			} catch (OutOfMemoryError e) {
-				L.e(e);
-
-				switch (attempt) {
-					case 1:
-						System.gc();
-						break;
-					case 2:
-						configuration.memoryCache.clear();
-						System.gc();
-						break;
-					case 3:
-						throw e;
-				}
-				// Wait some time while GC is working
-				SystemClock.sleep(attempt * 1000);
-				continue;
-			}
-			break;
-		}
-		return result;
+		ViewScaleType viewScaleType = ViewScaleType.fromImageView(imageView);
+		return decoder.decode(targetSize, options.getImageScaleType(), viewScaleType);
 	}
 
 	private void saveImageOnDisc(File targetFile) throws IOException, URISyntaxException {