Merge branch 'release/0.23.2/master'

Author: pixlwave

CHANGES.md

@@ -1,3 +1,27 @@
+## Changes in 0.23.2 (2022-04-05)
+
+🙌 Improvements
+
+- Room: Return room identifier and known servers when resolving alias ([#4858](https://github.com/vector-im/element-ios/issues/4858))
+- MXRestClient: Use the stable hierarchy endpoint from MSC2946 ([#5144](https://github.com/vector-im/element-ios/issues/5144))
+- MXPublicRoom: added implementation for JSONDictionary ([#5953](https://github.com/vector-im/element-ios/issues/5953))
+
+🐛 Bugfixes
+
+- MXEventListener/MXRoomSummary: Fix retain cycles ([#5058](https://github.com/vector-im/element-ios/issues/5058))
+- Sync Spaces order with web ([#5134](https://github.com/vector-im/element-ios/issues/5134))
+- VoIP: Recreate CXProvider if a call cannot be hung up ([#5189](https://github.com/vector-im/element-ios/issues/5189))
+- MXThreadingService: Apply edits on thread root and latest events of a thread list. ([#5845](https://github.com/vector-im/element-ios/issues/5845))
+- MXThread: Fix redacted events & fix undecrypted events. ([#5877](https://github.com/vector-im/element-ios/issues/5877))
+- Room: Do not commit to file store after typing a single character ([#5906](https://github.com/vector-im/element-ios/issues/5906))
+- Move `handleRoomKeyEvent` logic back to `MXSession`. ([#5938](https://github.com/vector-im/element-ios/issues/5938))
+- MXSuggestedRoomListDataFetcher: Spaces shouldn't be displayed as suggested rooms ([#5978](https://github.com/vector-im/element-ios/issues/5978))
+
+⚠️ API Changes
+
+- Location sharing: Add new event asset type for pin drop location sharing ([#5858](https://github.com/vector-im/element-ios/issues/5858))
+
+
 ## Changes in 0.23.1 (2022-03-28)
 
 🙌 Improvements

MatrixSDK.podspec

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

MatrixSDK.xcodeproj/project.pbxproj

@@ -1665,17 +1665,17 @@ public extension MXRestClient {
     }
 
     /**
-     Get the room ID corresponding to this room alias
-     
+     Resolve given room alias to a room identifier and a list of servers aware of this identifier
+
      - parameters:
         - roomAlias: the alias of the room to look for.
         - completion: A block object called when the operation completes.
-        - response: Provides the the ID of the room on success.
-     
+        - response: Provides a resolution object containing the room ID and a list of servers
+
      - returns: a `MXHTTPOperation` instance.
      */
-    @nonobjc @discardableResult func roomId(forRoomAlias roomAlias: String, completion: @escaping (_ response: MXResponse<String>) -> Void) -> MXHTTPOperation {
-        return __roomID(forRoomAlias: roomAlias, success: currySuccess(completion), failure: curryFailure(completion))
+    @nonobjc @discardableResult func resolveRoomAlias(_ roomAlias: String, completion: @escaping (_ response: MXResponse<MXRoomAliasResolution>) -> Void) -> MXHTTPOperation {
+        return __resolveRoomAlias(roomAlias, success: currySuccess(completion), failure: curryFailure(completion))
     }
 
     // Mark: - Media Repository API
@@ -1842,7 +1842,7 @@ public extension MXRestClient {
 
      - returns: a `MXHTTPOperation` instance.
      */
-    @nonobjc @discardableResult func sendDirectToDevice(eventType: String, contentMap: MXUsersDevicesMap<NSDictionary>, txnId: String, completion: @escaping (_ response: MXResponse<Void>) -> Void) -> MXHTTPOperation {
+    @nonobjc @discardableResult func sendDirectToDevice(eventType: String, contentMap: MXUsersDevicesMap<NSDictionary>, txnId: String?, completion: @escaping (_ response: MXResponse<Void>) -> Void) -> MXHTTPOperation {
         return __send(toDevice: eventType, contentMap: contentMap, txnId: txnId, success: currySuccess(completion), failure: curryFailure(completion))
     }
 

MatrixSDK/Contrib/Swift/MXRestClient.swift

@@ -24,6 +24,7 @@
 #import "MXCryptoAlgorithms.h"
 #import "MXCrypto_Private.h"
 #import "MXTools.h"
+#import "MatrixSDKSwiftHeader.h"
 
 @interface MXMegolmDecryption ()
 {
@@ -146,7 +147,8 @@ - (MXEventDecryptionResult *)decryptEvent:(MXEvent*)event inTimeline:(NSString*)
 
         result.error = olmError;
     }
-
+    
+    [crypto.mxSession.eventStreamService dispatchLiveEventDecryptionAttemptedWithEvent:event result:result];
     return result;
 }
 

MatrixSDK/Crypto/Algorithms/Megolm/MXMegolmDecryption.m

@@ -51,6 +51,7 @@
 
 #import "MXDeviceListResponse.h"
 
+#import "MatrixSDKSwiftHeader.h"
 /**
  The store to use for crypto.
  */

MatrixSDK/Crypto/MXCrypto.m

@@ -51,7 +51,7 @@ typedef void (^MXOnEvent)(MXEvent *event, MXTimelineDirection direction, id _Nul
  */
 - (void)notify:(MXEvent*)event direction:(MXTimelineDirection)direction andCustomObject:(nullable id)customObject;
 
-@property (nonatomic, readonly) id sender;
+@property (nonatomic, weak, readonly) id sender;
 @property (nonatomic, nullable, readonly) NSArray<MXEventTypeString>* eventTypes;
 @property (nonatomic, readonly) MXOnEvent listenerBlock;
 

MatrixSDK/Data/MXEventListener.h

@@ -39,6 +39,7 @@
 #import "MXCall.h"
 #import "MXEventTimeline.h"
 #import "MXEventsEnumerator.h"
+#import "MXEventContentLocation.h"
 #import "MXCryptoConstants.h"
 #import "MXSendReplyEventStringLocalizerProtocol.h"
 
@@ -1026,6 +1027,7 @@ FOUNDATION_EXPORT NSInteger const kMXRoomInvalidInviteSenderErrorCode;
                                   description:(NSString *)description
                                      threadId:(NSString*)threadId
                                     localEcho:(MXEvent **)localEcho
+                                    assetType:(MXEventAssetType)assetType
                                       success:(void (^)(NSString *))success
                                       failure:(void (^)(NSError *))failure;
 

MatrixSDK/Data/MXRoom.h

@@ -370,10 +370,6 @@ - (MXHTTPOperation*)members:(void (^)(MXRoomMembers *members))success
 - (void)setPartialTextMessage:(NSString *)partialTextMessage
 {
     [mxSession.store storePartialTextMessageForRoom:self.roomId partialTextMessage:partialTextMessage];
-    if ([mxSession.store respondsToSelector:@selector(commit)])
-    {
-        [mxSession.store commit];
-    }
 }
 
 - (NSString *)partialTextMessage
@@ -2539,10 +2535,11 @@ - (MXHTTPOperation *)sendLocationWithLatitude:(double)latitude
                                   description:(NSString *)description
                                      threadId:(NSString*)threadId
                                     localEcho:(MXEvent **)localEcho
+                                    assetType:(MXEventAssetType)assetType
                                       success:(void (^)(NSString *))success
                                       failure:(void (^)(NSError *))failure
 {
-    MXEventContentLocation *locationContent = [[MXEventContentLocation alloc] initWithAssetType:MXEventAssetTypeUser
+    MXEventContentLocation *locationContent = [[MXEventContentLocation alloc] initWithAssetType:assetType
                                                                                        latitude:latitude
                                                                                       longitude:longitude
                                                                                     description:description];
@@ -2551,7 +2548,7 @@ - (MXHTTPOperation *)sendLocationWithLatitude:(double)latitude
 
     [content addEntriesFromDictionary:locationContent.JSONDictionary];
 
-    NSString *fallbackText = [NSString stringWithFormat:@"%@ was at %@ as of %@", self.mxSession.myUser.displayname, locationContent.geoURI, NSDate.date];
+    NSString *fallbackText = [NSString stringWithFormat:@"Location was shared at %@ as of %@", locationContent.geoURI, NSDate.date];
     content[kMXMessageBodyKey] = fallbackText;
     content[kMXMessageContentKeyExtensibleTextMSC1767] = fallbackText;
 

MatrixSDK/Data/MXRoom.m

@@ -374,7 +374,9 @@ - (MXHTTPOperation *)fetchLastMessageWithMaxServerPaginationCount:(NSUInteger)ma
 
     // Process every message received by back pagination
     __block BOOL lastMessageUpdated = NO;
+    MXWeakify(timeline);
     [timeline listenToEvents:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *eventState) {
+        MXStrongifyAndReturnIfNil(timeline);
         if (direction == MXTimelineDirectionBackwards
             && !lastMessageUpdated)
         {