From bead5ca1e636669dd45b89bdec0e37c853a2bbd4 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Fri, 24 Feb 2023 11:12:41 +1100 Subject: [PATCH 1/2] Fixed a couple of action sheets which could crash on iPad --- Session/Conversations/ConversationVC+Interaction.swift | 3 +++ .../Message Requests/MessageRequestsViewController.swift | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index be2b06365..b40ba50cf 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -1526,6 +1526,7 @@ extension ConversationVC: } } + Modal.setupForIPadIfNeeded(sheet, targetView: self.view) present(sheet, animated: true, completion: nil) } @@ -2376,6 +2377,7 @@ extension ConversationVC { }) alertVC.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel, handler: nil)) + Modal.setupForIPadIfNeeded(sheet, targetView: self.view) self.present(alertVC, animated: true, completion: nil) } @@ -2423,6 +2425,7 @@ extension ConversationVC { }) alertVC.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel, handler: nil)) + Modal.setupForIPadIfNeeded(alertVC, targetView: self.view) self.present(alertVC, animated: true, completion: nil) } } diff --git a/Session/Home/Message Requests/MessageRequestsViewController.swift b/Session/Home/Message Requests/MessageRequestsViewController.swift index 619ff0792..2dfbbf89f 100644 --- a/Session/Home/Message Requests/MessageRequestsViewController.swift +++ b/Session/Home/Message Requests/MessageRequestsViewController.swift @@ -449,6 +449,8 @@ class MessageRequestsViewController: BaseVC, UITableViewDelegate, UITableViewDat } }) alertVC.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel, handler: nil)) + + Modal.setupForIPadIfNeeded(alertVC, targetView: self.view) self.present(alertVC, animated: true, completion: nil) } @@ -470,6 +472,8 @@ class MessageRequestsViewController: BaseVC, UITableViewDelegate, UITableViewDat }) alertVC.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel, handler: nil)) + + Modal.setupForIPadIfNeeded(alertVC, targetView: self.view) self.present(alertVC, animated: true, completion: nil) } @@ -501,6 +505,8 @@ class MessageRequestsViewController: BaseVC, UITableViewDelegate, UITableViewDat }) alertVC.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel, handler: nil)) + + Modal.setupForIPadIfNeeded(alertVC, targetView: self.view) self.present(alertVC, animated: true, completion: nil) } } From 6851bb25fcdd5aee57d224c8f863974cdeda0381 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Fri, 24 Feb 2023 11:19:28 +1100 Subject: [PATCH 2/2] Fixed a wrong variable name --- Session/Conversations/ConversationVC+Interaction.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index b40ba50cf..f4d029b1d 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -2377,7 +2377,7 @@ extension ConversationVC { }) alertVC.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel, handler: nil)) - Modal.setupForIPadIfNeeded(sheet, targetView: self.view) + Modal.setupForIPadIfNeeded(alertVC, targetView: self.view) self.present(alertVC, animated: true, completion: nil) }