@@ -6,8 +6,6 @@ import android.animation.ValueAnimator
66import android.content.Intent
77import android.graphics.BitmapFactory
88import android.graphics.Matrix
9- // noinspection ExifInterface TODO Issue : #5994
10- import android.media.ExifInterface
119import android.os.Bundle
1210import android.view.animation.AccelerateDecelerateInterpolator
1311import android.widget.ImageView
@@ -16,6 +14,7 @@ import androidx.appcompat.app.AppCompatActivity
1614import androidx.core.graphics.rotationMatrix
1715import androidx.core.graphics.scaleMatrix
1816import androidx.core.net.toUri
17+ import androidx.exifinterface.media.ExifInterface
1918import androidx.lifecycle.ViewModelProvider
2019import fr.free.nrw.commons.databinding.ActivityEditBinding
2120import timber.log.Timber
@@ -45,12 +44,10 @@ class EditActivity : AppCompatActivity() {
4544 imageUri = intent.getStringExtra(" image" ) ? : " "
4645 vm = ViewModelProvider (this )[EditViewModel ::class .java]
4746 val sourceExif = imageUri.toUri().path?.let { ExifInterface (it) }
48- // TODO(Deprecation : 'TAG_APERTURE: String' is deprecated. Deprecated in Java) Issue : #6001
49- // TODO(Deprecation : 'TAG_ISO: String' is deprecated. Deprecated in Java) Issue : #6001
50- @Suppress(" DEPRECATION" )
47+
5148 val exifTags =
5249 arrayOf(
53- ExifInterface .TAG_APERTURE ,
50+ ExifInterface .TAG_F_NUMBER ,
5451 ExifInterface .TAG_DATETIME ,
5552 ExifInterface .TAG_EXPOSURE_TIME ,
5653 ExifInterface .TAG_FLASH ,
@@ -66,13 +63,13 @@ class EditActivity : AppCompatActivity() {
6663 ExifInterface .TAG_GPS_TIMESTAMP ,
6764 ExifInterface .TAG_IMAGE_LENGTH ,
6865 ExifInterface .TAG_IMAGE_WIDTH ,
69- ExifInterface .TAG_ISO ,
66+ ExifInterface .TAG_PHOTOGRAPHIC_SENSITIVITY ,
7067 ExifInterface .TAG_MAKE ,
7168 ExifInterface .TAG_MODEL ,
7269 ExifInterface .TAG_ORIENTATION ,
7370 ExifInterface .TAG_WHITE_BALANCE ,
74- ExifInterface .WHITEBALANCE_AUTO ,
75- ExifInterface .WHITEBALANCE_MANUAL ,
71+ ExifInterface .WHITE_BALANCE_AUTO ,
72+ ExifInterface .WHITE_BALANCE_MANUAL ,
7673 )
7774 for (tag in exifTags) {
7875 val attribute = sourceExif?.getAttribute(tag.toString())
0 commit comments