oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Debug

This commit is contained in:
nielsandriesse 2021-04-07 15:41:57 +10:00
parent a360fa7721
commit 5ed5c02ad4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Session/Conversations/ConversationVC+Interaction.swift
View File

@ -382,10 +382,13 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
case .mediaMessage:
guard let index = viewItems.firstIndex(where: { $0 === viewItem }),
let cell = messagesTableView.cellForRow(at: IndexPath(row: index, section: 0)) as? VisibleMessageCell else { return }
if let thread = viewItem.interaction.thread as? TSContactThread,
if let thread = self.thread as? TSContactThread,
Storage.shared.getContact(with: thread.contactIdentifier())?.isTrusted != true {
// Ask the user whether they want to download this attachment
let modal = DownloadAttachmentModal(viewItem: viewItem)
modal.modalPresentationStyle = .overFullScreen
modal.modalTransitionStyle = .crossDissolve
present(modal, animated: true, completion: nil)
} else {
guard let albumView = cell.albumView else { return }
let locationInCell = gestureRecognizer.location(in: cell)

5
SessionMessagingKit/Contacts/Contact.swift
View File

@ -56,10 +56,9 @@ public class Contact : NSObject, NSCoding { // NSObject/NSCoding conformance is
// MARK: Coding
public required init?(coder: NSCoder) {
guard let sessionID = coder.decodeObject(forKey: "sessionID") as! String?,
let isTrusted = coder.decodeObject(forKey: "isTrusted") as! Bool? else { return nil }
guard let sessionID = coder.decodeObject(forKey: "sessionID") as! String? else { return nil }
self.sessionID = sessionID
self.isTrusted = isTrusted
self.isTrusted = coder.decodeBool(forKey: "isTrusted")
if let name = coder.decodeObject(forKey: "displayName") as! String? { self.name = name }
if let nickname = coder.decodeObject(forKey: "nickname") as! String? { self.nickname = nickname }
if let profilePictureURL = coder.decodeObject(forKey: "profilePictureURL") as! String? { self.profilePictureURL = profilePictureURL }