From 01ffdf2f2479345f6bf4b240e1fd18e9f825a6ed Mon Sep 17 00:00:00 2001
From: Vishnu Mohandas <vishnu@vishnu.tech>
Date: Wed, 7 Apr 2021 05:03:41 +0530
Subject: [PATCH] Display the correct sync state post local gallery sync

---
 lib/events/sync_status_update_event.dart | 2 +-
 lib/services/sync_service.dart           | 8 +++++---
 lib/ui/sync_indicator.dart               | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/events/sync_status_update_event.dart b/lib/events/sync_status_update_event.dart
index e10fc9eab..ed3b4dbf0 100644
--- a/lib/events/sync_status_update_event.dart
+++ b/lib/events/sync_status_update_event.dart
@@ -30,6 +30,6 @@ enum SyncStatus {
   preparing_for_upload,
   in_progress,
   paused,
-  completed,
+  completed_backup,
   error,
 }
diff --git a/lib/services/sync_service.dart b/lib/services/sync_service.dart
index b0ee1003a..15aa08b94 100644
--- a/lib/services/sync_service.dart
+++ b/lib/services/sync_service.dart
@@ -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()));
diff --git a/lib/ui/sync_indicator.dart b/lib/ui/sync_indicator.dart
index 4f17f6d1a..0819dc1f8 100644
--- a/lib/ui/sync_indicator.dart
+++ b/lib/ui/sync_indicator.dart
@@ -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 {