Merge branch 'release/0.23.15/master'

matrix-org · Aug 10, 2022 · a68cb3e · a68cb3e
2 parents 7a69ef4 + b4897bb
commit a68cb3e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,10 @@
+## Changes in 0.23.15 (2022-08-10)
+
+🐛 Bugfixes
+
+- MXSpaceService: Fix a crash on Synapse 1.65 following changes to the /hierarchy API. ([#6547](https://github.com/vector-im/element-ios/issues/6547))
+
+
 ## Changes in 0.23.14 (2022-08-09)
 
 🙌 Improvements

diff --git a/MatrixSDK.podspec b/MatrixSDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixSDK"
-  s.version      = "0.23.14"
+  s.version      = "0.23.15"
   s.summary      = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)"
 
   s.description  = <<-DESC

diff --git a/MatrixSDK/MatrixSDKVersion.m b/MatrixSDK/MatrixSDKVersion.m
@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixSDKVersion = @"0.23.14";
+NSString *const MatrixSDKVersion = @"0.23.15";
diff --git a/MatrixSDK/Space/MXSpaceService.swift b/MatrixSDK/Space/MXSpaceService.swift
@@ -376,12 +376,12 @@ public class MXSpaceService: NSObject {
                             spaceChildEventsPerChildRoomId[event.stateKey] = event.wireContent
 
                             var parentIds = parentIdsPerChildRoomId[event.stateKey] ?? Set()
-                            parentIds.insert(event.roomId)
+                            parentIds.insert(room.roomId)
                             parentIdsPerChildRoomId[event.stateKey] = parentIds
 
-                            var childrenIds = childrenIdsPerChildRoomId[event.roomId] ?? []
+                            var childrenIds = childrenIdsPerChildRoomId[room.roomId] ?? []
                             childrenIds.append(event.stateKey)
-                            childrenIdsPerChildRoomId[event.roomId] = childrenIds
+                            childrenIdsPerChildRoomId[room.roomId] = childrenIds
                         }
                     }