Do not make the placeholder appearing when leaving a room on iPhone

.github/ISSUE_TEMPLATE/bug.yml

@@ -64,9 +64,9 @@ body:
   - type: dropdown
     id: rageshake
     attributes:
-      label: Have you submitted a rageshake?
+      label: Will you send logs?
       description:  |
-        Did you know that you can shake your phone to submit logs for this issue? Trigger the defect, then shake your phone and you will see a popup asking if you would like to open the bug report screen. Click YES, and describe the issue, mentioning that you have also filed a bug. Submit the report to send anonymous logs to the developers.
+        Did you know that you can shake your phone to submit logs for this issue? Trigger the defect, then shake your phone and you will see a popup asking if you would like to open the bug report screen. Click YES, and describe the issue, mentioning that you have also filed a bug (it's helpful if you can include a link to the bug). Send the report to submit anonymous logs to the developers.
       options:
         - 'Yes'
         - 'No'

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.6.6
-CURRENT_PROJECT_VERSION = 1.6.6
+MARKETING_VERSION = 1.6.7
+CURRENT_PROJECT_VERSION = 1.6.7

Podfile

@@ -73,7 +73,6 @@ abstract_target 'RiotPods' do
     pod 'SideMenu', '~> 6.5'
     pod 'DSWaveformImage', '~> 6.1.1'
     pod 'ffmpeg-kit-ios-audio', '~> 4.5'
-    pod 'GrowingTextView', '~> 0.7.2'
 
     pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
 

Riot/Assets/SharedImages.xcassets/radio-button-default.imageset/Contents.json

@@ -19,5 +19,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }

Riot/Assets/SharedImages.xcassets/radio-button-selected.imageset/Contents.json

@@ -19,5 +19,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }

Riot/Assets/en.lproj/Vector.strings

@@ -1016,6 +1016,9 @@ Tap the + to start adding people.";
 // Share extension
 "share_extension_auth_prompt" = "Login in the main app to share content";
 "share_extension_failed_to_encrypt" = "Failed to send. Check in the main app the encryption settings for this room";
+"share_extension_low_quality_video_title" = "Video will be sent in low quality";
+"share_extension_low_quality_video_message" = "Send in %@ for better quality, or send in low quality below.";
+"share_extension_send_now" = "Send now";
 
 // Room key request dialog
 "e2e_room_key_request_title" = "Encryption key request";

Riot/Generated/Strings.swift

@@ -4775,6 +4775,18 @@ public class VectorL10n: NSObject {
   public static var shareExtensionFailedToEncrypt: String { 
     return VectorL10n.tr("Vector", "share_extension_failed_to_encrypt") 
   }
+  /// Send in %@ for better quality, or send in low quality below.
+  public static func shareExtensionLowQualityVideoMessage(_ p1: String) -> String {
+    return VectorL10n.tr("Vector", "share_extension_low_quality_video_message", p1)
+  }
+  /// Video will be sent in low quality
+  public static var shareExtensionLowQualityVideoTitle: String { 
+    return VectorL10n.tr("Vector", "share_extension_low_quality_video_title") 
+  }
+  /// Send now
+  public static var shareExtensionSendNow: String { 
+    return VectorL10n.tr("Vector", "share_extension_send_now") 
+  }
   /// Feedback
   public static var sideMenuActionFeedback: String { 
     return VectorL10n.tr("Vector", "side_menu_action_feedback") 

Riot/Managers/Analytics/DecryptionFailureTracker.h

@@ -32,7 +32,7 @@
 /**
  The delegate object to receive analytics events.
  */
-@property (nonatomic) id<MXAnalyticsDelegate> delegate;
+@property (nonatomic, weak) id<MXAnalyticsDelegate> delegate;
 
 /**
  Report an event unable to decrypt.

Riot/Modules/Application/AppCoordinator.swift

@@ -228,7 +228,7 @@ extension AppCoordinator: LegacyAppDelegateDelegate {
     }
 
     func legacyAppDelegateRestoreEmptyDetailsViewController(_ legacyAppDelegate: LegacyAppDelegate!) {
-        self.splitViewCoordinator?.restorePlaceholderDetails()
+        self.splitViewCoordinator?.resetDetails(animated: false)
     }
 
     func legacyAppDelegate(_ legacyAppDelegate: LegacyAppDelegate!, didAddMatrixSession session: MXSession!) {

Riot/Modules/Common/Recents/RecentsViewController.h

@@ -40,7 +40,7 @@ FOUNDATION_EXPORT NSString *const RecentsViewControllerDataReadyNotification;
     /**
      Current alert (if any).
      */
-    UIAlertController *currentAlert;
+    __weak UIAlertController *currentAlert;
 
     /**
      The list of the section headers currently displayed in the recents table.

Riot/Modules/Common/Recents/RecentsViewController.m

@@ -50,13 +50,13 @@ @interface RecentsViewController () <CreateRoomCoordinatorBridgePresenterDelegat
     NSIndexPath* lastPotentialCellPath;
 
     // Observe UIApplicationDidEnterBackgroundNotification to cancel editing mode when app leaves the foreground state.
-    id UIApplicationDidEnterBackgroundNotificationObserver;
+    __weak id UIApplicationDidEnterBackgroundNotificationObserver;
 
     // Observe kAppDelegateDidTapStatusBarNotification to handle tap on clock status bar.
-    id kAppDelegateDidTapStatusBarNotificationObserver;
+    __weak id kAppDelegateDidTapStatusBarNotificationObserver;
 
     // Observe kMXNotificationCenterDidUpdateRules to update missed messages counts.
-    id kMXNotificationCenterDidUpdateRulesObserver;
+    __weak id kMXNotificationCenterDidUpdateRulesObserver;
 
     MXHTTPOperation *currentRequest;
 
@@ -65,7 +65,7 @@ @interface RecentsViewController () <CreateRoomCoordinatorBridgePresenterDelegat
     UISearchBar *tableSearchBar;
 
     // Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
-    id kThemeServiceDidChangeThemeNotificationObserver;
+    __weak id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
 @property (nonatomic, strong) CreateRoomCoordinatorBridgePresenter *createRoomCoordinatorBridgePresenter;
@@ -156,11 +156,15 @@ - (void)viewDidLoad
     // Apply dragging settings
     self.enableDragging = _enableDragging;
 
+    MXWeakify(self);
+
     // Observe UIApplicationDidEnterBackgroundNotification to refresh bubbles when app leaves the foreground state.
     UIApplicationDidEnterBackgroundNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidEnterBackgroundNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
+        MXStrongifyAndReturnIfNil(self);
+
         // Leave potential editing mode
-        [self cancelEditionMode:isRefreshPending];
+        [self cancelEditionMode:self->isRefreshPending];
 
     }];
 
@@ -170,6 +174,8 @@ - (void)viewDidLoad
     // Observe user interface theme change.
     kThemeServiceDidChangeThemeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kThemeServiceDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
+        MXStrongifyAndReturnIfNil(self);
+
         [self userInterfaceThemeDidChange];
 
     }];
@@ -268,16 +274,22 @@ - (void)viewWillAppear:(BOOL)animated
         [self.recentsTableView deselectRowAtIndexPath:indexPath animated:NO];
     }
 
+    MXWeakify(self);
+
     // Observe kAppDelegateDidTapStatusBarNotificationObserver.
     kAppDelegateDidTapStatusBarNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kAppDelegateDidTapStatusBarNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
+        MXStrongifyAndReturnIfNil(self);
+
         [self scrollToTop:YES];
 
     }];
 
     // Observe kMXNotificationCenterDidUpdateRules to refresh missed messages counts
     kMXNotificationCenterDidUpdateRulesObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXNotificationCenterDidUpdateRules object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
 
+        MXStrongifyAndReturnIfNil(self);
+
         [self refreshRecentsTable];
 
     }];

Riot/Modules/Common/Recents/Service/MatrixSDK/RecentsListService.swift

@@ -440,7 +440,7 @@ public class RecentsListService: NSObject, RecentsListServiceProtocol {
         case .home:
             fetcher.fetchOptions.sortOptions = sortOptions
         case .favourites:
-            let newSortOptions = sortOptions
+            var newSortOptions = sortOptions
             newSortOptions.favoriteTag = true
             fetcher.fetchOptions.sortOptions = newSortOptions
         default:

Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m

@@ -50,7 +50,7 @@ @interface SegmentedViewController ()
     NSLayoutConstraint *leftMarkerViewConstraint;
 
     // Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
-    id kThemeServiceDidChangeThemeNotificationObserver;
+    __weak id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
 @end
@@ -183,9 +183,13 @@ - (void)viewDidLoad
 
     [self createSegmentedViews];
 
+    MXWeakify(self);
+
     // Observe user interface theme change.
     kThemeServiceDidChangeThemeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kThemeServiceDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
+        MXStrongifyAndReturnIfNil(self);
+
         [self userInterfaceThemeDidChange];
 
     }];

Riot/Modules/Communities/GroupsViewController.m

@@ -27,10 +27,10 @@ @interface GroupsViewController ()
     BOOL isRefreshPending;
 
     // Observe UIApplicationDidEnterBackgroundNotification to cancel editing mode when app leaves the foreground state.
-    id UIApplicationDidEnterBackgroundNotificationObserver;
+    __weak id UIApplicationDidEnterBackgroundNotificationObserver;
 
     // Observe kAppDelegateDidTapStatusBarNotification to handle tap on clock status bar.
-    id kAppDelegateDidTapStatusBarNotificationObserver;
+    __weak id kAppDelegateDidTapStatusBarNotificationObserver;
 
     MXHTTPOperation *currentRequest;
 
@@ -39,7 +39,7 @@ @interface GroupsViewController ()
     UISearchBar *tableSearchBar;
 
     // Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
-    id kThemeServiceDidChangeThemeNotificationObserver;
+    __weak id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
 @end
@@ -98,11 +98,15 @@ - (void)viewDidLoad
     self.groupsTableView.estimatedSectionHeaderHeight = 30;
     self.groupsTableView.estimatedSectionFooterHeight = 0;
 
+    MXWeakify(self);
+
     // Observe UIApplicationDidEnterBackgroundNotification to refresh bubbles when app leaves the foreground state.
     UIApplicationDidEnterBackgroundNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidEnterBackgroundNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
+        MXStrongifyAndReturnIfNil(self);
+
         // Leave potential editing mode
-        [self cancelEditionMode:isRefreshPending];
+        [self cancelEditionMode:self->isRefreshPending];
 
     }];
 
@@ -117,6 +121,8 @@ - (void)viewDidLoad
     // Observe user interface theme change.
     kThemeServiceDidChangeThemeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kThemeServiceDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
+        MXStrongifyAndReturnIfNil(self);
+
         [self userInterfaceThemeDidChange];
 
     }];
@@ -207,9 +213,13 @@ - (void)viewWillAppear:(BOOL)animated
         [self.groupsTableView deselectRowAtIndexPath:indexPath animated:NO];
     }
 
+    MXWeakify(self);
+
     // Observe kAppDelegateDidTapStatusBarNotificationObserver.
     kAppDelegateDidTapStatusBarNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kAppDelegateDidTapStatusBarNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
+        MXStrongifyAndReturnIfNil(self);
+
         [self scrollToTop:YES];
 
     }];

Riot/Modules/Communities/TabDetail/GroupDetailsCoordinator.swift

@@ -43,6 +43,10 @@ final class GroupDetailsCoordinator: GroupDetailsCoordinatorProtocol {
         self.groupDetailsViewController = groupDetailsViewController
     }
 
+    deinit {
+        groupDetailsViewController.destroy()
+    }
+
     // MARK: - Public
 
     func start() {

Riot/Modules/Contacts/ContactsTableViewController.h

@@ -122,7 +122,7 @@
 /**
  The delegate for the view controller.
  */
-@property (nonatomic) id<ContactsTableViewControllerDelegate> contactsTableViewControllerDelegate;
+@property (nonatomic, weak) id<ContactsTableViewControllerDelegate> contactsTableViewControllerDelegate;
 
 @end
 

Riot/Modules/Contacts/ContactsTableViewController.m

@@ -33,12 +33,12 @@ @interface ContactsTableViewController () <FindYourContactsFooterViewDelegate, S
     /**
      Observe kAppDelegateDidTapStatusBarNotification to handle tap on clock status bar.
      */
-    id kAppDelegateDidTapStatusBarNotificationObserver;
+    __weak id kAppDelegateDidTapStatusBarNotificationObserver;
 
     /**
      Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
      */
-    id kThemeServiceDidChangeThemeNotificationObserver;
+    __weak id kThemeServiceDidChangeThemeNotificationObserver;
 }
 
 @property (nonatomic, strong) FindYourContactsFooterView *findYourContactsFooterView;
@@ -102,9 +102,13 @@ - (void)viewDidLoad
     self.contactsTableView.tableFooterView = [[UIView alloc] init];
     self.contactsAreFilteredWithSearch = NO;
 
+    MXWeakify(self);
+
     // Observe user interface theme change.
     kThemeServiceDidChangeThemeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kThemeServiceDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
+        MXStrongifyAndReturnIfNil(self);
+
         [self userInterfaceThemeDidChange];
 
     }];
@@ -158,10 +162,14 @@ - (void)viewWillAppear:(BOOL)animated
 
     // Screen tracking
     [[Analytics sharedInstance] trackScreen:_screenName];
+
+    MXWeakify(self);
 
     // Observe kAppDelegateDidTapStatusBarNotification.
     kAppDelegateDidTapStatusBarNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kAppDelegateDidTapStatusBarNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
+        MXStrongifyAndReturnIfNil(self);
+
         [self.contactsTableView setContentOffset:CGPointMake(-self.contactsTableView.adjustedContentInset.left, -self.contactsTableView.adjustedContentInset.top) animated:YES];
 
     }];

Riot/Modules/Contacts/Details/ContactDetailsViewController.m

@@ -47,12 +47,12 @@ @interface ContactDetailsViewController () <RoomMemberTitleViewDelegate>
     /**
      Observe UIApplicationWillChangeStatusBarOrientationNotification to hide/show bubbles bg.
      */
-    id UIApplicationWillChangeStatusBarOrientationNotificationObserver;
+    __weak id UIApplicationWillChangeStatusBarOrientationNotificationObserver;
 
     /**
      The observer of the presence for matrix user.
      */
-    id mxPresenceObserver;
+    __weak id mxPresenceObserver;
 
     /**
      List of the basic actions on this contact.
@@ -79,7 +79,7 @@ Current alert (if any).
     /**
      Observe kThemeServiceDidChangeThemeNotification to handle user interface theme change.
      */
-    id kThemeServiceDidChangeThemeNotificationObserver;
+    __weak id kThemeServiceDidChangeThemeNotificationObserver;
 
     /**
      The current visibility of the status bar in this view controller.
@@ -182,9 +182,13 @@ - (void)viewDidLoad
         self.bottomImageView.hidden = (orientation.integerValue == UIInterfaceOrientationLandscapeLeft || orientation.integerValue == UIInterfaceOrientationLandscapeRight);
     }];
 
+    MXWeakify(self);
+
     // Observe user interface theme change.
     kThemeServiceDidChangeThemeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kThemeServiceDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
+        MXStrongifyAndReturnIfNil(self);
+
         [self userInterfaceThemeDidChange];
 
     }];
@@ -379,9 +383,13 @@ - (void)registerOnContactChangeNotifications
     // Be warned when the thumbnail is updated
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onThumbnailUpdate:) name:kMXKContactThumbnailUpdateNotification object:nil];
 
+    MXWeakify(self);
+
     // Observe contact presence change
     mxPresenceObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kMXKContactManagerMatrixUserPresenceChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
 
+        MXStrongifyAndReturnIfNil(self);
+
         NSString* matrixId = self.firstMatrixId;
 
         if (matrixId && [matrixId isEqualToString:notif.object])