Merge branch 'release/0.22.4/master'

13027776717 · Feb 25, 2022 · 9f5477e · 9f5477e
2 parents a0c0b80 c31be6f
commit 9f5477e
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 94 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3  1,10 @@
 ## Changes in 0.22.4 (2022-02-25)
 
 🙌 Improvements
 
 - MXThreadingService: Add thread creation delegate method. ([#5694](https://github.com/vector-im/element-ios/issues/5694))
 
 
 ## Changes in 0.22.3 (2022-02-24)
 
 🐛 Bugfixes

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

diff --git a/MatrixSDK/Data/EventTimeline/Room/MXRoomEventTimeline.m b/MatrixSDK/Data/EventTimeline/Room/MXRoomEventTimeline.m
@@ -290,7  290,7 @@ - (MXHTTPOperation *)paginate:(NSUInteger)numItems direction:(MXTimelineDirectio
     [self paginateFromStore:numItems direction:direction onComplete:^(NSArray<MXEvent *> *eventsFromStore) {
         MXStrongifyAndReturnIfNil(self);
 
-        NSUInteger remainingNumItems = numItems;
         NSInteger remainingNumItems = numItems;
         NSUInteger eventsFromStoreCount = eventsFromStore.count;
 
         if (direction == MXTimelineDirectionBackwards)

diff --git a/MatrixSDK/Data/EventTimeline/Thread/MXThreadEventTimeline.swift b/MatrixSDK/Data/EventTimeline/Thread/MXThreadEventTimeline.swift
@@ -216,8  216,8 @@ public class MXThreadEventTimeline: NSObject, MXEventTimeline {
         paginateFromStore(numberOfItems: numItems, direction: direction) { [weak self] eventsFromStore in
             guard let self = self else { return }
 
-            var remainingNumItems = numItems
-            let eventsFromStoreCount = UInt(eventsFromStore.count)
             var remainingNumItems = Int(numItems)
             let eventsFromStoreCount = eventsFromStore.count
 
             if direction == .backwards {
                 // messagesFromStore are in chronological order
@@ -237,7  237,7 @@ public class MXThreadEventTimeline: NSObject, MXEventTimeline {
                     return
                 }
 
-                if remainingNumItems <= 0 && self.hasReachedHomeServerBackwardsPaginationEnd {
                 if remainingNumItems <= 0 || self.hasReachedHomeServerBackwardsPaginationEnd {
                     DispatchQueue.main.async {
                         // Nothing more to do
                         MXLog.debug("[MXThreadEventTimeline][\(self.timelineId)] paginate: is done from the store")
@@ -276,7  276,7 @@ public class MXThreadEventTimeline: NSObject, MXEventTimeline {
                                                             eventType: nil,
                                                             from: paginationToken,
                                                             direction: direction,
-                                                            limit: remainingNumItems,
                                                             limit: UInt(remainingNumItems),
                                                             completion: { [weak self] response in
                                                                 guard let self = self else { return }
                                                                 switch response {

diff --git a/MatrixSDK/MatrixSDKVersion.m b/MatrixSDK/MatrixSDKVersion.m
@@ -16,4  16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixSDKVersion = @"0.22.3";
 NSString *const MatrixSDKVersion = @"0.22.4";
diff --git a/MatrixSDK/Threads/MXThreadingService.swift b/MatrixSDK/Threads/MXThreadingService.swift
@@ -37,7  37,13 @@ extension MXThreadingServiceError: CustomNSError {
 
 @objc
 public protocol MXThreadingServiceDelegate: AnyObject {
-    func threadingServiceDidUpdateThreads(_ service: MXThreadingService)
     /// Delegate method to be called when thread are updated in any way.
     @objc optional func threadingServiceDidUpdateThreads(_ service: MXThreadingService)
 
     /// Delegate method to be called when a new local thread is created
     @objc optional func threadingService(_ service: MXThreadingService,
                                          didCreateNewThread thread: MXThread,
                                          direction: MXTimelineDirection)
 }
 
 @objcMembers
@@ -49,10  55,7 @@ public class MXThreadingService: NSObject {
     private let lockThreads = NSRecursiveLock()
     private var threads: [String: MXThread] = [:]
     private let multicastDelegate: MXMulticastDelegate<MXThreadingServiceDelegate> = MXMulticastDelegate()
-
-    /// Notification to be posted when a new thread is created.
-    public static let newThreadCreated = Notification.Name("MXThreadingService.newThreadCreated")
-
 
     /// Initializer
     /// - Parameter session: session instance
     public init(withSession session: MXSession) {
@@ -244,9  247,7 @@ public class MXThreadingService: NSObject {
             }
             handled = thread.addEvent(event, direction: direction)
             saveThread(thread)
-            DispatchQueue.main.async {
-                NotificationCenter.default.post(name: Self.newThreadCreated, object: thread, userInfo: nil)
-            }
             notifyDidCreateThread(thread, direction: direction)
         }
         notifyDidUpdateThreads()
         return handled
@@ -333,7  334,11 @@ public class MXThreadingService: NSObject {
     }
 
     private func notifyDidUpdateThreads() {
-        multicastDelegate.invoke({ $0.threadingServiceDidUpdateThreads(self) })
         multicastDelegate.invoke({ $0.threadingServiceDidUpdateThreads?(self) })
     }
 
     private func notifyDidCreateThread(_ thread: MXThread, direction: MXTimelineDirection) {
         multicastDelegate.invoke({ $0.threadingService?(self, didCreateNewThread: thread, direction: direction) })
     }
 
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 16,4 @@

		#import <Foundation/Foundation.h>

		NSString *const MatrixSDKVersion = @"0.22.3";
		NSString *const MatrixSDKVersion = @"0.22.4";