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

Merge branch 'soru/fix-incorrect-olm-session-create' into 'master'

Browse source 
Fix some olm sessions not being loaded from database

See merge request famedly/famedlysdk!356
This commit is contained in:
Christian Pauly 2020-06-23 18:20:43 +00:00
parent 36cb6d63db 439f6f0aa0
commit ed262c0d51
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/encryption/olm_manager.dart
View file

@ -400,6 +400,18 @@ class OlmManager {
String type, String type,
Map<String, dynamic> payload) async { Map<String, dynamic> payload) async {
var data = <String, Map<String, Map<String, dynamic>>>{}; var data = <String, Map<String, Map<String, dynamic>>>{};
// first check if any of our sessions we want to encrypt for are in the database
if (client.database != null) {
for (final device in deviceKeys) {
if (!olmSessions.containsKey(device.curve25519Key)) {
final sessions = await client.database.getSingleOlmSessions(
client.id, device.curve25519Key, client.userID);
if (sessions.isNotEmpty) {
_olmSessions[device.curve25519Key] = sessions;
}
}
}
}
final deviceKeysWithoutSession = List<DeviceKeys>.from(deviceKeys); final deviceKeysWithoutSession = List<DeviceKeys>.from(deviceKeys);
deviceKeysWithoutSession.removeWhere((DeviceKeys deviceKeys) => deviceKeysWithoutSession.removeWhere((DeviceKeys deviceKeys) =>
olmSessions.containsKey(deviceKeys.curve25519Key)); olmSessions.containsKey(deviceKeys.curve25519Key));