feat: Allow encrypting to multiple Jids

test/double_ratchet_test.dart

@@ -36,11 +36,13 @@ void main() {
 
   test('Test the Double Ratchet', () async {
     // Generate keys
+    const bobJid = 'bob@other.example.server';
     final ikAlice = await OmemoKeyPair.generateNewPair(KeyPairType.ed25519);
     final ikBob = await OmemoKeyPair.generateNewPair(KeyPairType.ed25519);
     final spkBob = await OmemoKeyPair.generateNewPair(KeyPairType.x25519);
     final opkBob = await OmemoKeyPair.generateNewPair(KeyPairType.x25519);
     final bundleBob = OmemoBundle(
+      bobJid,
       1,
       await spkBob.pk.asBase64(),
       3,

test/omemo_test.dart

@@ -10,8 +10,8 @@ void main() {
     var deviceModified = false;
     var ratchetModified = 0;
     var deviceMapModified = 0;
-    final aliceSession = await OmemoSessionManager.generateNewIdentity(opkAmount: 1);
-    final bobSession = await OmemoSessionManager.generateNewIdentity(opkAmount: 1);
+    final aliceSession = await OmemoSessionManager.generateNewIdentity(aliceJid, opkAmount: 1);
+    final bobSession = await OmemoSessionManager.generateNewIdentity(bobJid, opkAmount: 1);
     final bobOpks = (await bobSession.getDevice()).opks.values.toList();
     bobSession.eventStream.listen((event) {
       if (event is DeviceModifiedEvent) {
@@ -83,10 +83,10 @@ void main() {
     const bobJid = 'bob@other.server.example';
       
     // Alice and Bob generate their sessions
-    final aliceSession = await OmemoSessionManager.generateNewIdentity(opkAmount: 1);
-    final bobSession = await OmemoSessionManager.generateNewIdentity(opkAmount: 1);
+    final aliceSession = await OmemoSessionManager.generateNewIdentity(aliceJid, opkAmount: 1);
+    final bobSession = await OmemoSessionManager.generateNewIdentity(bobJid, opkAmount: 1);
     // Bob's other device
-    final bobSession2 = await OmemoSessionManager.generateNewIdentity(opkAmount: 1);
+    final bobSession2 = await OmemoSessionManager.generateNewIdentity(bobJid, opkAmount: 1);
 
     // Alice encrypts a message for Bob
     const messagePlaintext = 'Hello Bob!';
@@ -143,4 +143,47 @@ void main() {
       ..getRatchet(bobJid, fingerprints[0].deviceId)
       ..getRatchet(bobJid, fingerprints[1].deviceId);
   });
+
+  test('Test using OMEMO sessions with encrypt to self', () async {
+    const aliceJid = 'alice@server.example';
+    const bobJid = 'bob@other.server.example';
+      
+    // Alice and Bob generate their sessions
+    final aliceSession1 = await OmemoSessionManager.generateNewIdentity(aliceJid, opkAmount: 1);
+    final aliceSession2 = await OmemoSessionManager.generateNewIdentity(aliceJid, opkAmount: 1);
+    final bobSession = await OmemoSessionManager.generateNewIdentity(bobJid, opkAmount: 1);
+
+    // Alice encrypts a message for Bob
+    const messagePlaintext = 'Hello Bob!';
+    final aliceMessage = await aliceSession1.encryptToJids(
+      [bobJid, aliceJid],
+      messagePlaintext,
+      newSessions: [
+        await (await bobSession.getDevice()).toBundle(),
+        await (await aliceSession2.getDevice()).toBundle(),
+      ],
+    );
+    expect(aliceMessage.encryptedKeys.length, 2);
+
+    // Alice sends the message to Bob
+    // ...
+
+    // Bob decrypts it
+    final bobMessage = await bobSession.decryptMessage(
+      aliceMessage.ciphertext,
+      aliceJid,
+      (await aliceSession1.getDevice()).id,
+      aliceMessage.encryptedKeys,
+    );
+    expect(messagePlaintext, bobMessage);
+
+    // Alice's other device decrypts it
+    final aliceMessage2 = await aliceSession2.decryptMessage(
+      aliceMessage.ciphertext,
+      aliceJid,
+      (await aliceSession1.getDevice()).id,
+      aliceMessage.encryptedKeys,
+    );
+    expect(messagePlaintext, aliceMessage2);
+  });
 }

test/serialisation_test.dart

@@ -4,7 +4,7 @@ import 'package:test/test.dart';
 void main() {
   test('Test serialising and deserialising the Device', () async {
     // Generate a random session
-    final oldSession = await OmemoSessionManager.generateNewIdentity(opkAmount: 1);
+    final oldSession = await OmemoSessionManager.generateNewIdentity('user@test.server', opkAmount: 1);
     final oldDevice = await oldSession.getDevice();
     final serialised = await oldDevice.toJson();
 
@@ -16,8 +16,8 @@ void main() {
     // Generate a random ratchet
     const aliceJid = 'alice@server.example';
     const bobJid = 'bob@other.server.example';
-    final aliceSession = await OmemoSessionManager.generateNewIdentity(opkAmount: 1);
-    final bobSession = await OmemoSessionManager.generateNewIdentity(opkAmount: 1);
+    final aliceSession = await OmemoSessionManager.generateNewIdentity(aliceJid, opkAmount: 1);
+    final bobSession = await OmemoSessionManager.generateNewIdentity(bobJid, opkAmount: 1);
     final aliceMessage = await aliceSession.encryptToJid(
       bobJid,
       'Hello Bob!',
@@ -40,8 +40,8 @@ void main() {
 
   test('Test serialising and deserialising the OmemoSessionManager', () async {
     // Generate a random session
-    final oldSession = await OmemoSessionManager.generateNewIdentity(opkAmount: 4);
-    final bobSession = await OmemoSessionManager.generateNewIdentity(opkAmount: 4);
+    final oldSession = await OmemoSessionManager.generateNewIdentity('a@server', opkAmount: 4);
+    final bobSession = await OmemoSessionManager.generateNewIdentity('b@other.server', opkAmount: 4);
     await oldSession.addSessionFromBundle(
       'bob@localhost',
       (await bobSession.getDevice()).id,

test/x3dh_test.dart

@@ -11,6 +11,7 @@ void main() {
     final spkBob = await OmemoKeyPair.generateNewPair(KeyPairType.x25519);
     final opkBob = await OmemoKeyPair.generateNewPair(KeyPairType.x25519);
     final bundleBob = OmemoBundle(
+      'alice@some.server',
       1,
       await spkBob.pk.asBase64(),
       3,
@@ -53,6 +54,7 @@ void main() {
     final spkBob = await OmemoKeyPair.generateNewPair(KeyPairType.x25519);
     final opkBob = await OmemoKeyPair.generateNewPair(KeyPairType.x25519);
     final bundleBob = OmemoBundle(
+      'bob@some.server',
       1,
       await spkBob.pk.asBase64(),
       3,