Merge pull request #2013 from famedly/krille/fix-megolm-sessions-inva…

…lid-after-restart fix: Megolm sessions become invalid after restarting client
famedly · Feb 4, 2025 · 51b1005 · 51b1005
2 parents 0874488 + 6cd40d3
commit 51b1005
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/encryption/key_manager.dart b/lib/encryption/key_manager.dart
@@ -289,8 +289,7 @@ class KeyManager {
         dbSess.sessionId != sessionId) {
       return null;
     }
-    roomInboundGroupSessions[sessionId] = dbSess;
-    return sess;
+    return roomInboundGroupSessions[sessionId] = dbSess;
   }
 
   Map<String, Map<String, bool>> _getDeviceKeyIdMap(
@@ -348,6 +347,8 @@ class KeyManager {
       sess.outboundGroupSession!.session_id(),
     );
     if (inboundSess == null) {
+      Logs().w('No inbound megolm session found for outbound session!');
+      assert(inboundSess != null);
       wipe = true;
     }