OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'client-fix-claim-keys' into 'master' 

[Client] Fix claim keys not in loop

See merge request famedly/famedlysdk!240
This commit is contained in:
Christian Pauly 2020-03-20 09:50:25 +00:00
parent f40322b8d0 237bd40a15
commit ee3489561e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/src/client.dart
View File

@ -1729,6 +1729,16 @@ class Client {
} }
} }
} else { } else {
if (encrypted) {
// Create new sessions with devices if there is no existing session yet.
List<DeviceKeys> deviceKeysWithoutSession =
List<DeviceKeys>.from(deviceKeys);
deviceKeysWithoutSession.removeWhere((DeviceKeys deviceKeys) =>
olmSessions.containsKey(deviceKeys.curve25519Key));
if (deviceKeysWithoutSession.isNotEmpty) {
await startOutgoingOlmSessions(deviceKeysWithoutSession);
}
}
for (int i = 0; i < deviceKeys.length; i++) { for (int i = 0; i < deviceKeys.length; i++) {
DeviceKeys device = deviceKeys[i]; DeviceKeys device = deviceKeys[i];
if (!data["messages"].containsKey(device.userId)) { if (!data["messages"].containsKey(device.userId)) {
@ -1736,14 +1746,6 @@ class Client {
} }
if (encrypted) { if (encrypted) {
// Create new sessions with devices if there is no existing session yet.
List<DeviceKeys> deviceKeysWithoutSession =
List<DeviceKeys>.from(deviceKeys);
deviceKeysWithoutSession.removeWhere((DeviceKeys deviceKeys) =>
olmSessions.containsKey(deviceKeys.curve25519Key));
if (deviceKeysWithoutSession.isNotEmpty) {
await startOutgoingOlmSessions(deviceKeysWithoutSession);
}
List<olm.Session> existingSessions = List<olm.Session> existingSessions =
olmSessions[device.curve25519Key]; olmSessions[device.curve25519Key];
if (existingSessions == null || existingSessions.isEmpty) continue; if (existingSessions == null || existingSessions.isEmpty) continue;