Skip to content

armgit / ente

Public Imported from GitHub
0

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

Merge remote-tracking branch 'origin/main' into aman/photos-preserve-shared-media-extension

AmanRajSinghMouryad160b6986b3c
diff --cc mobile/apps/photos/lib/utils/share_util.dart
index f87c3b6ac3,46c7a84814..1534e17908
--- a/mobile/apps/photos/lib/utils/share_util.dart
+++ b/mobile/apps/photos/lib/utils/share_util.dart
@@@ -164,14 -159,7 +159,13 @@@ Future<List<EnteFile>> convertIncomingS
continue;
}
final enteFile = EnteFile();
- final sharedLocalId = const Uuid().v4();
+ final fileExtension = extension(media.path);
+ final safeExtension =
+ RegExp(r'^\.[A-Za-z0-9]{1,15}$').stringMatch(fileExtension) ==
+ fileExtension
+ ? fileExtension
+ : '';
+ final sharedLocalId = const Uuid().v4() + safeExtension;
- // fileName: img_x.jpg
enteFile.title = basename(media.path);
var ioFile = File(media.path);
try {