From 2d0a4c6250eb9578f51dea9746823a46a7080447 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 17 Jan 2021 11:50:34 +0100 Subject: [PATCH] fix #2043, replace the old ExifInterface with androidx ExifInterface --- app/build.gradle | 2 +- .../gallery/pro/activities/EditActivity.kt | 2 +- .../gallery/pro/activities/ViewPagerActivity.kt | 3 +-- .../simplemobiletools/gallery/pro/extensions/Activity.kt | 7 ++----- .../gallery/pro/extensions/ExifInterface.kt | 2 +- .../gallery/pro/fragments/PhotoFragment.kt | 4 ++-- .../gallery/pro/fragments/ViewPagerFragment.kt | 2 +- .../gallery/pro/activities/NewPhotoEditActivity.kt | 2 +- .../gallery/pro/activities/NewVideoEditActivity.kt | 2 +- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c543a4927..35498c56b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.32.28' + implementation 'com.simplemobiletools:commons:5.32.29' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt index 853264d71..26cea909e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt @@ -7,7 +7,6 @@ import android.graphics.Bitmap import android.graphics.Bitmap.CompressFormat import android.graphics.Color import android.graphics.Point -import android.media.ExifInterface import android.net.Uri import android.os.Build import android.os.Bundle @@ -16,6 +15,7 @@ import android.provider.MediaStore import android.view.Menu import android.view.MenuItem import android.widget.RelativeLayout +import androidx.exifinterface.media.ExifInterface import androidx.recyclerview.widget.LinearLayoutManager import com.bumptech.glide.Glide import com.bumptech.glide.load.DataSource diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt index 93380634b..264133ecd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt @@ -15,19 +15,18 @@ import android.graphics.Bitmap import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.graphics.drawable.Icon -import android.media.ExifInterface import android.net.Uri import android.os.Build import android.os.Bundle import android.os.Handler import android.provider.MediaStore.Images -import android.text.Html import android.view.Menu import android.view.MenuItem import android.view.View import android.view.WindowManager import android.view.animation.DecelerateInterpolator import android.widget.Toast +import androidx.exifinterface.media.ExifInterface import androidx.print.PrintHelper import androidx.viewpager.widget.ViewPager import com.bumptech.glide.Glide diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt index da42de22e..389f2fb7a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Activity.kt @@ -10,7 +10,6 @@ import android.graphics.BitmapFactory import android.graphics.Matrix import android.graphics.drawable.Drawable import android.graphics.drawable.LayerDrawable -import android.media.ExifInterface import android.net.Uri import android.os.Build import android.provider.MediaStore @@ -19,6 +18,7 @@ import android.provider.MediaStore.Images import android.util.DisplayMetrics import android.view.View import androidx.appcompat.app.AppCompatActivity +import androidx.exifinterface.media.ExifInterface import com.bumptech.glide.Glide import com.bumptech.glide.load.DecodeFormat import com.bumptech.glide.load.engine.DiskCacheStrategy @@ -36,10 +36,7 @@ import com.simplemobiletools.gallery.pro.dialogs.PickDirectoryDialog import com.simplemobiletools.gallery.pro.helpers.RECYCLE_BIN import com.simplemobiletools.gallery.pro.models.DateTaken import com.squareup.picasso.Picasso -import java.io.File -import java.io.FileOutputStream -import java.io.InputStream -import java.io.OutputStream +import java.io.* import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/ExifInterface.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/ExifInterface.kt index 6c1ba0b0b..26d923fc0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/ExifInterface.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/ExifInterface.kt @@ -1,6 +1,6 @@ package com.simplemobiletools.gallery.pro.extensions -import android.media.ExifInterface +import androidx.exifinterface.media.ExifInterface import java.lang.reflect.Field import java.lang.reflect.Modifier diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt index e80dd20dd..4e22c5b14 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt @@ -9,7 +9,6 @@ import android.graphics.Matrix import android.graphics.drawable.ColorDrawable import android.graphics.drawable.Drawable import android.graphics.drawable.PictureDrawable -import android.media.ExifInterface.* import android.net.Uri import android.os.Build import android.os.Bundle @@ -20,6 +19,7 @@ import android.view.MotionEvent import android.view.View import android.view.ViewGroup import android.widget.RelativeLayout +import androidx.exifinterface.media.ExifInterface.* import com.alexvasilkov.gestures.GestureController import com.alexvasilkov.gestures.State import com.bumptech.glide.Glide @@ -715,7 +715,7 @@ class PhotoFragment : ViewPagerFragment() { val tag = exif.getTag(ExifInterface.TAG_ORIENTATION) tag?.getValueAsInt(defaultOrientation) ?: defaultOrientation } else { - val exif = android.media.ExifInterface(path) + val exif = androidx.exifinterface.media.ExifInterface(path) exif.getAttributeInt(TAG_ORIENTATION, defaultOrientation) } diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/ViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/ViewPagerFragment.kt index 535aad447..66fbd8df5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/ViewPagerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/ViewPagerFragment.kt @@ -1,10 +1,10 @@ package com.simplemobiletools.gallery.pro.fragments -import android.media.ExifInterface import android.provider.MediaStore import android.provider.MediaStore.Files import android.provider.MediaStore.Images import android.view.MotionEvent +import androidx.exifinterface.media.ExifInterface import androidx.fragment.app.Fragment import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.gallery.pro.extensions.config diff --git a/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewPhotoEditActivity.kt b/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewPhotoEditActivity.kt index 00e9ed203..f8c132069 100644 --- a/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewPhotoEditActivity.kt +++ b/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewPhotoEditActivity.kt @@ -3,7 +3,7 @@ package com.simplemobiletools.gallery.pro.activities import android.annotation.TargetApi import android.app.Activity import android.content.Intent -import android.media.ExifInterface +import androidx.exifinterface.media.ExifInterface import android.net.Uri import android.os.Build import android.os.Bundle diff --git a/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewVideoEditActivity.kt b/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewVideoEditActivity.kt index 017e0b7fc..b3f199880 100644 --- a/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewVideoEditActivity.kt +++ b/app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewVideoEditActivity.kt @@ -3,11 +3,11 @@ package com.simplemobiletools.gallery.pro.activities import android.annotation.TargetApi import android.app.Activity import android.content.Intent -import android.media.ExifInterface import android.net.Uri import android.os.Build import android.os.Bundle import android.provider.MediaStore +import androidx.exifinterface.media.ExifInterface import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE import com.simplemobiletools.commons.helpers.REAL_FILE_PATH