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

Merge branch 'client-fix-free-olm-sessions' into 'master'

Browse source 
[Client] Free everything

See merge request famedly/famedlysdk!203
This commit is contained in:
Christian Pauly 2020-02-18 13:37:36 +00:00
parent 6f6171cff1 662f18d86e
commit bcd8054f73
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/src/client.dart
View file

@ -33,6 +33,7 @@ import 'package:famedlysdk/src/sync/user_update.dart';
import 'package:famedlysdk/src/utils/device_keys_list.dart'; import 'package:famedlysdk/src/utils/device_keys_list.dart';
import 'package:famedlysdk/src/utils/matrix_file.dart'; import 'package:famedlysdk/src/utils/matrix_file.dart';
import 'package:famedlysdk/src/utils/open_id_credentials.dart'; import 'package:famedlysdk/src/utils/open_id_credentials.dart';
import 'package:famedlysdk/src/utils/session_key.dart';
import 'package:famedlysdk/src/utils/to_device_event.dart'; import 'package:famedlysdk/src/utils/to_device_event.dart';
import 'package:famedlysdk/src/utils/turn_server_credentials.dart'; import 'package:famedlysdk/src/utils/turn_server_credentials.dart';
import 'package:olm/olm.dart' as olm; import 'package:olm/olm.dart' as olm;
@ -740,6 +741,16 @@ class Client {
/// Resets all settings and stops the synchronisation. /// Resets all settings and stops the synchronisation.
void clear() { void clear() {
olmSessions.values.forEach((List<olm.Session> sessions) {
sessions.forEach((olm.Session session) => session?.free());
});
rooms.forEach((Room room) {
room.clearOutboundGroupSession();
room.sessionKeys.values.forEach((SessionKey sessionKey) {
sessionKey.inboundGroupSession?.free();
});
});
this._olmAccount?.free();
this.storeAPI?.clear(); this.storeAPI?.clear();
this._accessToken = this._homeserver = this._userID = this._deviceID = this this._accessToken = this._homeserver = this._userID = this._deviceID = this
._deviceName = ._deviceName =
@ -1603,9 +1614,11 @@ class Client {
if (!_olmSessions.containsKey(curve25519IdentityKey)) { if (!_olmSessions.containsKey(curve25519IdentityKey)) {
_olmSessions[curve25519IdentityKey] = []; _olmSessions[curve25519IdentityKey] = [];
} }
_olmSessions[curve25519IdentityKey] if (_olmSessions[curve25519IdentityKey]
.removeWhere((olm.Session s) => s.session_id() == session.session_id()); .indexWhere((s) => s.session_id() == session.session_id()) ==
_olmSessions[curve25519IdentityKey].add(session); -1) {
_olmSessions[curve25519IdentityKey].add(session);
}
Map<String, List<String>> pickleMap = {}; Map<String, List<String>> pickleMap = {};
for (var entry in olmSessions.entries) { for (var entry in olmSessions.entries) {
pickleMap[entry.key] = []; pickleMap[entry.key] = [];