Merge branch 'develop' into chore/android-versions

packages/stream_chat/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 5.2.0
+
+✅ Added
+
+- Added `Huawei` and `Xiaomi` PushProviders.
+
+🐞 Fixed
+
+- Fixed initializing last synced date.
+
 ## 5.1.0
 
 ✅ Added

packages/stream_chat/lib/src/client/client.dart

@@ -453,6 +453,15 @@ class StreamChatClient {
         if (persistenceEnabled) {
           await sync(cids: cids, lastSyncAt: _lastSyncedAt);
         }
+      } else {
+        // channels are empty, assuming it's a fresh start
+        // and making sure `lastSyncAt` is initialized
+        if (persistenceEnabled) {
+          final lastSyncAt = await _chatPersistenceClient?.getLastSyncAt();
+          if (lastSyncAt == null) {
+            await _chatPersistenceClient?.updateLastSyncAt(DateTime.now());
+          }
+        }
       }
       handleEvent(Event(
         type: EventType.connectionRecovered,

packages/stream_chat/lib/src/core/api/device_api.dart

@@ -6,6 +6,12 @@ enum PushProvider {
   /// Send notifications using Google's Firebase Cloud Messaging
   firebase,
 
+  /// Send notifications using Huawei's Push Kit
+  huawei,
+
+  /// Send notifications using Xiaomi's Mi Push Service
+  xiaomi,
+
   /// Send notifications using Apple's Push Notification service
   apn,
 }

packages/stream_chat/lib/version.dart

@@ -3,4 +3,4 @@ import 'package:stream_chat/src/client/client.dart';
 /// Current package version
 /// Used in [StreamChatClient] to build the `x-stream-client` header
 // ignore: constant_identifier_names
-const PACKAGE_VERSION = '5.1.0';
+const PACKAGE_VERSION = '5.2.0';

packages/stream_chat/pubspec.yaml

@@ -1,7 +1,7 @@
 name: stream_chat
 homepage: https://getstream.io/
 description: The official Dart client for Stream Chat, a service for building chat applications.
-version: 5.1.0
+version: 5.2.0
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 

packages/stream_chat/test/src/client/client_test.dart

@@ -516,6 +516,9 @@ void main() {
     });
 
     setUp(() async {
+      when(() => persistence.updateLastSyncAt(any()))
+          .thenAnswer((_) => Future.value());
+      when(persistence.getLastSyncAt).thenAnswer((_) async => null);
       client = StreamChatClient(apiKey, chatApi: api, ws: ws)
         ..chatPersistenceClient = persistence;
       await client.connectUser(user, token);
@@ -532,9 +535,12 @@ void main() {
       test(
         '''should update persistence connectionInfo and lastSync when sync succeeds''',
         () async {
+          // persistence.updateLastSyncAt might be called
+          // when connecting the user.
+          // Resetting the logs so we start counting invocations correctly.
+          reset(persistence);
           const cids = ['test-cid-1', 'test-cid-2', 'test-cid-3'];
           final lastSyncAt = DateTime.now();
-
           when(() => api.general.sync(cids, lastSyncAt))
               .thenAnswer((_) async => SyncResponse()
                 ..events = [
@@ -567,6 +573,10 @@ void main() {
       test(
         'should work fine if persistence contains sync params',
         () async {
+          // persistence.updateLastSyncAt might be called
+          // when connecting the user.
+          // Resetting the logs so we start counting invocations correctly.
+          reset(persistence);
           const cids = ['test-cid-1', 'test-cid-2', 'test-cid-3'];
           final lastSyncAt = DateTime.now();
 

packages/stream_chat/test/src/core/api/device_api_test.dart

@@ -22,26 +22,37 @@ void main() {
 
   test('addDevice should work', () async {
     const deviceId = 'test-device-id';
-    const pushProvider = PushProvider.firebase;
-
+    const pushProvidersMap = {
+      'apn': PushProvider.apn,
+      'firebase': PushProvider.firebase,
+      'huawei': PushProvider.huawei,
+      'xiaomi': PushProvider.xiaomi,
+    };
     const path = '/devices';
 
-    when(() => client.post(
-              path,
-              data: {
-                'id': deviceId,
-                'push_provider': pushProvider.name,
-              },
-            ))
-        .thenAnswer(
-            (_) async => successResponse(path, data: <String, dynamic>{}));
+    for (final pushProviderMapEntry in pushProvidersMap.entries) {
+      final data = {
+        'id': deviceId,
+        'push_provider': pushProviderMapEntry.key,
+      };
+      when(() {
+        return client.post(
+          path,
+          data: data,
+        );
+      }).thenAnswer(
+          (_) async => successResponse(path, data: <String, dynamic>{}));
 
-    final res = await deviceApi.addDevice(deviceId, pushProvider);
+      final res =
+          await deviceApi.addDevice(deviceId, pushProviderMapEntry.value);
 
-    expect(res, isNotNull);
+      expect(res, isNotNull);
 
-    verify(() => client.post(path, data: any(named: 'data'))).called(1);
+      verify(() => client.post(path, data: data)).called(1);
+    }
     verifyNoMoreInteractions(client);
+    expect(pushProvidersMap.length, PushProvider.values.length,
+        reason: 'All PushProvider should be tested');
   });
 
   test('addDevice should work with pushProviderName', () async {