From 619690777b00f7a88b7b52e7b65c2febe203ab19 Mon Sep 17 00:00:00 2001
From: Steve Peters <steve@fisharerojo.org>
Date: Wed, 8 Jul 2020 16:37:18 -0500
Subject: [PATCH] feat(android): update to use
 androidx.exifinterface.media.ExifInterface

---
 android/capacitor/build.gradle                            | 4 +++-
 .../java/com/getcapacitor/plugin/camera/ExifWrapper.java  | 8 ++++----
 .../java/com/getcapacitor/plugin/camera/ImageUtils.java   | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/android/capacitor/build.gradle b/android/capacitor/build.gradle
index d4e4fd028c..1edd31ed9a 100644
--- a/android/capacitor/build.gradle
+++ b/android/capacitor/build.gradle
@@ -70,6 +70,8 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation "org.apache.cordova:framework:$cordovaAndroidVersion"
+    implementation 'androidx.exifinterface:exifinterface:1.2.0'
     testImplementation 'org.json:json:20140107'
-    testImplementation 'org.mockito:mockito-inline:2.13.0'
+    testImplementation 'org.mockito:mockito-inline:2.25.1'
 }
+
diff --git a/android/capacitor/src/main/java/com/getcapacitor/plugin/camera/ExifWrapper.java b/android/capacitor/src/main/java/com/getcapacitor/plugin/camera/ExifWrapper.java
index 61495f3c4c..7e50d89476 100644
--- a/android/capacitor/src/main/java/com/getcapacitor/plugin/camera/ExifWrapper.java
+++ b/android/capacitor/src/main/java/com/getcapacitor/plugin/camera/ExifWrapper.java
@@ -1,8 +1,8 @@
 package com.getcapacitor.plugin.camera;
 
-import android.media.ExifInterface;
+import androidx.exifinterface.media.ExifInterface;
 
-import static android.media.ExifInterface.*;
+import static androidx.exifinterface.media.ExifInterface.*;
 
 import com.getcapacitor.JSObject;
 
@@ -22,7 +22,7 @@ public JSObject toJson() {
 
     // Commented fields are for API 24. Left in to save someone the wrist damage later
 
-    p(ret, TAG_APERTURE);
+    p(ret, TAG_APERTURE_VALUE);
     /*
     p(ret, TAG_ARTIST);
     p(ret, TAG_BITS_PER_SAMPLE);
@@ -105,7 +105,7 @@ public JSObject toJson() {
     p(ret, TAG_IMAGE_LENGTH);
     // p(ret, TAG_IMAGE_UNIQUE_ID);
     p(ret, TAG_IMAGE_WIDTH);
-    p(ret, TAG_ISO);
+    p(ret, TAG_ISO_SPEED);
     /*
     p(ret, TAG_INTEROPERABILITY_INDEX);
     p(ret, TAG_ISO_SPEED_RATINGS);
diff --git a/android/capacitor/src/main/java/com/getcapacitor/plugin/camera/ImageUtils.java b/android/capacitor/src/main/java/com/getcapacitor/plugin/camera/ImageUtils.java
index 6c2daa2d34..da121340b5 100644
--- a/android/capacitor/src/main/java/com/getcapacitor/plugin/camera/ImageUtils.java
+++ b/android/capacitor/src/main/java/com/getcapacitor/plugin/camera/ImageUtils.java
@@ -4,7 +4,7 @@
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
-import android.media.ExifInterface;
+import androidx.exifinterface.media.ExifInterface;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;