Merge pull request #1339 from deltachat/mailinglist-requests

fix mailinglist chat requests

deltachat-ios/Chat/ChatViewController.swift

@@ -55,7 +55,8 @@ class ChatViewController: UITableViewController {
     }()
 
     public lazy var contactRequestBar: ChatContactRequestBar = {
-        let view = ChatContactRequestBar(isGroupRequest: dcContext.getChat(chatId: chatId).isGroup)
+        let chat = dcContext.getChat(chatId: chatId)
+        let view = ChatContactRequestBar(useDeleteButton: chat.isGroup && !chat.isMailinglist)
         view.delegate = self
         view.translatesAutoresizingMaskIntoConstraints = false
         return view
@@ -1713,7 +1714,12 @@ extension ChatViewController: ChatEditingDelegate {
 extension ChatViewController: ChatContactRequestDelegate {
     func onAcceptRequest() {
         dcContext.acceptChat(chatId: chatId)
-        configureUIForWriting()
+        let chat = dcContext.getChat(chatId: chatId)
+        if chat.isMailinglist {
+            messageInputBar.isHidden = true
+        } else {
+            configureUIForWriting()
+        }
     }
 
     func onBlockRequest() {

deltachat-ios/Chat/Views/ChatContactRequestBar.swift

@@ -18,7 +18,7 @@ public class ChatContactRequestBar: UIView, InputItem {
 
     weak var delegate: ChatContactRequestDelegate?
     
-    private var isGroupRequest: Bool = false
+    private var useDeleteButton: Bool = false
 
     private lazy var acceptButton: UIButton = {
         let view = UIButton()
@@ -30,7 +30,7 @@ public class ChatContactRequestBar: UIView, InputItem {
 
     private lazy var blockButton: UIButton = {
         let view = UIButton()
-        view.setTitle(isGroupRequest ? String.localized("delete") : String.localized("block"), for: .normal)
+        view.setTitle(useDeleteButton ? String.localized("delete") : String.localized("block"), for: .normal)
         view.setTitleColor(.systemRed, for: .normal)
         view.translatesAutoresizingMaskIntoConstraints = false
         view.isUserInteractionEnabled = true
@@ -46,8 +46,8 @@ public class ChatContactRequestBar: UIView, InputItem {
         return view
     }()
 
-    public required init(isGroupRequest: Bool) {
-        self.isGroupRequest = isGroupRequest
+    public required init(useDeleteButton: Bool) {
+        self.useDeleteButton = useDeleteButton
         super.init(frame: .zero)
         setupSubviews()
     }
@@ -81,7 +81,7 @@ public class ChatContactRequestBar: UIView, InputItem {
     }
 
     @objc func onRejectPressed() {
-        if isGroupRequest {
+        if useDeleteButton {
             delegate?.onDeleteRequest()
         } else {
             delegate?.onBlockRequest()