From e333e2124e7078c9bcd7f006b31af8c064383f89 Mon Sep 17 00:00:00 2001
From: Olga Miller <olga.rgb@gmail.com>
Date: Mon, 16 Jul 2018 21:10:15 +0200
Subject: [PATCH] Fixed image orientation error

(replaced uri.getPath with InputStream as argument of ExifInterface)
---
 .../java/om/sstvencoder/MainActivity.java     | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/om/sstvencoder/MainActivity.java b/app/src/main/java/om/sstvencoder/MainActivity.java
index f774b19..f56080a 100644
--- a/app/src/main/java/om/sstvencoder/MainActivity.java
+++ b/app/src/main/java/om/sstvencoder/MainActivity.java
@@ -273,16 +273,33 @@ public class MainActivity extends AppCompatActivity {
     public int getOrientation(ContentResolver resolver, Uri uri) {
         int orientation = 0;
         try {
-            Cursor cursor = resolver.query(uri, new String[]{MediaStore.Images.ImageColumns.ORIENTATION}, null, null, null);
+            Cursor cursor = resolver.query(uri,
+                    new String[]{MediaStore.Images.ImageColumns.ORIENTATION},
+                    null, null, null);
             if (cursor.moveToFirst())
                 orientation = cursor.getInt(0);
             cursor.close();
         } catch (Exception ignore) {
-            try {
-                ExifInterface exif = new ExifInterface(uri.getPath());
-                orientation = Utility.convertToDegrees(exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0));
-            } catch (Exception ex) {
-                showOrientationErrorMessage(uri, ex);
+            orientation = getExifOrientation(resolver, uri);
+        }
+        return orientation;
+    }
+
+    private int getExifOrientation(ContentResolver resolver, Uri uri) {
+        int orientation = 0;
+        InputStream in = null;
+        try {
+            in = resolver.openInputStream(uri);
+            int orientationAttribute = (new ExifInterface(in)).getAttributeInt(ExifInterface.TAG_ORIENTATION, 0);
+            orientation = Utility.convertToDegrees(orientationAttribute);
+        } catch (Exception ex) {
+            showOrientationErrorMessage(uri, ex);
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (Exception ignore) {
+                }
             }
         }
         return orientation;