Merge pull request nostra13#580 from KeepSafe/add-original-uri

Add original image URI to ImageDecodingInfo

Author: nostra13

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

@@ -228,7 +228,7 @@ private Bitmap tryLoadBitmap() throws TaskCancelledException {
 				loadedFrom = LoadedFrom.DISC_CACHE;
 
 				checkTaskNotActual();
-				bitmap = decodeImage(cacheFileUri);
+				bitmap = decodeImage(cacheFileUri, uri);
 			}
 			if (bitmap == null || bitmap.getWidth() <= 0 || bitmap.getHeight() <= 0) {
 				log(LOG_LOAD_IMAGE_FROM_NETWORK);
@@ -238,7 +238,7 @@ private Bitmap tryLoadBitmap() throws TaskCancelledException {
 						options.isCacheOnDisc() && tryCacheImageOnDisc(imageFile) ? cacheFileUri : uri;
 
 				checkTaskNotActual();
-				bitmap = decodeImage(imageUriForDecoding);
+				bitmap = decodeImage(imageUriForDecoding, uri);
 
 				if (bitmap == null || bitmap.getWidth() <= 0 || bitmap.getHeight() <= 0) {
 					fireFailEvent(FailType.DECODING_ERROR, null);
@@ -278,9 +278,9 @@ private File getImageFileInDiscCache() {
 		return imageFile;
 	}
 
-	private Bitmap decodeImage(String imageUri) throws IOException {
+	private Bitmap decodeImage(String imageUri, String originalImageUri) throws IOException {
 		ViewScaleType viewScaleType = imageAware.getScaleType();
-		ImageDecodingInfo decodingInfo = new ImageDecodingInfo(memoryCacheKey, imageUri, targetSize, viewScaleType,
+		ImageDecodingInfo decodingInfo = new ImageDecodingInfo(memoryCacheKey, imageUri, originalImageUri, targetSize, viewScaleType,
 				getDownloader(), options);
 		return decoder.decode(decodingInfo);
 	}
@@ -335,7 +335,7 @@ private boolean resizeAndSaveImage(File targetFile, int maxWidth, int maxHeight)
 		DisplayImageOptions specialOptions = new DisplayImageOptions.Builder().cloneFrom(options)
 				.imageScaleType(ImageScaleType.IN_SAMPLE_INT).build();
 		ImageDecodingInfo decodingInfo = new ImageDecodingInfo(memoryCacheKey,
-				Scheme.FILE.wrap(targetFile.getAbsolutePath()), targetImageSize, ViewScaleType.FIT_INSIDE,
+				Scheme.FILE.wrap(targetFile.getAbsolutePath()), uri, targetImageSize, ViewScaleType.FIT_INSIDE,
 				getDownloader(), specialOptions);
 		Bitmap bmp = decoder.decode(decodingInfo);
 		if (bmp != null && configuration.processorForDiscCache != null) {

library/src/com/nostra13/universalimageloader/core/decode/ImageDecodingInfo.java

@@ -34,6 +34,7 @@ public class ImageDecodingInfo {
 
 	private final String imageKey;
 	private final String imageUri;
+    private final String originalImageUri;
 	private final ImageSize targetSize;
 
 	private final ImageScaleType imageScaleType;
@@ -45,10 +46,11 @@ public class ImageDecodingInfo {
 	private final boolean considerExifParams;
 	private final Options decodingOptions;
 
-	public ImageDecodingInfo(String imageKey, String imageUri, ImageSize targetSize, ViewScaleType viewScaleType,
+	public ImageDecodingInfo(String imageKey, String imageUri, String originalImageUri, ImageSize targetSize, ViewScaleType viewScaleType,
 							 ImageDownloader downloader, DisplayImageOptions displayOptions) {
 		this.imageKey = imageKey;
 		this.imageUri = imageUri;
+        this.originalImageUri = originalImageUri;
 		this.targetSize = targetSize;
 
 		this.imageScaleType = displayOptions.getImageScaleType();
@@ -99,6 +101,11 @@ public String getImageUri() {
 		return imageUri;
 	}
 
+    /** @return The original uri that the request wanted */
+    public String getOriginalImageUri() {
+        return originalImageUri;
+    }
+
 	/**
 	 * @return Target size for image. Decoded bitmap should close to this size according to {@linkplain ImageScaleType
 	 * image scale type} and {@linkplain ViewScaleType view scale type}.