Merge pull request #397 from deltachat/delete_contact_requests

replace dismiss contact request by delete option (#365)

deltachat-ios/Controller/ChatViewController.swift

@@ -268,7 +268,7 @@ class ChatViewController: MessagesViewController {
         if disableWriting {
             menuItems = [
                 UIMenuItem(title: String.localized("start_chat"), action: #selector(MessageCollectionViewCell.messageStartChat(_:))),
-                UIMenuItem(title: String.localized("cancel"), action: #selector(MessageCollectionViewCell.messageDismiss(_:))),
+                UIMenuItem(title: String.localized("delete"), action: #selector(MessageCollectionViewCell.messageDelete(_:))),
                 UIMenuItem(title: String.localized("menu_block_contact"), action: #selector(MessageCollectionViewCell.messageBlock(_:))),
             ]
         } else {
@@ -444,7 +444,6 @@ class ChatViewController: MessagesViewController {
         if action == NSSelectorFromString("messageInfo:") ||
             action == NSSelectorFromString("messageDelete:") ||
             action == NSSelectorFromString("messageBlock:") ||
-            action == NSSelectorFromString("messageDismiss:") ||
             action == NSSelectorFromString("messageStartChat:") {
             return true
         } else {
@@ -478,12 +477,6 @@ class ChatViewController: MessagesViewController {
             logger.info("message: Block \(msg.messageId)")
             msg.fromContact.block()
 
-            refreshMessages()
-        case NSSelectorFromString("messageDismiss:"):
-            let msg = messageList[indexPath.section]
-            logger.info("message: Dismiss \(msg.messageId)")
-            msg.fromContact.marknoticed()
-
             refreshMessages()
         default:
             super.collectionView(collectionView, performAction: action, forItemAt: indexPath, withSender: sender)
@@ -1159,19 +1152,6 @@ extension MessageCollectionViewCell {
         }
     }
 
-    @objc func messageDismiss(_ sender: Any?) {
-        // Get the collectionView
-        if let collectionView = self.superview as? UICollectionView {
-            // Get indexPath
-            if let indexPath = collectionView.indexPath(for: self) {
-                // Trigger action
-                collectionView.delegate?.collectionView?(collectionView,
-                    performAction: #selector(MessageCollectionViewCell.messageDismiss(_:)),
-                    forItemAt: indexPath, withSender: sender)
-            }
-        }
-    }
-
     @objc func messageStartChat(_ sender: Any?) {
         // Get the collectionView
         if let collectionView = self.superview as? UICollectionView {