Merge pull request #6736 from vector-im/doug/6654-fix-ipad-popovers

Add missing source views for iPad.
element-hq · Sep 19, 2022 · 8d02a33 · 8d02a33
2 parents 60c8be0 + 1025e4d
commit 8d02a33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift b/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
@@ -344,7 +344,8 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
  var subMenuActions: [UIAction] = []
  if BuildSettings.sideMenuShowInviteFriends {
  subMenuActions.append(UIAction(title: VectorL10n.sideMenuActionInviteFriends, image: UIImage(systemName: "square.and.arrow.up.fill")) { [weak self] action in
- self?.showInviteFriends(from: nil)
+ guard let self = self else { return }
+ self.showInviteFriends(from: self.avatarMenuButton)
  })
  }
 
@@ -585,7 +586,7 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
  signOutAlertPresenter.present(for: keyBackup.state,
  areThereKeysToBackup: keyBackup.hasKeysToBackup,
  from: self.allChatsViewController,
- sourceView: nil,
+ sourceView: avatarMenuButton,
  animated: true)
  }
 

diff --git a/changelog.d/6654.bugfix b/changelog.d/6654.bugfix
@@ -0,0 +1 @@
+Fix crash presenting Sign Out or Invite to Element menu items on iPad.