Skip to content

armgit / ente

Public Imported from GitHub
0

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

fixes

AmanRajSinghMouryac3396a0cb451
diff --git a/mobile/apps/photos/lib/services/sync/large_backup_session_tracker.dart b/mobile/apps/photos/lib/services/sync/large_backup_session_tracker.dart
index 329d261528..631b4d0f2a 100644
--- a/mobile/apps/photos/lib/services/sync/large_backup_session_tracker.dart
+++ b/mobile/apps/photos/lib/services/sync/large_backup_session_tracker.dart
@@ -1,11 +1,14 @@
import "package:flutter/foundation.dart";
+import "package:logging/logging.dart";
import "package:photos/events/sync_status_update_event.dart";
class LargeBackupSessionTracker extends ChangeNotifier {
- static const int minimumFileCount = 1000;
+ static final _logger = Logger("LargeBackupSessionTracker");
+ static const int minimumFileCount = 500;
bool _isEligible = false;
bool _isUploading = false;
+ int _batchTotal = 0;
int _remainingCount = 0;
bool _isStandbyScreenActive = false;
@@ -28,26 +31,35 @@ class LargeBackupSessionTracker extends ChangeNotifier {
final total = event.total ?? 0;
_isUploading = total > 0;
_isEligible = _isEligible || total >= minimumFileCount;
+ _batchTotal = total;
_remainingCount = total;
break;
case SyncStatus.inProgress:
- final total = event.total ?? _remainingCount;
+ if (_batchTotal == 0) {
+ break;
+ }
final completed = event.completed ?? 0;
- _isUploading = total > 0;
- _isEligible = _isEligible || total >= minimumFileCount;
- _remainingCount = (total - completed).clamp(0, total);
+ _remainingCount = (_batchTotal - completed).clamp(0, _batchTotal);
break;
- case SyncStatus.paused:
case SyncStatus.completedBackup:
case SyncStatus.error:
_reset();
break;
+ case SyncStatus.paused:
case SyncStatus.startedFirstGalleryImport:
case SyncStatus.completedFirstGalleryImport:
case SyncStatus.applyingRemoteDiff:
break;
}
+ if (event.status == SyncStatus.preparingForUpload ||
+ wasActive != isActive) {
+ _logger.info(
+ "status=${event.status.name}, batchTotal=$_batchTotal, "
+ "eligible=$_isEligible, remaining=$_remainingCount, active=$isActive",
+ );
+ }
+
if (wasActive != isActive || previousRemainingCount != _remainingCount) {
notifyListeners();
}
@@ -56,6 +68,7 @@ class LargeBackupSessionTracker extends ChangeNotifier {
void _reset() {
_isEligible = false;
_isUploading = false;
+ _batchTotal = 0;
_remainingCount = 0;
}
}
diff --git a/mobile/apps/photos/lib/services/sync/sync_service.dart b/mobile/apps/photos/lib/services/sync/sync_service.dart
index 27ee36415b..892df02682 100644
--- a/mobile/apps/photos/lib/services/sync/sync_service.dart
+++ b/mobile/apps/photos/lib/services/sync/sync_service.dart
@@ -156,7 +156,6 @@ class SyncService {
Bus.instance.fire(SyncStatusUpdate(SyncStatus.error, error: e));
} on UnauthorizedError {
_logger.info("Logging user out");
- Bus.instance.fire(SyncStatusUpdate(SyncStatus.error));
Bus.instance.fire(TriggerLogoutEvent());
} on NoMediaLocationAccessError {
_logger.severe("Not uploading due to no media location access");
diff --git a/mobile/apps/photos/lib/ui/home/backup_standby_screen.dart b/mobile/apps/photos/lib/ui/home/backup_standby_screen.dart
index 69497534ce..d4d616219c 100644
--- a/mobile/apps/photos/lib/ui/home/backup_standby_screen.dart
+++ b/mobile/apps/photos/lib/ui/home/backup_standby_screen.dart
@@ -34,6 +34,7 @@ class _BackupStandbyScreenState extends State<BackupStandbyScreen>
@override
void initState() {
super.initState();
+ widget.sessionTracker.setStandbyScreenActive(true);
_remainingCount = widget.sessionTracker.remainingCount;
WidgetsBinding.instance.addObserver(this);
widget.sessionTracker.addListener(_handleBackupSessionChanged);
@@ -72,6 +73,7 @@ class _BackupStandbyScreenState extends State<BackupStandbyScreen>
@override
void dispose() {
+ widget.sessionTracker.setStandbyScreenActive(false);
_restoreScreenBrightness();
_setWakeLock(enable: false);
widget.sessionTracker.removeListener(_handleBackupSessionChanged);
@@ -143,14 +145,20 @@ class _BackupStandbyScreenState extends State<BackupStandbyScreen>
if (!mounted || _isClosing) {
return;
}
+ _isClosing = true;
_restoreScreenBrightness();
_setWakeLock(enable: false);
- Navigator.of(context).pop();
- _isClosing = true;
+ final route = ModalRoute.of(context)!;
+ final navigator = Navigator.of(context);
+ if (route.isCurrent) {
+ navigator.pop();
+ } else {
+ navigator.removeRoute(route);
+ }
}
void _scheduleScreenDimming() {
- _restoreScreenBrightness(resetText: true);
+ _dimmingTimer?.cancel();
_dimmingTimer = Timer(_dimmingDelay, () async {
_dimmingTimer = null;
if (!_canDimScreen) {
diff --git a/mobile/apps/photos/lib/ui/home/status_bar_widget.dart b/mobile/apps/photos/lib/ui/home/status_bar_widget.dart
index 77cd1cbedf..2d832ad03e 100644
--- a/mobile/apps/photos/lib/ui/home/status_bar_widget.dart
+++ b/mobile/apps/photos/lib/ui/home/status_bar_widget.dart
@@ -176,23 +176,18 @@ class _StatusBarWidgetState extends State<StatusBarWidget> {
),
state: BannerComponentState.success,
onTap: () async {
- if (_largeBackupSession.isStandbyScreenActive ||
- !_largeBackupSession.isActive) {
+ if (!_largeBackupSession.isActive) {
return;
}
- _largeBackupSession.setStandbyScreenActive(true);
- try {
- await routeToPage(
- context,
- BackupStandbyScreen(sessionTracker: _largeBackupSession),
- forceCustomPageRoute: true,
- );
- } finally {
- _largeBackupSession.setStandbyScreenActive(false);
- Bus.instance.fire(
- ForceReloadHomeGalleryEvent("largeBackupStandbyEnded"),
- );
- }
+ await Navigator.of(context).push(
+ MaterialPageRoute<void>(
+ builder: (_) =>
+ BackupStandbyScreen(sessionTracker: _largeBackupSession),
+ ),
+ );
+ Bus.instance.fire(
+ ForceReloadHomeGalleryEvent("largeBackupStandbyEnded"),
+ );
},
),
);