Merge pull request #411 from lolsheeplol/support-exifinterface-non-na…

…tive Support exifinterface non native
Yalantis · Apr 18, 2018 · bc8a5be · bc8a5be
2 parents 065ae11 + b9055ce
commit bc8a5be
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/ucrop/build.gradle b/ucrop/build.gradle
@@ -33,5 +33,6 @@ android {
 
 dependencies {
     implementation 'com.android.support:appcompat-v7:27.1.0'
+    implementation 'com.android.support:exifinterface:27.1.0'
     implementation 'com.squareup.okhttp3:okhttp:3.8.1'
 }
diff --git a/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapCropTask.java b/ucrop/src/main/java/com/yalantis/ucrop/task/BitmapCropTask.java
@@ -4,11 +4,11 @@
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
 import android.graphics.RectF;
-import android.media.ExifInterface;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.media.ExifInterface;
 import android.util.Log;
 
 import com.yalantis.ucrop.callback.BitmapCropCallback;

diff --git a/ucrop/src/main/java/com/yalantis/ucrop/util/BitmapLoadUtils.java b/ucrop/src/main/java/com/yalantis/ucrop/util/BitmapLoadUtils.java
@@ -6,11 +6,10 @@
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Point;
-import android.media.ExifInterface;
 import android.net.Uri;
-import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.media.ExifInterface;
 import android.util.Log;
 import android.view.Display;
 import android.view.WindowManager;

diff --git a/ucrop/src/main/java/com/yalantis/ucrop/util/ImageHeaderParser.java b/ucrop/src/main/java/com/yalantis/ucrop/util/ImageHeaderParser.java
@@ -30,7 +30,7 @@
 
 package com.yalantis.ucrop.util;
 
-import android.media.ExifInterface;
+import android.support.media.ExifInterface;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -377,7 +377,7 @@ public int read(byte[] buffer, int byteCount) throws IOException {
 
     public static void copyExif(ExifInterface originalExif, int width, int height, String imageOutputPath) {
         String[] attributes = new String[]{
-                ExifInterface.TAG_APERTURE,
+                ExifInterface.TAG_F_NUMBER,
                 ExifInterface.TAG_DATETIME,
                 ExifInterface.TAG_DATETIME_DIGITIZED,
                 ExifInterface.TAG_EXPOSURE_TIME,
@@ -392,12 +392,12 @@ public static void copyExif(ExifInterface originalExif, int width, int height, S
                 ExifInterface.TAG_GPS_LONGITUDE_REF,
                 ExifInterface.TAG_GPS_PROCESSING_METHOD,
                 ExifInterface.TAG_GPS_TIMESTAMP,
-                ExifInterface.TAG_ISO,
+                ExifInterface.TAG_PHOTOGRAPHIC_SENSITIVITY,
                 ExifInterface.TAG_MAKE,
                 ExifInterface.TAG_MODEL,
                 ExifInterface.TAG_SUBSEC_TIME,
-                ExifInterface.TAG_SUBSEC_TIME_DIG,
-                ExifInterface.TAG_SUBSEC_TIME_ORIG,
+                ExifInterface.TAG_SUBSEC_TIME_DIGITIZED,
+                ExifInterface.TAG_SUBSEC_TIME_ORIGINAL,
                 ExifInterface.TAG_WHITE_BALANCE
         };