From e8046da0ba6ca8891f94c607e82aa12f3fe0a06b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 26 Oct 2022 12:34:03 +0200 Subject: [PATCH] Use `GpsTagConstants.ALL_GPS_TAGS` to remove all tags related to GPS. --- .../internal/session/content/ImageExifTagRemover.kt | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) 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 baa441a74d..274a2a85e3 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 @@ -53,16 +53,9 @@ internal class ImageExifTagRemover @Inject constructor( outputSet.removeField(ExifTagConstants.EXIF_TAG_GPSINFO) 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) + GpsTagConstants.ALL_GPS_TAGS.forEach { tagInfo -> + outputSet.removeField(tagInfo) + } } ?: return@withContext jpegImageFile val scrubbedFile = temporaryFileCreator.create()