lib/src/double_ratchet/double_ratchet.dart

@@ -293,15 +293,11 @@ class OmemoDoubleRatchet {
       return plaintext;
     }
 
-    final dhPubMatches = listsEqual(
+    if (header.dhPub != await dhr?.getBytes()) {
-      header.dhPub ?? <int>[],
-      await dhr?.getBytes() ?? <int>[],
-    );
-    if (!dhPubMatches) {
       await _skipMessageKeys(header.pn!);
       await _dhRatchet(header);
     }
-    
+
     await _skipMessageKeys(header.n!);
     final newCkr = await kdfCk(ckr!, kdfCkNextChainKey);
     final mk = await kdfCk(ckr!, kdfCkNextMessageKey);

lib/src/omemo/sessionmanager.dart

@@ -386,22 +386,13 @@ class OmemoSessionManager {
       _eventStreamController.add(DeviceModifiedEvent(_device));
     });
   }
-
-  /// Returns the device map, i.e. the mapping of bare Jid to its device identifiers
-  /// we have built sessions with.
-  Future<Map<String, List<int>>> getDeviceMap() async {
-    Map<String, List<int>>? map;
-
-    await _lock.synchronized(() async {
-        map = _deviceMap;
-    });
-
-    return map!;
-  }
   
   @visibleForTesting
   OmemoDoubleRatchet getRatchet(String jid, int deviceId) => _ratchetMap[RatchetMapKey(jid, deviceId)]!;
 
+  @visibleForTesting
+  Map<String, List<int>> getDeviceMap() => _deviceMap;
+
   @visibleForTesting
   Map<RatchetMapKey, OmemoDoubleRatchet> getRatchetMap() => _ratchetMap;
 

test/serialisation_test.dart

@@ -93,7 +93,7 @@ void main() {
     final oldDevice = await oldSession.getDevice();
     final newDevice = await newSession.getDevice();
     expect(await oldDevice.equals(newDevice), true);
-    expect(await oldSession.getDeviceMap(), await newSession.getDeviceMap());
+    expect(oldSession.getDeviceMap(), newSession.getDeviceMap());
 
     expect(oldSession.getRatchetMap().length, newSession.getRatchetMap().length);
     for (final session in oldSession.getRatchetMap().entries) {