revert additional deaddropData.deaddropContact cache

deltachat-ios/View/ContactCell.swift

@@ -296,7 +296,8 @@ class ContactCell: UITableViewCell {
         case .deaddrop(let deaddropData):
             safe_assert(deaddropData.chatId == DC_CHAT_ID_DEADDROP)
             backgroundColor = DcColors.deaddropBackground
-            let contact = deaddropData.deaddropContact
+            let msg = cellViewModel.dcContext.getMessage(id: deaddropData.msgId)
+            let contact = cellViewModel.dcContext.getContact(id: msg.fromContactId)
             if let img = contact.profileImage {
                 resetBackupImage()
                 setImage(img)

deltachat-ios/ViewModel/ChatListViewModel.swift

@@ -207,14 +207,8 @@ private extension ChatListViewModel {
         let chatId = list.getChatId(index: index)
         let summary = list.getSummary(index: index)
 
-        if let msgId = msgIdFor(row: index),
-           chatId == DC_CHAT_ID_DEADDROP {
-            let message = dcContext.getMessage(id: msgId)
-            return ChatCellViewModel(dcContext: dcContext,
-                                     deaddropCellData: DeaddropCellData(chatId: chatId,
-                                                                        msgId: msgId,
-                                                                        summary: summary,
-                                                                        deaddropContact: dcContext.getContact(id: message.fromContactId)))
+        if let msgId = msgIdFor(row: index), chatId == DC_CHAT_ID_DEADDROP {
+            return ChatCellViewModel(dcContext: dcContext, deaddropCellData: DeaddropCellData(chatId: chatId, msgId: msgId, summary: summary))
         }
 
         let chat = dcContext.getChat(chatId: chatId)

deltachat-ios/ViewModel/ContactCellViewModel.swift

@@ -33,7 +33,6 @@ struct DeaddropCellData {
     let chatId: Int
     let msgId: Int
     let summary: DcLot
-    let deaddropContact: DcContact
 }
 
 class ContactCellViewModel: AvatarCellViewModel {