beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Display the correct sync state post local gallery sync

Browse source
This commit is contained in:
Vishnu Mohandas 2021-04-07 05:03:41 +05:30
parent 4ad9ca2806
commit 01ffdf2f24
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/events/sync_status_update_event.dart
View file

@ -30,6 +30,6 @@ enum SyncStatus {
preparing_for_upload,
in_progress,
paused,
completed,
completed_backup,
error,
}

8
lib/services/sync_service.dart
View file

@ -98,8 +98,10 @@ class SyncService {
try {
await _doSync();
if (_lastSyncStatusEvent != null &&
_lastSyncStatusEvent.status != SyncStatus.completed) {
Bus.instance.fire(SyncStatusUpdate(SyncStatus.completed));
_lastSyncStatusEvent.status !=
SyncStatus.completed_first_gallery_import &&
_lastSyncStatusEvent.status != SyncStatus.completed_backup) {
Bus.instance.fire(SyncStatusUpdate(SyncStatus.completed_backup));
}
successful = true;
} on WiFiUnavailableError {
@ -109,7 +111,7 @@ class SyncService {
} on SyncStopRequestedError {
_syncStopRequested = false;
Bus.instance
.fire(SyncStatusUpdate(SyncStatus.completed, wasStopped: true));
.fire(SyncStatusUpdate(SyncStatus.completed_backup, wasStopped: true));
} on NoActiveSubscriptionError {
Bus.instance.fire(SyncStatusUpdate(SyncStatus.error,
error: NoActiveSubscriptionError()));

6
lib/ui/sync_indicator.dart
View file

@ -47,7 +47,7 @@ class _SyncIndicatorState extends State<SyncIndicator> {
return _getErrorWidget();
}
if (_event.status == SyncStatus.completed_first_gallery_import ||
_event.status == SyncStatus.completed) {
_event.status == SyncStatus.completed_backup) {
Future.delayed(Duration(milliseconds: 3000), () {
if (mounted) {
setState(() {
@ -58,7 +58,7 @@ class _SyncIndicatorState extends State<SyncIndicator> {
} else {
_containerHeight = 48;
}
final icon = _event.status == SyncStatus.completed
final icon = _event.status == SyncStatus.completed_backup
? Icon(
Icons.cloud_done_outlined,
color: Theme.of(context).accentColor,
@ -216,7 +216,7 @@ class _SyncIndicatorState extends State<SyncIndicator> {
if (_event.status == SyncStatus.paused) {
return _event.reason;
}
if (_event.status == SyncStatus.completed) {
if (_event.status == SyncStatus.completed_backup) {
if (_event.wasStopped) {
return "sync stopped";
} else {