Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mob][photos] Guard invalid EXIF exposure times

ashilknbc97d33e64d6
diff --git a/mobile/apps/photos/changes/invalid-exposure-time.md b/mobile/apps/photos/changes/invalid-exposure-time.md
new file mode 100644
index 0000000000..14d7e71d36
--- /dev/null
+++ b/mobile/apps/photos/changes/invalid-exposure-time.md
@@ -0,0 +1 @@
+- Fixed an error when viewing photo details with invalid exposure times.
diff --git a/mobile/apps/photos/lib/module/metadata/exif.dart b/mobile/apps/photos/lib/module/metadata/exif.dart
index 1588ec5771..3b7e1e3a0b 100644
--- a/mobile/apps/photos/lib/module/metadata/exif.dart
+++ b/mobile/apps/photos/lib/module/metadata/exif.dart
@@ -78,6 +78,33 @@ String? extractPrintableExifValue(IfdTag? tag) {
return printable;
}
+String formatExifExposureTime(IfdTag exposureTimeTag) {
+ final values = exposureTimeTag.values.toList();
+ if (values.isEmpty) {
+ return exposureTimeTag.toString();
+ }
+
+ final value = values[0];
+ if (value is! Ratio) {
+ return exposureTimeTag.toString();
+ }
+
+ final seconds = value.numerator / value.denominator;
+ if (!seconds.isFinite || seconds <= 0) {
+ return exposureTimeTag.toString();
+ }
+
+ if (seconds >= 1) {
+ if (seconds == seconds.roundToDouble()) {
+ return "${seconds.toInt()}s";
+ }
+ return "${seconds.toStringAsFixed(1)}s";
+ } else {
+ final reciprocal = (1 / seconds).round();
+ return "1/$reciprocal";
+ }
+}
+
bool shouldSwapDimensionsForExifOrientation(Map<String, IfdTag>? exifData) {
final orientation = exifData?['Image Orientation']?.values.firstAsInt() ?? 1;
// EXIF orientations 5-8 are rotated 90/270 variants and require w/h swap.
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart
index 2d10351b8b..3275172ec0 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_details_widget.dart
@@ -383,7 +383,7 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
}
if (exif["EXIF ExposureTime"] != null) {
- _exifData["exposureTime"] = _formatExposureTime(
+ _exifData["exposureTime"] = formatExifExposureTime(
exif["EXIF ExposureTime"]!,
);
}
@@ -400,37 +400,6 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
return value.toStringAsFixed(2).replaceFirst(RegExp(r"\.?0+$"), "");
}
- String _formatExposureTime(IfdTag exposureTimeTag) {
- final values = exposureTimeTag.values.toList();
- if (values.isEmpty) {
- return exposureTimeTag.toString();
- }
-
- final value = values[0];
- if (value is! Ratio) {
- return exposureTimeTag.toString();
- }
-
- final numerator = value.numerator;
- final denominator = value.denominator;
-
- if (denominator == 0) {
- return exposureTimeTag.toString();
- }
-
- final double seconds = numerator / denominator;
-
- if (seconds >= 1) {
- if (seconds == seconds.roundToDouble()) {
- return "${seconds.toInt()}s";
- }
- return "${seconds.toStringAsFixed(1)}s";
- } else {
- final reciprocal = (1 / seconds).round();
- return "1/$reciprocal";
- }
- }
-
IfdTag? _firstPositiveDimensionTag(
Map<String, IfdTag> exif,
List<String> keys,
diff --git a/mobile/apps/photos/test/utils/exif_util_test.dart b/mobile/apps/photos/test/utils/exif_util_test.dart
index db1e4b7093..5fab480279 100644
--- a/mobile/apps/photos/test/utils/exif_util_test.dart
+++ b/mobile/apps/photos/test/utils/exif_util_test.dart
@@ -3,6 +3,33 @@ import "package:photos/module/metadata/exif.dart";
import "package:test/test.dart";
void main() {
+ group("formatExifExposureTime", () {
+ test("preserves invalid exposure values without throwing", () {
+ for (final ratio in [
+ Ratio(0, 1),
+ Ratio(1, 0),
+ Ratio(0, 0),
+ Ratio(-1, 125),
+ ]) {
+ final tag = _ifdTag(IfdRatios([ratio]), printable: ratio.toString());
+
+ expect(formatExifExposureTime(tag), ratio.toString());
+ }
+ });
+
+ test("keeps valid shutter speeds formatted in seconds", () {
+ for (final (ratio, expected) in [
+ (Ratio(1, 125), "1/125"),
+ (Ratio(2, 1), "2s"),
+ (Ratio(3, 2), "1.5s"),
+ ]) {
+ final tag = _ifdTag(IfdRatios([ratio]));
+
+ expect(formatExifExposureTime(tag), expected);
+ }
+ });
+ });
+
group("getDateTimeInDeviceTimezone", () {
for (final (name, input, offset, dateTime, offsetTime, time) in [
(