Use defaults in SyncStatus constructor.

powersync-ja · Jan 3, 2024 · f354808 · f354808
1 parent 7fac9ea
commit f354808
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/packages/powersync/lib/src/powersync_database.dart b/packages/powersync/lib/src/powersync_database.dart
@@ -42,11 +42,7 @@ class PowerSyncDatabase with SqliteQueries implements SqliteConnection {
   final SqliteDatabase database;
 
   /// Current connection status.
-  SyncStatus currentStatus = const SyncStatus(
-      connected: false,
-      uploading: false,
-      downloading: false,
-      lastSyncedAt: null);
+  SyncStatus currentStatus = const SyncStatus();
 
   /// Use this stream to subscribe to connection status updates.
   late final Stream<SyncStatus> statusStream;
@@ -203,11 +199,8 @@ class PowerSyncDatabase with SqliteQueries implements SqliteConnection {
           final SyncStatus status = data[1];
           _setStatus(status);
         } else if (action == 'close') {
-          _setStatus(SyncStatus(
-              connected: false,
-              downloading: false,
-              uploading: false,
-              lastSyncedAt: currentStatus.lastSyncedAt));
+          // Clear status apart from lastSyncedAt
+          _setStatus(SyncStatus(lastSyncedAt: currentStatus.lastSyncedAt));
           rPort.close();
           updateSubscription?.cancel();
         } else if (action == 'log') {
@@ -238,11 +231,8 @@ class PowerSyncDatabase with SqliteQueries implements SqliteConnection {
       _disconnecter?.completeAbort();
       _disconnecter = null;
       rPort.close();
-      _setStatus(SyncStatus(
-          connected: false,
-          lastSyncedAt: currentStatus.lastSyncedAt,
-          downloading: false,
-          uploading: false));
+      // Clear status apart from lastSyncedAt
+      _setStatus(SyncStatus(lastSyncedAt: currentStatus.lastSyncedAt));
     }
 
     var exitPort = ReceivePort();

diff --git a/packages/powersync/lib/src/streaming_sync.dart b/packages/powersync/lib/src/streaming_sync.dart
@@ -35,11 +35,7 @@ class StreamingSyncImplementation {
 
   final Duration retryDelay;
 
-  SyncStatus lastStatus = SyncStatus(
-      connected: false,
-      lastSyncedAt: null,
-      downloading: false,
-      uploading: false);
+  SyncStatus lastStatus = const SyncStatus();
 
   StreamingSyncImplementation(
       {required this.adapter,
@@ -150,6 +146,8 @@ class StreamingSyncImplementation {
     return body['data']['write_checkpoint'] as String;
   }
 
+  /// Update sync status based on any non-null parameters.
+  /// To clear errors, use [_noError] instead of null.
   void _updateStatus(
       {DateTime? lastSyncedAt,
       bool? connected,