Merge branch 'release/0.16.10/master'

Author: pixlwave

CHANGES.md

@@ -1,3 +1,19 @@
+## Changes in 0.16.10 (2021-11-17)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.20.10](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.10)).
+
+🐛 Bugfixes
+
+- MXKRoomViewController: Share sheet is properly presented on iOS 12 when necessary. ([#949](https://github.com/matrix-org/matrix-ios-kit/pull/949))
+- MXKRoomTitleView: Remove room summary observer on destroy. ([#951](https://github.com/matrix-org/matrix-ios-kit/pull/951))
+- MXKRoomViewController: Fix retain cycles that prevents deallocation. ([#5055](https://github.com/vector-im/element-ios/issues/5055))
+- Fix retain cycles that prevents deallocation in several classes. ([#5058](https://github.com/vector-im/element-ios/issues/5058))
+- Ensure alerts with weak references are retained until they've been presented. ([#5071](https://github.com/vector-im/element-ios/issues/5071))
+- Fix room ordering regression. ([#5105](https://github.com/vector-im/element-ios/issues/5105))
+
+
 ## Changes in 0.16.9 (2021-10-21)
 
 🙌 Improvements

MatrixKit.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixKit"
-  s.version      = "0.16.9"
+  s.version      = "0.16.10"
   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.9"
+  s.dependency 'MatrixSDK', "= 0.20.10"
   s.dependency 'HPGrowingTextView', '~> 1.1'
   s.dependency 'libPhoneNumber-iOS', '~> 0.9.13'
   s.dependency 'DTCoreText', '~> 1.6.25'

MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings

@@ -281,6 +281,8 @@
 "attachment_multiselection_original" = "Actual Size";
 "attachment_e2e_keys_file_prompt" = "This file contains encryption keys exported from a Matrix client.\nDo you want to view the file content or import the keys it contains?";
 "attachment_e2e_keys_import" = "Import...";
+"attachment_unsupported_preview_title" = "Unable to preview";
+"attachment_unsupported_preview_message" = "This file type is not supported.";
 
 // Contacts
 "contact_mx_users" = "Matrix Users";

MatrixKit/Controllers/MXKAuthenticationViewController.h

@@ -146,7 +146,7 @@
 /**
  The delegate for the view controller.
  */
-@property (nonatomic) id<MXKAuthenticationViewControllerDelegate> delegate;
+@property (nonatomic, weak) id<MXKAuthenticationViewControllerDelegate> delegate;
 
 /**
  current ongoing MXHTTPOperation. Nil if none.

MatrixKit/Controllers/MXKContactDetailsViewController.h

@@ -56,7 +56,7 @@
 /**
  The delegate for the view controller.
  */
-@property (nonatomic) id<MXKContactDetailsViewControllerDelegate> delegate;
+@property (nonatomic, weak) id<MXKContactDetailsViewControllerDelegate> delegate;
 
 #pragma mark - Class methods
 

MatrixKit/Controllers/MXKContactListViewController.h

@@ -62,7 +62,7 @@
 /**
  The delegate for the view controller.
  */
-@property (nonatomic) id<MXKContactListViewControllerDelegate> delegate;
+@property (nonatomic, weak) id<MXKContactListViewControllerDelegate> delegate;
 
 /**
  Enable the search option by adding a navigation item in the navigation bar (YES by default).

MatrixKit/Controllers/MXKGroupListViewController.h

@@ -48,7 +48,7 @@
     /**
      The fake top view displayed in case of vertical bounce.
      */
-    UIView *topview;
+    __weak UIView *topview;
 }
 
 @property (weak, nonatomic) IBOutlet UISearchBar *groupsSearchBar;
@@ -65,7 +65,7 @@
 /**
  The delegate for the view controller.
  */
-@property (nonatomic) id<MXKGroupListViewControllerDelegate> delegate;
+@property (nonatomic, weak) id<MXKGroupListViewControllerDelegate> delegate;
 
 /**
  Enable the search option by adding a navigation item in the navigation bar (YES by default).

MatrixKit/Controllers/MXKGroupListViewController.m

@@ -145,10 +145,11 @@ - (void)viewDidLoad
 
     // Add a top view which will be displayed in case of vertical bounce.
     CGFloat height = self.groupsTableView.frame.size.height;
-    topview = [[UIView alloc] initWithFrame:CGRectMake(0,-height,self.groupsTableView.frame.size.width,height)];
+    UIView *topview = [[UIView alloc] initWithFrame:CGRectMake(0,-height,self.groupsTableView.frame.size.width,height)];
     topview.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     topview.backgroundColor = [UIColor groupTableViewBackgroundColor];
     [self.groupsTableView addSubview:topview];
+    self->topview = topview;
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -513,8 +514,13 @@ - (void)onSyncNotification
 {
     latestServerSync = [NSDate date];
 
+    MXWeakify(self);
+    
     // Refresh all groups summary
     [self.dataSource refreshGroupsSummary:^{
+        
+        MXStrongifyAndReturnIfNil(self);
+        
         [self removeReconnectingView];
     }];
 }

MatrixKit/Controllers/MXKRecentListViewController.h

@@ -57,7 +57,7 @@ limitations under the License.
     /**
      The fake top view displayed in case of vertical bounce.
      */
-    UIView *topview;
+    __weak UIView *topview;
 }
 
 @property (weak, nonatomic) IBOutlet UISearchBar *recentsSearchBar;
@@ -74,7 +74,7 @@ limitations under the License.
 /**
  The delegate for the view controller.
  */
-@property (nonatomic) id<MXKRecentListViewControllerDelegate> delegate;
+@property (nonatomic, weak) id<MXKRecentListViewControllerDelegate> delegate;
 
 /**
  Enable the search option by adding a navigation item in the navigation bar (YES by default).

MatrixKit/Controllers/MXKRecentListViewController.m

@@ -39,7 +39,7 @@ @interface MXKRecentListViewController ()
     /**
      The reconnection animated view.
      */
-    UIView* reconnectingView;
+    __weak UIView* reconnectingView;
 
     /**
      The current table view header if any.
@@ -146,10 +146,11 @@ - (void)viewDidLoad
 
     // Add a top view which will be displayed in case of vertical bounce.
     CGFloat height = self.recentsTableView.frame.size.height;
-    topview = [[UIView alloc] initWithFrame:CGRectMake(0,-height,self.recentsTableView.frame.size.width,height)];
+    UIView *topview = [[UIView alloc] initWithFrame:CGRectMake(0,-height,self.recentsTableView.frame.size.width,height)];
     topview.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     topview.backgroundColor = [UIColor groupTableViewBackgroundColor];
     [self.recentsTableView addSubview:topview];
+    self->topview = topview;
 }
 
 - (void)viewWillAppear:(BOOL)animated

MatrixKit/Controllers/MXKRoomMemberDetailsViewController.h

@@ -142,7 +142,7 @@ typedef enum : NSUInteger
 /**
  The delegate for the view controller.
  */
-@property (nonatomic) id<MXKRoomMemberDetailsViewControllerDelegate> delegate;
+@property (nonatomic, weak) id<MXKRoomMemberDetailsViewControllerDelegate> delegate;
 
 #pragma mark - Class methods
 

MatrixKit/Controllers/MXKRoomViewController.h

@@ -54,12 +54,12 @@ typedef NS_ENUM(NSUInteger, MXKRoomViewControllerJoinRoomResult) {
     /**
      Potential event details view.
      */
-    MXKEventDetailsView *eventDetailsView;
+    __weak MXKEventDetailsView *eventDetailsView;
 
     /**
      Current alert (if any).
      */
-    UIAlertController *currentAlert;
+    __weak UIAlertController *currentAlert;
 
     /**
      The document interaction Controller used to share attachment
@@ -138,12 +138,12 @@ typedef NS_ENUM(NSUInteger, MXKRoomViewControllerJoinRoomResult) {
 /**
  The current title view defined into the view controller.
  */
-@property (nonatomic, readonly) MXKRoomTitleView* titleView;
+@property (nonatomic, weak, readonly) MXKRoomTitleView* titleView;
 
 /**
  The current input toolbar view defined into the view controller.
  */
-@property (nonatomic, readonly) MXKRoomInputToolbarView* inputToolbarView;
+@property (nonatomic, weak, readonly) MXKRoomInputToolbarView* inputToolbarView;
 
 /**
  The current extra info view defined into the view controller.
@@ -197,12 +197,12 @@ typedef NS_ENUM(NSUInteger, MXKRoomViewControllerJoinRoomResult) {
  This object is defined when the displayed room is left. It is added into the bubbles table header.
  This label is used to display the reason why the room has been left.
  */
-@property (nonatomic, readonly) UILabel *leftRoomReasonLabel;
+@property (nonatomic, weak, readonly) UILabel *leftRoomReasonLabel;
 
-@property (nonatomic) IBOutlet UITableView *bubblesTableView;
-@property (nonatomic) IBOutlet UIView *roomTitleViewContainer;
-@property (nonatomic) IBOutlet UIView *roomInputToolbarContainer;
-@property (nonatomic) IBOutlet UIView *roomActivitiesContainer;
+@property (weak, nonatomic) IBOutlet UITableView *bubblesTableView;
+@property (weak, nonatomic) IBOutlet UIView *roomTitleViewContainer;
+@property (weak, nonatomic) IBOutlet UIView *roomInputToolbarContainer;
+@property (weak, nonatomic) IBOutlet UIView *roomActivitiesContainer;
 
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *bubblesTableViewTopConstraint;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *bubblesTableViewBottomConstraint;