Update ExifInterface to 1.3.1

Switch back to ExifInterface from file

Author: hollaus

app/build.gradle

@@ -177,7 +177,8 @@ dependencies {
 	implementation 'com.github.hollaus:OpenCVLibrary:1.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.dropbox.core:dropbox-core-sdk:3.1.3'
-    implementation 'androidx.exifinterface:exifinterface:1.1.0'
+	implementation 'androidx.exifinterface:exifinterface:1.3.1'
+//    implementation 'androidx.exifinterface:exifinterface:1.3.1'
     implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
 //	TODO: check here for a stable version. The reason we switch here to beta is badge support:

app/src/main/java/at/ac/tuwien/caa/docscan/logic/Helper.java

@@ -7,10 +7,8 @@
 import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.os.ParcelFileDescriptor;
 import android.preference.PreferenceManager;
 import androidx.exifinterface.media.ExifInterface;
 import androidx.appcompat.app.AlertDialog;
@@ -32,9 +30,7 @@
 import org.opencv.imgcodecs.Imgcodecs;
 
 import java.io.File;
-import java.io.FileDescriptor;
 import java.io.FileFilter;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.lang.ref.WeakReference;
@@ -911,27 +907,6 @@ public boolean accept(File file) {
         return files;
     }
 
-    public static ExifInterface getExifInterface(File file, Context context) {
-
-        if (context == null)
-            return null;
-
-        Uri uri = Uri.fromFile(file);
-
-        try {
-            ParcelFileDescriptor parcelFileDescriptor = context.getContentResolver().openFileDescriptor(uri, "rw");
-            FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();
-            ExifInterface exifInterface = new ExifInterface(fileDescriptor);
-            return exifInterface;
-        } catch (FileNotFoundException e) {
-            return null;
-        } catch (IOException e) {
-            return null;
-        }
-
-
-    }
-
     public static boolean isOnline(Context context) {
 
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);

app/src/main/java/at/ac/tuwien/caa/docscan/ui/CameraActivity.java

@@ -3404,9 +3404,7 @@ public void run() {
 
         private void saveExif(File outFile) throws IOException {
 
-            ExifInterface exif = Helper.getExifInterface(outFile, mContext);
-
-//            final ExifInterface exif = new ExifInterface(outFile.getAbsolutePath());
+            final ExifInterface exif = new ExifInterface(outFile.getAbsolutePath());
 
             // Save the orientation of the image:
             int orientation = getExifOrientation();