Merge branch 'krille/fix-wait-for-keys' into 'main'

fix: Wait for keys in pusher

See merge request famedly/company/frontend/famedlysdk!1012

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [0.8.20] - 14th Apr 2022
+- fix: Wait for keys in push helper
+
 ## [0.8.19] - 14th Apr 2022
 - feat: Get event from push notification
 - feat: Add more localization strings and add default matrix localizations

lib/src/client.dart

@@ -1088,11 +1088,13 @@ class Client extends MatrixApi {
 
     final encryption = this.encryption;
     if (event.type == EventTypes.Encrypted && encryption != null) {
-      event = await encryption.decryptRoomEvent(roomId, event);
-      if (event.type == EventTypes.Encrypted && _currentSync != null) {
-        await _currentSync;
-        event = await encryption.decryptRoomEvent(roomId, event);
+      var decrypted = await encryption.decryptRoomEvent(roomId, event);
+      if (decrypted.messageType == MessageTypes.BadEncrypted &&
+          prevBatch != null) {
+        await oneShotSync();
+        decrypted = await encryption.decryptRoomEvent(roomId, event);
       }
+      event = decrypted;
     }
 
     if (storeInDatabase) {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: matrix
 description: Matrix Dart SDK
-version: 0.8.19
+version: 0.8.20
 homepage: https://famedly.com
 repository: https://gitlab.com/famedly/company/frontend/famedlysdk.git