Merge branch 'master' into new_disk_cache_api

Author: nostra13

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

@@ -59,6 +59,7 @@ public DisplayBitmapTask(Bitmap bitmap, ImageLoadingInfo imageLoadingInfo, Image
 		this.loadedFrom = loadedFrom;
 	}
 
+	@Override
 	public void run() {
 		if (imageAware.isCollected()) {
 			if (loggingEnabled) L.d(LOG_TASK_CANCELLED_IMAGEAWARE_COLLECTED, memoryCacheKey);

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

@@ -44,7 +44,7 @@ class ImageLoaderEngine {
 
 	private Executor taskExecutor;
 	private Executor taskExecutorForCachedImages;
-	private ExecutorService taskDistributor;
+	private Executor taskDistributor;
 
 	private final Map<Integer, String> cacheKeysForImageAwares = Collections
 			.synchronizedMap(new HashMap<Integer, String>());
@@ -181,6 +181,10 @@ void stop() {
 		uriLocks.clear();
 	}
 
+	void fireCallback(Runnable r) {
+		taskDistributor.execute(r);
+	}
+
 	ReentrantLock getLockForUri(String uri) {
 		ReentrantLock lock = uriLocks.get(uri);
 		if (lock == null) {

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

@@ -173,7 +173,7 @@ public void run() {
 
 		DisplayBitmapTask displayBitmapTask = new DisplayBitmapTask(bmp, imageLoadingInfo, engine, loadedFrom);
 		displayBitmapTask.setLoggingEnabled(writeLogs);
-		runTask(displayBitmapTask, options.isSyncLoading(), handler);
+		runTask(displayBitmapTask, options.isSyncLoading(), handler, engine);
 	}
 
 	/** @return <b>true</b> - if task should be interrupted; <b>false</b> - otherwise */
@@ -334,7 +334,7 @@ public void run() {
 				progressListener.onProgressUpdate(uri, imageAware.getWrappedView(), current, total);
 			}
 		};
-		runTask(r, false, handler);
+		runTask(r, false, handler, engine);
 		return true;
 	}
 
@@ -349,7 +349,7 @@ public void run() {
 				listener.onLoadingFailed(uri, imageAware.getWrappedView(), new FailReason(failType, failCause));
 			}
 		};
-		runTask(r, false, handler);
+		runTask(r, false, handler, engine);
 	}
 
 	private void fireCancelEvent() {
@@ -360,7 +360,7 @@ public void run() {
 				listener.onLoadingCancelled(uri, imageAware.getWrappedView());
 			}
 		};
-		runTask(r, false, handler);
+		runTask(r, false, handler, engine);
 	}
 
 	private ImageDownloader getDownloader() {
@@ -457,11 +457,11 @@ private void log(String message, Object... args) {
 		if (writeLogs) L.d(message, args);
 	}
 
-	static void runTask(Runnable r, boolean sync, Handler handler) {
+	static void runTask(Runnable r, boolean sync, Handler handler, ImageLoaderEngine engine) {
 		if (sync) {
 			r.run();
 		} else if (handler == null) {
-			new Thread(r).start();
+			engine.fireCallback(r);
 		} else {
 			handler.post(r);
 		}

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

@@ -55,6 +55,6 @@ public void run() {
 		DisplayBitmapTask displayBitmapTask = new DisplayBitmapTask(processedBitmap, imageLoadingInfo, engine,
 				LoadedFrom.MEMORY_CACHE);
 		displayBitmapTask.setLoggingEnabled(engine.configuration.writeLogs);
-		LoadAndDisplayImageTask.runTask(displayBitmapTask, imageLoadingInfo.options.isSyncLoading(), handler);
+		LoadAndDisplayImageTask.runTask(displayBitmapTask, imageLoadingInfo.options.isSyncLoading(), handler, engine);
 	}
 }