From 00c65e483895a88595e22b95659ff3166cab2f92 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Thu, 27 Aug 2020 23:02:08 +0900 Subject: [PATCH] fixed metadata reading across multiple directories of same type (overlay) --- .../deckers/thibault/aves/channel/calls/MetadataHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/app/src/main/java/deckers/thibault/aves/channel/calls/MetadataHandler.java b/android/app/src/main/java/deckers/thibault/aves/channel/calls/MetadataHandler.java index 10b1c35fd..d6ffa9bf9 100644 --- a/android/app/src/main/java/deckers/thibault/aves/channel/calls/MetadataHandler.java +++ b/android/app/src/main/java/deckers/thibault/aves/channel/calls/MetadataHandler.java @@ -373,8 +373,7 @@ public class MetadataHandler implements MethodChannel.MethodCallHandler { try (InputStream is = StorageUtils.openInputStream(context, Uri.parse(uri))) { Metadata metadata = ImageMetadataReader.readMetadata(is); - ExifSubIFDDirectory directory = metadata.getFirstDirectoryOfType(ExifSubIFDDirectory.class); - if (directory != null) { + for (ExifSubIFDDirectory directory : metadata.getDirectoriesOfType(ExifSubIFDDirectory.class)) { putDescriptionFromTag(metadataMap, KEY_APERTURE, directory, ExifSubIFDDirectory.TAG_FNUMBER); putStringFromTag(metadataMap, KEY_EXPOSURE_TIME, directory, ExifSubIFDDirectory.TAG_EXPOSURE_TIME); putDescriptionFromTag(metadataMap, KEY_FOCAL_LENGTH, directory, ExifSubIFDDirectory.TAG_FOCAL_LENGTH);