Skip to content

armgit / ente

Public Imported from GitHub
0

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

Clarify free-space fallback state

ashilkn1e968eefc061
diff --git a/mobile/apps/photos/lib/services/free_space/deletion_batch_runner.dart b/mobile/apps/photos/lib/services/free_space/deletion_batch_runner.dart
index 17e66cfce8..9c982e0339 100644
--- a/mobile/apps/photos/lib/services/free_space/deletion_batch_runner.dart
+++ b/mobile/apps/photos/lib/services/free_space/deletion_batch_runner.dart
@@ -9,19 +9,18 @@ enum LocalDeletionStatus { completed, cancelled, failed }
class LocalDeletionResult {
final LocalDeletionStatus status;
final Set<String> deletedIDs;
- final bool canAttemptRecovery;
+ final bool shouldTryNextFallback;
const LocalDeletionResult({
required this.status,
this.deletedIDs = const <String>{},
- this.canAttemptRecovery = false,
+ this.shouldTryNextFallback = false,
});
bool get isCompleted => status == LocalDeletionStatus.completed;
bool get isCancelled => status == LocalDeletionStatus.cancelled;
bool get isFailed => status == LocalDeletionStatus.failed;
- bool get shouldAttemptRecovery => isFailed && canAttemptRecovery;
- bool get isTerminalFailure => isFailed && !canAttemptRecovery;
+ bool get isTerminalFailure => isFailed && !shouldTryNextFallback;
}
Set<String> retainOriginalDeletionCandidates({
@@ -65,7 +64,7 @@ Future<LocalDeletionResult> executeDeletionBatches({
return LocalDeletionResult(
status: LocalDeletionStatus.failed,
deletedIDs: deletedIDs,
- canAttemptRecovery: true,
+ shouldTryNextFallback: true,
);
}
@@ -119,14 +118,15 @@ LocalDeletionResult combineDeletionResults(
);
}
if (sharedMediaResult.isFailed || platformResult.isFailed) {
- final sharedFailureCanRecover =
- !sharedMediaResult.isFailed || sharedMediaResult.canAttemptRecovery;
- final platformFailureCanRecover =
- !platformResult.isFailed || platformResult.canAttemptRecovery;
+ final sharedFailureAllowsFallback =
+ !sharedMediaResult.isFailed || sharedMediaResult.shouldTryNextFallback;
+ final platformFailureAllowsFallback =
+ !platformResult.isFailed || platformResult.shouldTryNextFallback;
return LocalDeletionResult(
status: LocalDeletionStatus.failed,
deletedIDs: deletedIDs,
- canAttemptRecovery: sharedFailureCanRecover && platformFailureCanRecover,
+ shouldTryNextFallback:
+ sharedFailureAllowsFallback && platformFailureAllowsFallback,
);
}
return LocalDeletionResult(
diff --git a/mobile/apps/photos/lib/ui/tools/free_space_page.dart b/mobile/apps/photos/lib/ui/tools/free_space_page.dart
index 97dff46c33..181cbc8526 100644
--- a/mobile/apps/photos/lib/ui/tools/free_space_page.dart
+++ b/mobile/apps/photos/lib/ui/tools/free_space_page.dart
@@ -137,7 +137,7 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
final currentLocalIDList = currentLocalIDs.toList();
var result = await deleteLocalFiles(context, currentLocalIDList);
- if (result.shouldAttemptRecovery) {
+ if (result.shouldTryNextFallback) {
if (!mounted) return;
result = await deleteLocalFilesAfterRemovingAlreadyDeletedIDs(
context,
@@ -145,7 +145,7 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
);
}
- if (result.shouldAttemptRecovery && Platform.isAndroid) {
+ if (result.shouldTryNextFallback && Platform.isAndroid) {
if (!mounted) return;
result = await retryFreeUpSpaceAfterRemovingAssetsNonExistingInDisk(
context,
diff --git a/mobile/apps/photos/lib/utils/delete_file_util.dart b/mobile/apps/photos/lib/utils/delete_file_util.dart
index 759ea20317..7c2f07d1da 100644
--- a/mobile/apps/photos/lib/utils/delete_file_util.dart
+++ b/mobile/apps/photos/lib/utils/delete_file_util.dart
@@ -411,7 +411,7 @@ Future<LocalDeletionResult> deleteLocalFiles(
_logger.severe("Could not delete local files", e, s);
return const LocalDeletionResult(
status: LocalDeletionStatus.failed,
- canAttemptRecovery: true,
+ shouldTryNextFallback: true,
);
}
}
@@ -490,7 +490,7 @@ Future<LocalDeletionResult> deleteLocalFilesAfterRemovingAlreadyDeletedIDs(
_logger.severe("Could not delete local files", e, s);
return const LocalDeletionResult(
status: LocalDeletionStatus.failed,
- canAttemptRecovery: true,
+ shouldTryNextFallback: true,
);
} finally {
await _hideProgressDialog(dialog);
@@ -745,7 +745,7 @@ Future<LocalDeletionResult> _deleteAndCheckpointSharedMediaFiles(
? LocalDeletionStatus.completed
: LocalDeletionStatus.failed,
deletedIDs: deletedIDs,
- canAttemptRecovery: deletedIDs.length != requestedIDs.length,
+ shouldTryNextFallback: deletedIDs.length != requestedIDs.length,
);
}
diff --git a/mobile/apps/photos/test/services/free_space/deletion_batch_runner_test.dart b/mobile/apps/photos/test/services/free_space/deletion_batch_runner_test.dart
index 711f7491c5..17725574a6 100644
--- a/mobile/apps/photos/test/services/free_space/deletion_batch_runner_test.dart
+++ b/mobile/apps/photos/test/services/free_space/deletion_batch_runner_test.dart
@@ -2,25 +2,19 @@ import "package:flutter_test/flutter_test.dart";
import "package:photos/services/free_space/deletion_batch_runner.dart";
void main() {
- test("derives recovery predicates only for failed results", () {
+ test("distinguishes fallback-eligible and terminal failures", () {
const recoverableFailure = LocalDeletionResult(
status: LocalDeletionStatus.failed,
- canAttemptRecovery: true,
+ shouldTryNextFallback: true,
);
const terminalFailure = LocalDeletionResult(
status: LocalDeletionStatus.failed,
);
- const completed = LocalDeletionResult(
- status: LocalDeletionStatus.completed,
- canAttemptRecovery: true,
- );
- expect(recoverableFailure.shouldAttemptRecovery, isTrue);
+ expect(recoverableFailure.shouldTryNextFallback, isTrue);
expect(recoverableFailure.isTerminalFailure, isFalse);
- expect(terminalFailure.shouldAttemptRecovery, isFalse);
+ expect(terminalFailure.shouldTryNextFallback, isFalse);
expect(terminalFailure.isTerminalFailure, isTrue);
- expect(completed.shouldAttemptRecovery, isFalse);
- expect(completed.isTerminalFailure, isFalse);
});
test("stops after the first platform exception", () async {
@@ -37,7 +31,7 @@ void main() {
);
expect(result.status, LocalDeletionStatus.failed);
- expect(result.canAttemptRecovery, isTrue);
+ expect(result.shouldTryNextFallback, isTrue);
expect(attemptedBatches, [
["1", "2"],
]);
@@ -104,7 +98,7 @@ void main() {
);
expect(result.status, LocalDeletionStatus.failed);
- expect(result.canAttemptRecovery, isFalse);
+ expect(result.shouldTryNextFallback, isFalse);
expect(attemptedBatches, [
["1", "2"],
]);
@@ -151,12 +145,12 @@ void main() {
const LocalDeletionResult(status: LocalDeletionStatus.completed),
const LocalDeletionResult(
status: LocalDeletionStatus.failed,
- canAttemptRecovery: true,
+ shouldTryNextFallback: true,
),
);
expect(result.status, LocalDeletionStatus.failed);
- expect(result.canAttemptRecovery, isTrue);
+ expect(result.shouldTryNextFallback, isTrue);
});
test("retains only originally confirmed, still-freeable candidates", () {