use edit message API

deltachat · Feb 20, 2025 · c615a09 · c615a09
1 parent 9e94407
commit c615a09
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 8 deletions.
diff --git a/deltachat-ios/Chat/ChatViewController.swift b/deltachat-ios/Chat/ChatViewController.swift
@@ -1661,8 +1661,26 @@ class ChatViewController: UITableViewController, UITableViewDropDelegate {
         navigationController?.popToRootViewController(animated: true)
     }
 
-    private func reply(at indexPath: IndexPath) {
-        replyToMessage(at: indexPath)
+    private func editSentMessage(at indexPath: IndexPath) {
+        let message = dcContext.getMessage(id: messageIds[indexPath.row])
+
+        draft.clear()
+        draft.sendEditRequestFor = message.id
+        configureDraftArea(draft: draft)
+        messageInputBar.inputTextView.text = message.text
+
+        /*
+        let alert = UIAlertController(title: nil, message: nil, preferredStyle: .alert)
+        alert.addTextField { textfield in
+            textfield.text = message.text
+        }
+        alert.addAction(UIAlertAction(title: String.localized("ok"), style: .default) { [weak self] _ in
+            guard let self, let textfield = alert.textFields?.first else { return }
+            dcContext.sendEditRequest(msgId: message.id, newText: textfield.text ?? "")
+        })
+        alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel))
+        present(alert, animated: true)
+        */
     }
 
     private func toggleSave(at indexPath: IndexPath) {
@@ -1895,7 +1913,7 @@ extension ChatViewController {
                         children.append(UIMenu(title: String.localized("react"), image: UIImage(systemName: "face.smiling"), children: items))
                     }
                     children.append(
-                        UIAction.menuAction(localizationKey: "notify_reply_button", systemImageName: "arrowshape.turn.up.left", indexPath: indexPath, action: { self.reply(at: $0 ) })
+                        UIAction.menuAction(localizationKey: "notify_reply_button", systemImageName: "arrowshape.turn.up.left", indexPath: indexPath, action: replyToMessage)
                     )
                 }
 
@@ -1909,6 +1927,12 @@ extension ChatViewController {
                     UIAction.menuAction(localizationKey: "forward", systemImageName: "arrowshape.turn.up.forward", indexPath: indexPath, action: forward)
                 )
 
+                if message.isFromCurrentSender && message.hasText && !message.isMarkerOrInfo && dcChat.canSend {
+                    children.append(
+                        UIAction.menuAction(localizationKey: "global_menu_edit_desktop", systemImageName: "pencil", indexPath: indexPath, action: editSentMessage)
+                    )
+                }
+
                 if !dcChat.isSelfTalk && message.canSave {
                     if message.savedMessageId != 0 {
                         children.append(
@@ -2364,7 +2388,10 @@ extension ChatViewController: InputBarAccessoryViewDelegate {
     func inputBar(_ inputBar: InputBarAccessoryView, didPressSendButtonWith text: String) {
         let trimmedText = text.replacingOccurrences(of: "\u{FFFC}", with: "", options: .literal, range: nil)
             .trimmingCharacters(in: .whitespacesAndNewlines)
-        if let filePath = draft.attachment, let viewType = draft.viewType {
+
+        if let sendEditRequestFor = draft.sendEditRequestFor {
+            dcContext.sendEditRequest(msgId: sendEditRequestFor, newText: text)
+        } else if let filePath = draft.attachment, let viewType = draft.viewType {
             switch viewType {
             case DC_MSG_GIF, DC_MSG_IMAGE, DC_MSG_FILE, DC_MSG_VIDEO, DC_MSG_WEBXDC, DC_MSG_VCARD:
                 self.sendAttachmentMessage(viewType: viewType, filePath: filePath, message: trimmedText, quoteMessage: draft.quoteMessage)

diff --git a/deltachat-ios/Chat/DraftModel.swift b/deltachat-ios/Chat/DraftModel.swift
@@ -7,7 +7,8 @@ public class DraftModel {
     var dcContext: DcContext
     var text: String?
     let chatId: Int
-    var isEditing: Bool = false
+    var isEditing: Bool = false // multi edit
+    var sendEditRequestFor: Int?
     var quoteMessage: DcMsg? {
         return draftMsg?.quoteMessage
     }
@@ -39,6 +40,7 @@ public class DraftModel {
             draftMsg = dcContext.newMessage(viewType: DC_MSG_TEXT)
         }
         draftMsg?.quoteMessage = quotedMsg
+        sendEditRequestFor = nil
     }
 
     public func setAttachment(viewType: Int32?, path: String?, mimetype: String? = nil) {
@@ -62,6 +64,11 @@ public class DraftModel {
     }
 
     public func save(context: DcContext) {
+        if sendEditRequestFor != nil {
+            clear()
+            return
+        }
+
         if (text?.isEmpty ?? true) &&
             (draftMsg == nil || quoteMessage == nil && attachment == nil) {
             self.clear()
@@ -82,6 +89,7 @@ public class DraftModel {
     public func clear() {
         text = nil
         draftMsg = nil
+        sendEditRequestFor = nil
         dcContext.setDraft(chatId: chatId, message: nil)
     }
 }
diff --git a/deltachat-ios/Chat/Views/QuotePreview.swift b/deltachat-ios/Chat/Views/QuotePreview.swift
@@ -26,7 +26,14 @@ public class QuotePreview: DraftPreview {
     }
 
     override public func configure(draft: DraftModel) {
-        if !draft.isEditing,
+        if !draft.isEditing, let sendEditRequestFor = draft.sendEditRequestFor {
+            quoteView.senderTitle.text = String.localized("edit_message")
+            quoteView.senderTitle.textColor = DcColors.unknownSender
+            quoteView.quote.text = draft.dcContext.getMessage(id: sendEditRequestFor).text
+            quoteView.setImagePreview(nil)
+            quoteView.citeBar.backgroundColor = DcColors.unknownSender
+            isHidden = false
+        } else if !draft.isEditing,
            let quoteText = draft.quoteText {
             quoteView.quote.text = quoteText
             compactView = draft.attachment != nil

diff --git a/deltachat-ios/Chat/Views/StatusView.swift b/deltachat-ios/Chat/Views/StatusView.swift
@@ -75,7 +75,11 @@ public class StatusView: UIView {
     }
 
     public func update(message: DcMsg, tintColor: UIColor) {
-        dateLabel.text = message.formattedSentDate()
+        dateLabel.text = if message.isEdited {
+            message.formattedSentDate() + " " + String.localized("edited")
+        } else {
+            message.formattedSentDate()
+        }
         dateLabel.textColor = tintColor
 
         if message.showPadlock() {

diff --git a/deltachat-ios/DC/DcContext.swift b/deltachat-ios/DC/DcContext.swift
@@ -62,6 +62,10 @@ public class DcContext {
         dc_send_msg(contextPointer, UInt32(chatId), message.messagePointer)
     }
 
+    public func sendEditRequest(msgId: Int, newText: String) {
+        dc_send_edit_request(contextPointer, UInt32(msgId), newText)
+    }
+
     public func downloadFullMessage(id: Int) {
         dc_download_full_msg(contextPointer, Int32(id))
     }

diff --git a/deltachat-ios/DC/DcMsg.swift b/deltachat-ios/DC/DcMsg.swift
@@ -31,6 +31,10 @@ public class DcMsg {
         return dc_msg_is_forwarded(messagePointer) != 0
     }
 
+    public var isEdited: Bool {
+        return dc_msg_is_edited(messagePointer) != 0
+    }
+
     public var isValid: Bool {
         return messagePointer != nil
     }
@@ -43,7 +47,6 @@ public class DcMsg {
         return Int(dc_msg_get_id(messagePointer))
     }
 
-
     public var fromContactId: Int {
         return Int(dc_msg_get_from_id(messagePointer))
     }
@@ -103,6 +106,10 @@ public class DcMsg {
         }
     }
 
+    public var hasText: Bool {
+        return !(text ?? "").isEmpty
+    }
+
     public var subject: String {
         guard let cString = dc_msg_get_subject(messagePointer) else { return "" }
         let swiftString = String(cString: cString)