Merge branch 'release/0.16.1/master'

matrix-org · Sep 16, 2021 · e054ca0 · e054ca0
2 parents 1bb391e + 8e64d13
commit e054ca0
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 61 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,17 @@
+## Changes in 0.16.1 (2021-09-16)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.20.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.1)).
+- MXKRoomDataSource: Add logs to better understand local echo lifecycle. ([#1771](https://github.com/vector-im/element-ios/issues/1771))
+- MXKAccount: Use new `pauseable` property of MXSession to check the session is suitable for pausing. ([#4834](https://github.com/vector-im/element-ios/issues/4834))
+
+🐛 Bugfixes
+
+- MXKRoomDataSource: Fix missing local echos. ([#1771](https://github.com/vector-im/element-ios/issues/1771))
+- MXKRoomViewController: Mark room as read when displayed. ([#4822](https://github.com/vector-im/element-ios/issues/4822))
+
+
 ## Changes in 0.16.0 (2021-09-09)
 
 ✨ Features

diff --git a/MatrixKit.podspec b/MatrixKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixKit"
-  s.version      = "0.16.0"
+  s.version      = "0.16.1"
   s.summary      = "The Matrix reusable UI library for iOS based on MatrixSDK."
 
   s.description  = <<-DESC
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
 
   s.swift_version = '5.0'
 
-  s.dependency 'MatrixSDK', "= 0.20.0"
+  s.dependency 'MatrixSDK', "= 0.20.1"
   s.dependency 'HPGrowingTextView', '~> 1.1'
   s.dependency 'libPhoneNumber-iOS', '~> 0.9.13'
   s.dependency 'DTCoreText', '~> 1.6.25'

diff --git a/MatrixKit/Controllers/MXKRoomViewController.m b/MatrixKit/Controllers/MXKRoomViewController.m
@@ -384,6 +384,9 @@ - (void)viewDidAppear:(BOOL)animated
     {
         hasAppearedOnce = YES;
     }
+
+    //  Mark all messages as read when the room is displayed
+    [self.roomDataSource.room.summary markAllAsReadLocally];
 }
 
 - (void)viewWillDisappear:(BOOL)animated

diff --git a/MatrixKit/MatrixKitVersion.m b/MatrixKit/MatrixKitVersion.m
@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixKitVersion = @"0.16.0";
+NSString *const MatrixKitVersion = @"0.16.1";
diff --git a/MatrixKit/Models/Account/MXKAccount.m b/MatrixKit/Models/Account/MXKAccount.m
@@ -1080,7 +1080,7 @@ - (void)pauseInBackgroundTask
     // Reset internal flag
     isPauseRequested = NO;
 
-    if (mxSession && mxSession.state == MXSessionStateRunning)
+    if (mxSession && mxSession.isPauseable)
     {
         id<MXBackgroundModeHandler> handler = [MXSDKOptions sharedInstance].backgroundModeHandler;
         if (handler)
@@ -1143,6 +1143,8 @@ - (void)resume
 
     if (mxSession)
     {
+        MXLogVerbose(@"[MXKAccount] resume with session state: %tu", mxSession.state);
+
         [self cancelBackgroundSync];
 
         if (mxSession.state == MXSessionStatePaused || mxSession.state == MXSessionStatePauseRequested)

diff --git a/MatrixKit/Models/Room/MXKRoomDataSource.m b/MatrixKit/Models/Room/MXKRoomDataSource.m
diff --git a/Podfile b/Podfile
@@ -8,7 +8,7 @@ abstract_target 'MatrixKitSamplePods' do
 
     # Different flavours of pods to Matrix SDK
     # The tagged version on which this version of MatrixKit has been built
-    pod 'MatrixSDK', '= 0.20.0'
+    pod 'MatrixSDK', '= 0.20.1'
 
     # The lastest release available on the CocoaPods repository
     #pod 'MatrixSDK'

diff --git a/Podfile.lock b/Podfile.lock
@@ -39,20 +39,20 @@ PODS:
   - JSQSystemSoundPlayer (2.0.1)
   - libbase58 (0.1.4)
   - libPhoneNumber-iOS (0.9.15)
-  - MatrixSDK (0.20.0):
-    - MatrixSDK/Core (= 0.20.0)
-  - MatrixSDK/Core (0.20.0):
+  - MatrixSDK (0.20.1):
+    - MatrixSDK/Core (= 0.20.1)
+  - MatrixSDK/Core (0.20.1):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - OLMKit (~> 3.2.4)
     - Realm (= 10.7.6)
     - SwiftyBeaver (= 1.9.5)
-  - OLMKit (3.2.4):
-    - OLMKit/olmc (= 3.2.4)
-    - OLMKit/olmcpp (= 3.2.4)
-  - OLMKit/olmc (3.2.4)
-  - OLMKit/olmcpp (3.2.4)
+  - OLMKit (3.2.5):
+    - OLMKit/olmc (= 3.2.5)
+    - OLMKit/olmcpp (= 3.2.5)
+  - OLMKit/olmc (3.2.5)
+  - OLMKit/olmcpp (3.2.5)
   - Realm (10.7.6):
     - Realm/Headers (= 10.7.6)
   - Realm/Headers (10.7.6)
@@ -64,7 +64,7 @@ DEPENDENCIES:
   - HPGrowingTextView (~> 1.1)
   - JSQMessagesViewController (~> 7.3.5)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.20.0)
+  - MatrixSDK (= 0.20.1)
 
 SPEC REPOS:
   trunk:
@@ -94,11 +94,11 @@ SPEC CHECKSUMS:
   JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
   libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
-  MatrixSDK: 07bbc083632799e9ef7f3b14139cb1ab72f1610e
-  OLMKit: 2d73cd67d149b5c3e3a8eb8ecae93d0b429d8a02
+  MatrixSDK: 37fbb6a650095387e908937b7411c4370599c90b
+  OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   Realm: ed860452717c8db8f4bf832b6807f7f2ce708839
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
 
-PODFILE CHECKSUM: 49fb70703ff2555fc35cf3d42e779ba6f614e3df
+PODFILE CHECKSUM: 86fda57346abf3e42c36ceb4e7232f6fe85209bd
 
 COCOAPODS: 1.10.1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,4 @@

		#import <Foundation/Foundation.h>

		NSString *const MatrixKitVersion = @"0.16.0";
		NSString *const MatrixKitVersion = @"0.16.1";