Revert "Merge branch 'release/0.20.11/master'"

This reverts commit 2b3f6bf, reversing
changes made to 84a6ed0.

.github/workflows/ci-lint.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   lint:
     name: pod lib lint
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2

.github/workflows/ci-unit-tests.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   unit-tests:
     name: Unit Tests
-    runs-on: macos-11
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/nightly.yml

@@ -10,7 +10,7 @@ jobs:
 
   unit-tests:
     name: Unit Tests with sanitizer checks
-    runs-on: macos-11
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v2
@@ -55,7 +55,7 @@ jobs:
 
   integration-tests:
     name: Integration Tests (Synapse) with sanitizer checks
-    runs-on: macos-11
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v2

CHANGES.md

@@ -1,25 +1,3 @@
-## Changes in 0.20.11 (2021-12-03)
-
-✨ Features
-
-- Moved from /space to /hierarchy API to support pagination ([#4893](https://github.com/vector-im/element-ios/issues/4893))
-- Adds clientPermalinkBaseUrl for a custom permalink base url. ([#4981](https://github.com/vector-im/element-ios/issues/4981))
-- Added poll specific event sending methods, event aggregator and model builder. ([#5114](https://github.com/vector-im/element-ios/issues/5114))
-
-🐛 Bugfixes
-
-- Initialize imagesCacheLruCache before caching - caching operations would fail silently because cache was not initialized ([#1281](https://github.com/vector-im/element-ios/issues/1281))
-- MXRoom: Fix reply event content for just thread-aware clients. ([#5007](https://github.com/vector-im/element-ios/issues/5007))
-- Add ability to get roomAccountData from MXBackgroundSyncService to fix badge bug from virtual rooms. ([#5155](https://github.com/vector-im/element-ios/issues/5155))
-- Fixed duplicated children ids in MXSpaces ([#5181](https://github.com/vector-im/element-ios/issues/5181))
-- Do not expose headers that should be use privately inside the framework. ([#5194](https://github.com/vector-im/element-ios/issues/5194))
-- Fix for the in-call screen freezing on a new PSTN call. ([#5223](https://github.com/vector-im/element-ios/issues/5223))
-
-🧱 Build
-
-- Build: Update to Xcode 12.5 in the Fastfile and macOS 11 in the GitHub actions. ([#5195](https://github.com/vector-im/element-ios/issues/5195))
-
-
 ## Changes in 0.20.10 (2021-11-17)
 
 🙌 Improvements

Gemfile

@@ -2,4 +2,3 @@ source "https://rubygems.org"
 
 gem "fastlane"
 gem "cocoapods", '~>1.11.2'
-gem "xcode-install"

Gemfile.lock

@@ -256,9 +256,6 @@ GEM
     unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
-    xcode-install (2.6.7)
-      claide (>= 0.9.1, < 1.1.0)
-      fastlane (>= 2.1.0, < 3.0.0)
     xcodeproj (1.21.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
@@ -278,7 +275,6 @@ PLATFORMS
 DEPENDENCIES
   cocoapods (~> 1.11.2)
   fastlane
-  xcode-install
 
 BUNDLED WITH
    2.2.28

MatrixSDK.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixSDK"
-  s.version      = "0.20.11"
+  s.version      = "0.20.10"
   s.summary      = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)"
 
   s.description  = <<-DESC
@@ -32,7 +32,6 @@ Pod::Spec.new do |s|
 
       ss.source_files = "MatrixSDK", "MatrixSDK/**/*.{h,m}", "MatrixSDK/**/*.{swift}"
       ss.osx.exclude_files = "MatrixSDK/VoIP/MXiOSAudioOutputRoute*.swift"
-      ss.private_header_files = ['MatrixSDK/MatrixSDKSwiftHeader.h', "MatrixSDK/**/*_Private.h"]
 
       ss.dependency 'AFNetworking', '~> 4.0.0'
       ss.dependency 'GZIP', '~> 1.3.0'

MatrixSDK/Aggregations/MXAggregations.h

@@ -111,7 +111,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (MXHTTPOperation*)reactionsEventsForEvent:(NSString*)eventId
                                      inRoom:(NSString*)roomId
                                        from:(nullable NSString*)from
-                                      limit:(NSInteger)limit
+                                      limit:(NSUInteger)limit
                                     success:(void (^)(MXAggregationPaginatedResponse *paginatedResponse))success
                                     failure:(void (^)(NSError *error))failure;
 
@@ -168,7 +168,7 @@ NS_ASSUME_NONNULL_BEGIN
                               isEncrypted:(BOOL)isEncrypted
                                    inRoom:(NSString*)roomId
                                      from:(nullable NSString*)from
-                                    limit:(NSInteger)limit
+                                    limit:(NSUInteger)limit
                                   success:(void (^)(MXAggregationPaginatedResponse *paginatedResponse))success
                                   failure:(void (^)(NSError *error))failure;
 
@@ -191,7 +191,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (MXHTTPOperation*)referenceEventsForEvent:(NSString*)eventId
                                    inRoom:(NSString*)roomId
                                      from:(nullable NSString*)from
-                                    limit:(NSInteger)limit
+                                    limit:(NSUInteger)limit
                                   success:(void (^)(MXAggregationPaginatedResponse *paginatedResponse))success
                                   failure:(void (^)(NSError *error))failure;
 

MatrixSDK/Aggregations/MXAggregations.m

@@ -90,7 +90,7 @@ - (void)removeListener:(id)listener
 - (MXHTTPOperation*)reactionsEventsForEvent:(NSString*)eventId
                                      inRoom:(NSString*)roomId
                                        from:(nullable NSString*)from
-                                      limit:(NSInteger)limit
+                                      limit:(NSUInteger)limit
                                     success:(void (^)(MXAggregationPaginatedResponse *paginatedResponse))success
                                     failure:(void (^)(NSError *error))failure
 {
@@ -126,7 +126,7 @@ - (MXHTTPOperation*)replaceEventsForEvent:(NSString*)eventId
                               isEncrypted:(BOOL)isEncrypted
                                    inRoom:(NSString*)roomId
                                      from:(nullable NSString*)from
-                                    limit:(NSInteger)limit
+                                    limit:(NSUInteger)limit
                                   success:(void (^)(MXAggregationPaginatedResponse *paginatedResponse))success
                                   failure:(void (^)(NSError *error))failure
 {
@@ -137,7 +137,7 @@ - (MXHTTPOperation*)replaceEventsForEvent:(NSString*)eventId
 - (MXHTTPOperation*)referenceEventsForEvent:(NSString*)eventId
                                      inRoom:(NSString*)roomId
                                        from:(nullable NSString*)from
-                                      limit:(NSInteger)limit
+                                      limit:(NSUInteger)limit
                                     success:(void (^)(MXAggregationPaginatedResponse *paginatedResponse))success
                                     failure:(void (^)(NSError *error))failure
 {

MatrixSDK/Background/MXBackgroundSyncService.swift

@@ -627,24 +627,4 @@ public enum MXBackgroundSyncServiceError: Error {
         }
     }
 
-    /// Fetch room account data for given roomId.
-    /// - Parameters:
-    ///   - roomId: The room identifier for the desired room.
-    ///   - completion: Completion block to be called. Always called in main thread.
-    public func roomAccountData(forRoomId roomId: String,
-                                completion: @escaping (MXResponse<MXRoomAccountData>) -> Void) {
-        processingQueue.async {
-            guard let accountData = self.store.accountData?(ofRoom: roomId) else {
-                Queues.dispatchQueue.async {
-                    completion(.failure(MXBackgroundSyncServiceError.unknown))
-                }
-                return
-            }
-
-            Queues.dispatchQueue.async {
-                completion(.success(accountData))
-            }
-        }
-    }
-
 }

MatrixSDK/Contrib/Swift/MXRestClient.swift

@@ -1883,12 +1883,10 @@ public extension MXRestClient {
     ///   - spaceId: The room id of the queried space.
     ///   - suggestedOnly: If `true`, return only child events and rooms where the `m.space.child` event has `suggested: true`.
     ///   - limit: Optional. A limit to the maximum number of children to return per space. `-1` for no limit
-    ///   - maxDepth: Optional. The maximum depth in the tree (from the root room) to return. `-1` for no limit
-    ///   - paginationToken: Optional. Pagination token given to retrieve the next set of rooms.
     ///   - parameters: Space children request parameters.
     ///   - completion: A closure called when the operation completes.
     /// - Returns: a `MXHTTPOperation` instance.
-    @nonobjc @discardableResult func getSpaceChildrenForSpace(withId spaceId: String, suggestedOnly: Bool, limit: Int?, maxDepth: Int?, paginationToken: String?, completion: @escaping (_ response: MXResponse<MXSpaceChildrenResponse>) -> Void) -> MXHTTPOperation {
-        return __getSpaceChildrenForSpace(withId: spaceId, suggestedOnly: suggestedOnly, limit: limit ?? -1, maxDepth: maxDepth ?? -1, paginationToken: paginationToken, success: currySuccess(completion), failure: curryFailure(completion))
+    @nonobjc @discardableResult func getSpaceChildrenForSpace(withId spaceId: String, suggestedOnly: Bool, limit: Int?, completion: @escaping (_ response: MXResponse<MXSpaceChildrenResponse>) -> Void) -> MXHTTPOperation {
+        return __getSpaceChildrenForSpace(withId: spaceId, suggestedOnly: suggestedOnly, limit: limit ?? -1, success: currySuccess(completion), failure: curryFailure(completion))
     }
 }

MatrixSDK/Crypto/Data/MXOutboundSessionInfo.h

@@ -17,8 +17,7 @@
 #import <Foundation/Foundation.h>
 
 #import "MXTools.h"
-#import "MXOlmOutboundGroupSession.h"
-#import "MXHTTPOperation.h"
+#import "MXCrypto_Private.h"
 
 @interface MXOutboundSessionInfo : NSObject
 {

MatrixSDK/Crypto/Data/MXOutboundSessionInfo.m

@@ -15,6 +15,7 @@
 //
 
 #import "MXOutboundSessionInfo.h"
+#import "MXOlmOutboundGroupSession.h"
 
 @implementation MXOutboundSessionInfo
 

MatrixSDK/Crypto/Verification/Transactions/QRCode/MXQRCodeTransaction.h

@@ -44,8 +44,6 @@ typedef NS_ENUM(NSInteger, MXQRCodeTransactionState) {
 
 @property (nonatomic) MXQRCodeTransactionState state;
 
-@property (nonatomic, strong, nullable, readonly) MXQRCodeData *qrCodeData;
-
 /**
  Start the key verification process.
  */

MatrixSDK/Data/MXRoom.h

@@ -28,7 +28,6 @@
 
 #import "MXEvent.h"
 #import "MXJSONModels.h"
-#import "MXEventContentPollStart.h"
 #import "MXRoomSummary.h"
 #import "MXRoomMember.h"
 #import "MXReceiptData.h"
@@ -932,23 +931,6 @@ FOUNDATION_EXPORT NSInteger const kMXRoomAlreadyJoinedErrorCode;
                              success:(void (^)(NSString *eventId))success
                              failure:(void (^)(NSError *error))failure NS_REFINED_FOR_SWIFT;
 
-#pragma mark - Polls
-
-- (MXHTTPOperation *)sendPollStartWithContent:(MXEventContentPollStart *)content
-                                    localEcho:(MXEvent **)localEcho
-                                      success:(void (^)(NSString *))success
-                                      failure:(void (^)(NSError *))failure;
-
-- (MXHTTPOperation*)sendPollResponseForEvent:(MXEvent *)pollEvent
-                       withAnswerIdentifiers:(NSArray<NSString *> *)answerIdentifiers
-                                   localEcho:(MXEvent **)localEcho
-                                     success:(void (^)(NSString *eventId))success
-                                     failure:(void (^)(NSError *error))failure;
-
-- (MXHTTPOperation*)sendPollEndForEvent:(MXEvent *)pollEvent
-                              localEcho:(MXEvent **)localEcho
-                                success:(void (^)(NSString *eventId))success
-                                failure:(void (^)(NSError *error))failure;
 
 #pragma mark - Events listeners on the live timeline
 /**