Skip to content

armgit / ente

Public Imported from GitHub
0

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

Preserve share retention after restart

Neeraj Gupta6dfd625f0525
diff --git a/mobile/packages/legacy/lib/services/legacy_kit_service.dart b/mobile/packages/legacy/lib/services/legacy_kit_service.dart
index c14ede1382..4b1f25e36a 100644
--- a/mobile/packages/legacy/lib/services/legacy_kit_service.dart
+++ b/mobile/packages/legacy/lib/services/legacy_kit_service.dart
@@ -1,3 +1,5 @@
+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;
@@ -33,7 +35,7 @@ class LegacyKitService {
}) async {
_config = config;
_sessionProvider = sessionProvider;
- await cleanStaleLegacyKitShareFiles();
+ unawaited(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 bc2e9fd868..79a70fac18 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,12 +10,17 @@ 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);
+ await deleteLegacyKitShareFile(
+ entity,
+ modifiedBefore: cleanupStartedAt,
+ );
}
}
@@ -30,7 +35,10 @@ Future<void> cleanStaleLegacyKitShareFiles() async {
if (entity is File &&
name.startsWith(legacyKitShareFilePrefix) &&
name.endsWith(".pdf")) {
- await deleteLegacyKitShareFile(entity);
+ await deleteLegacyKitShareFile(
+ entity,
+ modifiedBefore: cleanupStartedAt,
+ );
}
}
} catch (e, s) {
@@ -38,11 +46,19 @@ Future<void> cleanStaleLegacyKitShareFiles() async {
}
}
-Future<void> deleteLegacyKitShareFile(FileSystemEntity entity) async {
+Future<void> deleteLegacyKitShareFile(
+ FileSystemEntity entity, {
+ DateTime? modifiedBefore,
+}) async {
try {
- if (await entity.exists()) {
- await entity.delete(recursive: entity is Directory);
+ if (!await entity.exists()) {
+ return;
+ }
+ if (modifiedBefore != null &&
+ (await entity.stat()).modified.isAfter(modifiedBefore)) {
+ return;
}
+ await entity.delete(recursive: entity is Directory);
} catch (e, s) {
_logger.warning("Failed to delete a Legacy Kit share file", e, s);
}