remove redundant draft prefix from DraftModel properties

deltachat-ios/Chat/ChatViewController.swift

@@ -153,7 +153,7 @@ class ChatViewController: UITableViewController {
         if !disableWriting {
             configureMessageInputBar()
             draft.parse(draftMsg: dcContext.getDraft(chatId: chatId))
-            messageInputBar.inputTextView.text = draft.draftText
+            messageInputBar.inputTextView.text = draft.text
             configureDraftArea(draft: draft)
         }
 
@@ -1186,7 +1186,7 @@ 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.draftAttachment, let viewType = draft.draftViewType {
+        if let filePath = draft.attachment, let viewType = draft.viewType {
             switch viewType {
             case DC_MSG_GIF, DC_MSG_IMAGE, DC_MSG_FILE, DC_MSG_VIDEO:
                 self.sendAttachmentMessage(viewType: viewType, filePath: filePath, message: trimmedText, quoteMessage: draft.quoteMessage)
@@ -1205,7 +1205,7 @@ extension ChatViewController: InputBarAccessoryViewDelegate {
     }
 
     func inputBar(_ inputBar: InputBarAccessoryView, textViewTextDidChangeTo text: String) {
-        draft.draftText = text
+        draft.text = text
         evaluateInputBar(draft: draft)
     }
 }
@@ -1228,10 +1228,10 @@ extension ChatViewController: DraftPreviewDelegate {
     }
 
     func onAttachmentTapped() {
-        if let attachmentPath = draft.draftAttachment {
+        if let attachmentPath = draft.attachment {
             let attachmentURL = URL(fileURLWithPath: attachmentPath, isDirectory: false)
             let previewController = PreviewController(type: .single(attachmentURL))
-            if #available(iOS 13.0, *), draft.draftViewType == DC_MSG_IMAGE || draft.draftViewType == DC_MSG_VIDEO {
+            if #available(iOS 13.0, *), draft.viewType == DC_MSG_IMAGE || draft.viewType == DC_MSG_VIDEO {
                 previewController.setEditing(true, animated: true)
                 previewController.delegate = self
             }

deltachat-ios/Chat/DraftModel.swift

@@ -5,10 +5,10 @@ import DcCore
 public class DraftModel {
     var quoteMessage: DcMsg?
     var quoteText: String?
-    var draftText: String?
-    var draftAttachment: String?
-    var draftAttachmentMimeType: String?
-    var draftViewType: Int32?
+    var text: String?
+    var attachment: String?
+    var attachmentMimeType: String?
+    var viewType: Int32?
     let chatId: Int
 
     public init(chatId: Int) {
@@ -16,14 +16,14 @@ public class DraftModel {
     }
 
     public func parse(draftMsg: DcMsg?) {
-        draftText = draftMsg?.text
+        text = draftMsg?.text
         quoteText = draftMsg?.quoteText
         quoteMessage = draftMsg?.quoteMessage
-        draftAttachment = draftMsg?.fileURL?.relativePath
+        attachment = draftMsg?.fileURL?.relativePath
         if let viewType = draftMsg?.type {
-            draftViewType = Int32(viewType)
+            self.viewType = Int32(viewType)
         }
-        draftAttachmentMimeType = draftMsg?.filemime
+        attachmentMimeType = draftMsg?.filemime
     }
 
     public func setQuote(quotedMsg: DcMsg?) {
@@ -40,29 +40,29 @@ public class DraftModel {
     }
 
     public func setAttachment(viewType: Int32?, path: String?, mimetype: String? = nil) {
-        draftAttachment = path
-        draftViewType = viewType
-        draftAttachmentMimeType = mimetype
+        attachment = path
+        self.viewType = viewType
+        attachmentMimeType = mimetype
     }
 
     public func save(context: DcContext) {
-        if draftText == nil && quoteMessage == nil {
+        if text == nil && quoteMessage == nil {
             context.setDraft(chatId: chatId, message: nil)
             return
         }
 
-        let draftMessage = DcMsg(viewType: draftViewType ?? DC_MSG_TEXT)
-        draftMessage.text = draftText
+        let draftMessage = DcMsg(viewType: viewType ?? DC_MSG_TEXT)
+        draftMessage.text = text
         if quoteMessage != nil {
             draftMessage.quoteMessage = quoteMessage
         }
-        if draftAttachment != nil {
-            draftMessage.setFile(filepath: draftAttachment, mimeType: draftAttachmentMimeType)
+        if attachment != nil {
+            draftMessage.setFile(filepath: attachment, mimeType: attachmentMimeType)
         }
         context.setDraft(chatId: chatId, message: draftMessage)
     }
 
     public func canSend() -> Bool {
-        return !(draftText?.isEmpty ?? true) || draftAttachment != nil
+        return !(text?.isEmpty ?? true) || attachment != nil
     }
 }

deltachat-ios/Chat/Views/ChatInputBar.swift

@@ -56,7 +56,7 @@ public class ChatInputBar: InputBarAccessoryView {
     }
 
     public func configure(draft: DraftModel) {
-        hasDraft = draft.draftAttachment != nil
+        hasDraft = draft.attachment != nil
         hasQuote = draft.quoteText != nil
         maxTextViewHeight = calculateMaxTextViewHeight()
     }

deltachat-ios/Chat/Views/DocumentPreview.swift

@@ -34,10 +34,10 @@ public class DocumentPreview: DraftPreview {
     }
 
     override public func configure(draft: DraftModel) {
-        if draft.draftViewType == DC_MSG_FILE, let path = draft.draftAttachment {
+        if draft.viewType == DC_MSG_FILE, let path = draft.attachment {
             let tmpMsg = DcMsg(viewType: DC_MSG_FILE)
             tmpMsg.setFile(filepath: path)
-            tmpMsg.text = draft.draftText
+            tmpMsg.text = draft.text
             fileView.configure(message: tmpMsg)
             self.delegate?.onAttachmentAdded()
             isHidden = false

deltachat-ios/Chat/Views/MediaPreview.swift

@@ -31,7 +31,7 @@ class MediaPreview: DraftPreview {
     }
 
     override func configure(draft: DraftModel) {
-        if (draft.draftViewType == DC_MSG_GIF || draft.draftViewType == DC_MSG_IMAGE), let path = draft.draftAttachment {
+        if (draft.viewType == DC_MSG_GIF || draft.viewType == DC_MSG_IMAGE), let path = draft.attachment {
             contentImageView.sd_setImage(with: URL(fileURLWithPath: path, isDirectory: false), completed: { image, error, _, _ in
                 if let error = error {
                     logger.error("could not load draft image: \(error)")
@@ -42,7 +42,7 @@ class MediaPreview: DraftPreview {
                 }
             })
             isHidden = false
-        } else if draft.draftViewType == DC_MSG_VIDEO, let path = draft.draftAttachment {
+        } else if draft.viewType == DC_MSG_VIDEO, let path = draft.attachment {
             if let image = ThumbnailCache.shared.restoreImage(key: path) {
                 self.contentImageView.image = image
                 self.setAspectRatio(image: image)
@@ -84,14 +84,14 @@ class MediaPreview: DraftPreview {
     }
 
     func reload(draft: DraftModel) {
-        guard let attachment = draft.draftAttachment else { return }
+        guard let attachment = draft.attachment else { return }
         let url = URL(fileURLWithPath: attachment, isDirectory: false)
         // there are editing options for DC_MSG_GIF, so that can be ignored
-        if draft.draftViewType == DC_MSG_IMAGE {
+        if draft.viewType == DC_MSG_IMAGE {
             SDImageCache.shared.removeImage(forKey: url.absoluteString, withCompletion: { [weak self] in
                 self?.configure(draft: draft)
             })
-        } else if draft.draftViewType == DC_MSG_VIDEO {
+        } else if draft.viewType == DC_MSG_VIDEO {
             ThumbnailCache.shared.deleteImage(key: attachment)
             self.configure(draft: draft)
         }

deltachat-ios/Chat/Views/QuotePreview.swift

@@ -28,7 +28,7 @@ public class QuotePreview: DraftPreview {
     override public func configure(draft: DraftModel) {
         if let quoteText = draft.quoteText {
             quoteView.quote.text = quoteText
-            compactView = draft.draftAttachment != nil
+            compactView = draft.attachment != nil
             calculateQuoteHeight(compactView: compactView)
             if let quoteMessage = draft.quoteMessage {
                 let contact = quoteMessage.fromContact