inex/famedlysdk
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'room-fix-create-megolm-session' into 'master'

Browse source 
[Room] Fix create megolm session

See merge request famedly/famedlysdk!234
This commit is contained in:
Christian Pauly 2020-03-13 10:09:49 +00:00
parent c57c7d6719 391a9af2ba
commit bc5a716b3f
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/src/room.dart
View file

@ -93,38 +93,40 @@ class Room {
Future<void> createOutboundGroupSession() async { Future<void> createOutboundGroupSession() async {
await clearOutboundGroupSession(wipe: true); await clearOutboundGroupSession(wipe: true);
List<DeviceKeys> deviceKeys = await getUserDeviceKeys(); List<DeviceKeys> deviceKeys = await getUserDeviceKeys();
_outboundGroupSessionDevices = []; olm.OutboundGroupSession outboundGroupSession;
List<String> outboundGroupSessionDevices = [];
for (DeviceKeys keys in deviceKeys) { for (DeviceKeys keys in deviceKeys) {
if (!keys.blocked) _outboundGroupSessionDevices.add(keys.deviceId); if (!keys.blocked) outboundGroupSessionDevices.add(keys.deviceId);
} }
_outboundGroupSessionDevices.sort(); outboundGroupSessionDevices.sort();
try { try {
_outboundGroupSession = olm.OutboundGroupSession(); outboundGroupSession = olm.OutboundGroupSession();
_outboundGroupSession.create(); outboundGroupSession.create();
} catch (e) { } catch (e) {
_outboundGroupSession = null; outboundGroupSession = null;
print("[LibOlm] Unable to create new outboundGroupSession: " + print("[LibOlm] Unable to create new outboundGroupSession: " +
e.toString()); e.toString());
} }
if (_outboundGroupSession == null) return; if (outboundGroupSession == null) return;
await _storeOutboundGroupSession();
// Add as an inboundSession to the [sessionKeys]. // Add as an inboundSession to the [sessionKeys].
Map<String, dynamic> rawSession = { Map<String, dynamic> rawSession = {
"algorithm": "m.megolm.v1.aes-sha2", "algorithm": "m.megolm.v1.aes-sha2",
"room_id": this.id, "room_id": this.id,
"session_id": _outboundGroupSession.session_id(), "session_id": outboundGroupSession.session_id(),
"session_key": _outboundGroupSession.session_key(), "session_key": outboundGroupSession.session_key(),
}; };
setSessionKey(rawSession["session_id"], rawSession); setSessionKey(rawSession["session_id"], rawSession);
try { try {
await client.sendToDevice(deviceKeys, "m.room_key", rawSession); await client.sendToDevice(deviceKeys, "m.room_key", rawSession);
_outboundGroupSession = outboundGroupSession;
_outboundGroupSessionDevices = outboundGroupSessionDevices;
await _storeOutboundGroupSession();
} catch (e) { } catch (e) {
print( print(
"[LibOlm] Unable to send the session key to the participating devices: " + "[LibOlm] Unable to send the session key to the participating devices: " +
e.toString()); e.toString());
await clearOutboundGroupSession(wipe: true); await this.clearOutboundGroupSession();
} }
return; return;
} }