From 9dee4442162417bc45e03017ee44a6c4d5f28a4c Mon Sep 17 00:00:00 2001
From: Robert Mielnik <robert.mielnik@blstream.com>
Date: Mon, 18 Jan 2016 10:40:50 +0100
Subject: [PATCH] MediaStoreRequestHandler: read MediaStore.Image.ORIENTATION
 value and translate it to ExifInterface.ORIENTATION_* value.

Picasso determines orientation according to ExifInterface.ORIENTATION_*. All possible values in MediaStore.Image.ORIENTATION are: 0, 90, 180, 270 (according to: https://developer.android.com/reference/android/provider/MediaStore.Images.ImageColumns.html#ORIENTATION). The values differ, thus orientation read from MediaStore must be translated to ExifInterface.ORIENTATION_* value.

Updated RequestHandler::getExifOrientation description.
---
 .../picasso/MediaStoreRequestHandler.java        | 16 ++++++++++++++--
 .../com/squareup/picasso/RequestHandler.java     |  9 +++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/picasso/src/main/java/com/squareup/picasso/MediaStoreRequestHandler.java b/picasso/src/main/java/com/squareup/picasso/MediaStoreRequestHandler.java
index ccf72e3b89..856e23a4d2 100644
--- a/picasso/src/main/java/com/squareup/picasso/MediaStoreRequestHandler.java
+++ b/picasso/src/main/java/com/squareup/picasso/MediaStoreRequestHandler.java
@@ -20,6 +20,7 @@
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.media.ExifInterface;
 import android.net.Uri;
 import android.provider.MediaStore;
 import java.io.IOException;
@@ -108,10 +109,21 @@ static int getExifOrientation(ContentResolver contentResolver, Uri uri) {
       if (cursor == null || !cursor.moveToFirst()) {
         return 0;
       }
-      return cursor.getInt(0);
+
+      int rotation = cursor.getInt(0);
+      switch (rotation) {
+        case 90:
+          return ExifInterface.ORIENTATION_ROTATE_90;
+        case 180:
+          return ExifInterface.ORIENTATION_ROTATE_180;
+        case 270:
+          return ExifInterface.ORIENTATION_ROTATE_270;
+        default:
+          return ExifInterface.ORIENTATION_NORMAL;
+      }
     } catch (RuntimeException ignored) {
       // If the orientation column doesn't exist, assume no rotation.
-      return 0;
+      return ExifInterface.ORIENTATION_UNDEFINED;
     } finally {
       if (cursor != null) {
         cursor.close();
diff --git a/picasso/src/main/java/com/squareup/picasso/RequestHandler.java b/picasso/src/main/java/com/squareup/picasso/RequestHandler.java
index 54798a553b..ceff84b37f 100644
--- a/picasso/src/main/java/com/squareup/picasso/RequestHandler.java
+++ b/picasso/src/main/java/com/squareup/picasso/RequestHandler.java
@@ -17,6 +17,7 @@
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.media.ExifInterface;
 import android.net.NetworkInfo;
 import java.io.IOException;
 import java.io.InputStream;
@@ -55,11 +56,13 @@ public static final class Result {
     private final int exifOrientation;
 
     public Result(Bitmap bitmap, Picasso.LoadedFrom loadedFrom) {
-      this(checkNotNull(bitmap, "bitmap == null"), null, loadedFrom, 0);
+      this(checkNotNull(bitmap, "bitmap == null"), null, loadedFrom,
+              ExifInterface.ORIENTATION_UNDEFINED);
     }
 
     public Result(InputStream stream, Picasso.LoadedFrom loadedFrom) {
-      this(null, checkNotNull(stream, "stream == null"), loadedFrom, 0);
+      this(null, checkNotNull(stream, "stream == null"), loadedFrom,
+              ExifInterface.ORIENTATION_UNDEFINED);
     }
 
     Result(Bitmap bitmap, InputStream stream, Picasso.LoadedFrom loadedFrom, int exifOrientation) {
@@ -93,6 +96,8 @@ public Picasso.LoadedFrom getLoadedFrom() {
     /**
      * Returns the resulting EXIF orientation generated from a {@link #load(Request, int)} call.
      * This is only accessible to built-in RequestHandlers.
+     *
+     * @return MUST return one from values defined as android.media.ExifInterface.ORIENTATION_*
      */
     int getExifOrientation() {
       return exifOrientation;