Skip to content

armgit / ente

Public Imported from GitHub
0

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

Simplify legacy kit share cleanup

Neeraj Gupta40dce5f89bdd
diff --git a/mobile/packages/legacy/lib/pages/share_legacy_kit_page.dart b/mobile/packages/legacy/lib/pages/share_legacy_kit_page.dart
index 4042120a1b..84cf4865e8 100644
--- a/mobile/packages/legacy/lib/pages/share_legacy_kit_page.dart
+++ b/mobile/packages/legacy/lib/pages/share_legacy_kit_page.dart
@@ -27,7 +27,7 @@ import "package:share_plus/share_plus.dart";
typedef LegacyKitAuthenticator =
Future<bool> Function(BuildContext context, String reason);
-int _latestLegacyKitShareGeneration = 0;
+final _legacyKitShareTokens = <String, Object>{};
const _partNameStyle = TextStyle(
fontFamily: TextStyles.outfitFontFamily,
@@ -383,7 +383,8 @@ class _ShareLegacyKitPageState extends State<ShareLegacyKitPage> {
final ShareResult result;
Directory? temporaryDirectory;
Directory? shareDirectory;
- int? shareGeneration;
+ File? sharePlusCopy;
+ Object? shareToken;
try {
temporaryDirectory = await getTemporaryDirectory();
shareDirectory = await temporaryDirectory.createTemp(
@@ -391,7 +392,10 @@ class _ShareLegacyKitPageState extends State<ShareLegacyKitPage> {
);
final pdf = File("${shareDirectory.path}/$fileName");
await pdf.writeAsBytes(bytes, flush: true);
- shareGeneration = ++_latestLegacyKitShareGeneration;
+ // share_plus copies path-backed files here on Android.
+ sharePlusCopy = File("${temporaryDirectory.path}/share_plus/$fileName");
+ shareToken = Object();
+ _legacyKitShareTokens[sharePlusCopy.path] = shareToken;
result = await SharePlus.instance.share(
ShareParams(
files: [XFile(pdf.path, mimeType: "application/pdf")],
@@ -406,12 +410,7 @@ class _ShareLegacyKitPageState extends State<ShareLegacyKitPage> {
} finally {
if (temporaryDirectory != null && shareDirectory != null) {
unawaited(
- _deleteSharedPdf(
- shareDirectory,
- // share_plus copies path-backed files here on Android.
- File("${temporaryDirectory.path}/share_plus/$fileName"),
- shareGeneration,
- ),
+ _deleteSharedPdf(shareDirectory, sharePlusCopy, shareToken),
);
}
}
@@ -683,17 +682,18 @@ class _ShareLegacyKitPageState extends State<ShareLegacyKitPage> {
Future<void> _deleteSharedPdf(
Directory shareDirectory,
- File sharePlusCopy,
- int? shareGeneration,
+ File? sharePlusCopy,
+ Object? shareToken,
) async {
await Future<void>.delayed(legacyKitShareRetention);
- for (final entity in <FileSystemEntity>[
- shareDirectory,
- if (shareGeneration != null &&
- shareGeneration == _latestLegacyKitShareGeneration)
- sharePlusCopy,
- ]) {
- await deleteLegacyKitShareFile(entity);
+ await deleteLegacyKitShareFile(shareDirectory);
+ if (sharePlusCopy != null &&
+ shareToken != null &&
+ identical(_legacyKitShareTokens[sharePlusCopy.path], shareToken)) {
+ await deleteLegacyKitShareFile(sharePlusCopy);
+ if (identical(_legacyKitShareTokens[sharePlusCopy.path], shareToken)) {
+ _legacyKitShareTokens.remove(sharePlusCopy.path);
+ }
}
}
diff --git a/mobile/packages/legacy/lib/services/legacy_kit_service.dart b/mobile/packages/legacy/lib/services/legacy_kit_service.dart
index 4b1f25e36a..c14ede1382 100644
--- a/mobile/packages/legacy/lib/services/legacy_kit_service.dart
+++ b/mobile/packages/legacy/lib/services/legacy_kit_service.dart
@@ -1,5 +1,3 @@
-import "dart:async";
-
import "package:ente_base/models/key_attributes.dart" as base;
import "package:ente_configuration/base_configuration.dart";
import "package:ente_contacts/contacts.dart" as contacts;
@@ -35,7 +33,7 @@ class LegacyKitService {
}) async {
_config = config;
_sessionProvider = sessionProvider;
- unawaited(cleanStaleLegacyKitShareFiles());
+ await cleanStaleLegacyKitShareFiles();
}
Future<List<LegacyKit>> getKits() async {
diff --git a/mobile/packages/legacy/lib/services/legacy_kit_share_file_service.dart b/mobile/packages/legacy/lib/services/legacy_kit_share_file_service.dart
index 1852b220a4..bc2e9fd868 100644
--- a/mobile/packages/legacy/lib/services/legacy_kit_share_file_service.dart
+++ b/mobile/packages/legacy/lib/services/legacy_kit_share_file_service.dart
@@ -10,17 +10,12 @@ const legacyKitShareRetention = Duration(minutes: 5);
final _logger = Logger("LegacyKitShareFiles");
Future<void> cleanStaleLegacyKitShareFiles() async {
- final cleanupStartedAt = DateTime.now();
- await Future<void>.delayed(legacyKitShareRetention);
try {
final temporaryDirectory = await getTemporaryDirectory();
await for (final entity in temporaryDirectory.list(followLinks: false)) {
if (entity is Directory &&
_entityName(entity).startsWith(legacyKitShareDirectoryPrefix)) {
- await deleteLegacyKitShareFile(
- entity,
- modifiedBefore: cleanupStartedAt,
- );
+ await deleteLegacyKitShareFile(entity);
}
}
@@ -35,10 +30,7 @@ Future<void> cleanStaleLegacyKitShareFiles() async {
if (entity is File &&
name.startsWith(legacyKitShareFilePrefix) &&
name.endsWith(".pdf")) {
- await deleteLegacyKitShareFile(
- entity,
- modifiedBefore: cleanupStartedAt,
- );
+ await deleteLegacyKitShareFile(entity);
}
}
} catch (e, s) {
@@ -46,23 +38,9 @@ Future<void> cleanStaleLegacyKitShareFiles() async {
}
}
-Future<void> deleteLegacyKitShareFile(
- FileSystemEntity entity, {
- DateTime? modifiedBefore,
-}) async {
+Future<void> deleteLegacyKitShareFile(FileSystemEntity entity) async {
try {
- if (!await entity.exists()) {
- return;
- }
- final modified = (await entity.stat()).modified;
- if (modifiedBefore != null && modified.isAfter(modifiedBefore)) {
- return;
- }
if (await entity.exists()) {
- if (modifiedBefore != null &&
- (await entity.stat()).modified.isAfter(modifiedBefore)) {
- return;
- }
await entity.delete(recursive: entity is Directory);
}
} catch (e, s) {