From a2fc2e0c829895b7740e3138673bdf64172b43cd Mon Sep 17 00:00:00 2001 From: Nathan Mattes Date: Fri, 13 Dec 2024 15:42:36 +0100 Subject: [PATCH 1/2] Hide messae-bar when forwarding (#2435) --- deltachat-ios/Chat/ChatViewController.swift | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/deltachat-ios/Chat/ChatViewController.swift b/deltachat-ios/Chat/ChatViewController.swift index 4e7f95aea..bd412610e 100644 --- a/deltachat-ios/Chat/ChatViewController.swift +++ b/deltachat-ios/Chat/ChatViewController.swift @@ -336,6 +336,7 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate { if RelayHelper.shared.isForwarding() { if RelayHelper.shared.forwardIds != nil { + resignFirstResponder() askToForwardMessage() } else if let vcardData = RelayHelper.shared.forwardVCardData, let vcardURL = prepareVCardData(vcardData) { @@ -1355,22 +1356,21 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate { } private func askToForwardMessage() { - let chat = dcContext.getChat(chatId: self.chatId) + let chat = dcContext.getChat(chatId: chatId) if chat.isSelfTalk { - RelayHelper.shared.forwardIdsAndFinishRelaying(to: self.chatId) + RelayHelper.shared.forwardIdsAndFinishRelaying(to: chatId) refreshMessages() } else { - DispatchQueue.main.async { [weak self] in - self?.confirmationAlert(title: String.localizedStringWithFormat(String.localized("ask_forward"), chat.name), - actionTitle: String.localized("menu_forward"), - actionHandler: { [weak self] _ in - guard let self else { return } - RelayHelper.shared.forwardIdsAndFinishRelaying(to: self.chatId) - }, - cancelHandler: { [weak self] _ in - self?.navigationController?.popViewController(animated: true) - }) - } + confirmationAlert(title: String.localizedStringWithFormat(String.localized("ask_forward"), chat.name), + actionTitle: String.localized("menu_forward"), + actionHandler: { [weak self] _ in + guard let self else { return } + RelayHelper.shared.forwardIdsAndFinishRelaying(to: self.chatId) + self.becomeFirstResponder() + }, + cancelHandler: { [weak self] _ in + self?.navigationController?.popViewController(animated: true) + }) } } From 19f1fcc6e09e53391642c312368cf5810deae3d4 Mon Sep 17 00:00:00 2001 From: Nathan Mattes Date: Fri, 13 Dec 2024 15:43:54 +0100 Subject: [PATCH 2/2] changelog (#2435) you know the drill, I always forget it. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 457297039..496269f84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Delta Chat iOS Changelog +## Unreleased + +- Don't show message-input when forwarding (#2435) + ## v1.50.3 - Don't change order of proxies when selecting a new one (#2414)