kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-07 23:18:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mobile][photos] fix: Image switcharoo bug when sharing from signal (#1232)

Browse Source 
## Description

Fixes #1158
This commit is contained in:
Ashil 2024-03-28 12:43:52 +05:30 committed by GitHub
parent 9599982f30
commit 5768a69062
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mobile/lib/utils/share_util.dart
View File

@ -15,6 +15,7 @@ import 'package:photos/utils/exif_util.dart';
import 'package:photos/utils/file_util.dart';
import 'package:receive_sharing_intent/receive_sharing_intent.dart';
import 'package:share_plus/share_plus.dart';
import "package:uuid/uuid.dart";
final _logger = Logger("ShareUtil");
// Set of possible image extensions
@ -116,14 +117,13 @@ Future<List<EnteFile>> convertIncomingSharedMediaToFile(
continue;
}
final enteFile = EnteFile();
final sharedLocalId = const Uuid().v4();
// fileName: img_x.jpg
enteFile.title = basename(media.path);
var ioFile = File(media.path);
try {
ioFile = ioFile.renameSync(
Configuration.instance.getSharedMediaDirectory() +
"/" +
enteFile.title!,
Configuration.instance.getSharedMediaDirectory() + "/" + sharedLocalId,
);
} catch (e) {
if (e is FileSystemException) {
@ -135,7 +135,7 @@ Future<List<EnteFile>> convertIncomingSharedMediaToFile(
final newIoFile = ioFile.copySync(
Configuration.instance.getSharedMediaDirectory() +
"/" +
enteFile.title!,
sharedLocalId,
);
if (media.path.contains("io.ente.photos")) {
_logger.info("delete original file in path ${ioFile.path}");
@ -146,7 +146,7 @@ Future<List<EnteFile>> convertIncomingSharedMediaToFile(
rethrow;
}
}
enteFile.localID = sharedMediaIdentifier + enteFile.title!;
enteFile.localID = sharedMediaIdentifier + sharedLocalId;
enteFile.collectionID = collectionID;
enteFile.fileType =
media.type == SharedMediaType.image ? FileType.image : FileType.video;