From 3632e6dc8adb5cb7c3b63cf96a5b8e7217e153a3 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 26 Oct 2022 12:32:27 +0200 Subject: [PATCH] Replace library `org.apache.sanselan:sanselan:0.97-incubator` with `org.apache.commons:commons-imaging:1.0-alpha3` --- dependencies.gradle | 2 +- dependencies_groups.gradle | 1 - .../session/content/ImageExifTagRemover.kt | 35 +++++++++---------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index db4a961648..33a2096a43 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -160,7 +160,7 @@ ext.libs = [ 'emojiGoogle' : "com.vanniktech:emoji-google:$vanniktechEmoji" ], apache : [ - 'commonsImaging' : "org.apache.sanselan:sanselan:0.97-incubator" + 'commonsImaging' : "org.apache.commons:commons-imaging:1.0-alpha3" ], sentry: [ 'sentryAndroid' : "io.sentry:sentry-android:$sentry" diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle index 68de2c1581..8d488ba2f8 100644 --- a/dependencies_groups.gradle +++ b/dependencies_groups.gradle @@ -176,7 +176,6 @@ ext.groups = [ 'org.apache.ant', 'org.apache.commons', 'org.apache.httpcomponents', - 'org.apache.sanselan', 'org.bouncycastle', 'org.ccil.cowan.tagsoup', 'org.checkerframework', diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt index 3fa9ffb0e1..baa441a74d 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt @@ -17,11 +17,11 @@ package org.matrix.android.sdk.internal.session.content import kotlinx.coroutines.withContext -import org.apache.sanselan.Sanselan -import org.apache.sanselan.formats.jpeg.JpegImageMetadata -import org.apache.sanselan.formats.jpeg.exifRewrite.ExifRewriter -import org.apache.sanselan.formats.tiff.constants.ExifTagConstants -import org.apache.sanselan.formats.tiff.constants.GPSTagConstants +import org.apache.commons.imaging.Imaging +import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata +import org.apache.commons.imaging.formats.jpeg.exif.ExifRewriter +import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants +import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants import org.matrix.android.sdk.api.MatrixCoroutineDispatchers import org.matrix.android.sdk.api.extensions.tryOrNull import org.matrix.android.sdk.internal.util.TemporaryFileCreator @@ -46,24 +46,23 @@ internal class ImageExifTagRemover @Inject constructor( */ suspend fun removeSensitiveJpegExifTags(jpegImageFile: File): File = withContext(coroutineDispatchers.io) { val outputSet = tryOrNull("Unable to read JpegImageMetadata") { - (Sanselan.getMetadata(jpegImageFile) as? JpegImageMetadata)?.exif?.outputSet + (Imaging.getMetadata(jpegImageFile) as? JpegImageMetadata)?.exif?.outputSet } ?: return@withContext jpegImageFile tryOrNull("Unable to remove ExifData") { outputSet.removeField(ExifTagConstants.EXIF_TAG_GPSINFO) - outputSet.removeField(ExifTagConstants.EXIF_TAG_SUBJECT_LOCATION_1) - outputSet.removeField(ExifTagConstants.EXIF_TAG_SUBJECT_LOCATION_2) + outputSet.removeField(ExifTagConstants.EXIF_TAG_SUBJECT_LOCATION) outputSet.removeField(ExifTagConstants.EXIF_TAG_USER_COMMENT) - outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_ALTITUDE) - outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_ALTITUDE_REF) - outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_LONGITUDE) - outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_LONGITUDE_REF) - outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_DEST_LONGITUDE) - outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_DEST_LONGITUDE_REF) - outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_LATITUDE) - outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_LATITUDE_REF) - outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_DEST_LATITUDE) - outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_DEST_LATITUDE_REF) + outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_ALTITUDE) + outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_ALTITUDE_REF) + outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE) + outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF) + outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_DEST_LONGITUDE) + outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_DEST_LONGITUDE_REF) + outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE) + outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF) + outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_DEST_LATITUDE) + outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_DEST_LATITUDE_REF) } ?: return@withContext jpegImageFile val scrubbedFile = temporaryFileCreator.create()