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

clean

Browse Source
pull/782/head
Ryan Zhao 2 years ago
parent da0fb2602c
commit 5c629b2ab4
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File

8
Session/Conversations/Message Cells/Content Views/MediaView.swift
Unescape Escape View File

@ -16,7 +16,7 @@ public class MediaView: UIView {
// MARK: - // MARK: -
private let mediaCache: NSCache<NSString, AnyObject> private let mediaCache: NSCache<NSString, AnyObject>?
public let attachment: Attachment public let attachment: Attachment
private let isOutgoing: Bool private let isOutgoing: Bool
private var loadBlock: (() -> Void)? private var loadBlock: (() -> Void)?
@ -45,7 +45,7 @@ public class MediaView: UIView {
// MARK: - Initializers // MARK: - Initializers
public required init( public required init(
mediaCache: NSCache<NSString, AnyObject>, mediaCache: NSCache<NSString, AnyObject>? = nil,
attachment: Attachment, attachment: Attachment,
isOutgoing: Bool isOutgoing: Bool
) { ) {
@ -393,7 +393,7 @@ public class MediaView: UIView {
applyMediaBlock(media) applyMediaBlock(media)
self?.mediaCache.setObject(media, forKey: cacheKey as NSString) self?.mediaCache?.setObject(media, forKey: cacheKey as NSString)
self?.loadState.mutate { $0 = .loaded } self?.loadState.mutate { $0 = .loaded }
} }
@ -402,7 +402,7 @@ public class MediaView: UIView {
return return
} }
if let media: AnyObject = self.mediaCache.object(forKey: cacheKey as NSString) { if let media: AnyObject = self.mediaCache?.object(forKey: cacheKey as NSString) {
Logger.verbose("media cache hit") Logger.verbose("media cache hit")
guard Thread.isMainThread else { guard Thread.isMainThread else {

9
Session/Media Viewing & Editing/MediaInfoVC+MediaPreviewView.swift
Unescape Escape View File

@ -8,7 +8,6 @@ extension MediaInfoVC {
final class MediaPreviewView: UIView { final class MediaPreviewView: UIView {
private static let cornerRadius: CGFloat = 8 private static let cornerRadius: CGFloat = 8
private let mediaCache: NSCache<NSString, AnyObject>
private let attachment: Attachment private let attachment: Attachment
private let isOutgoing: Bool private let isOutgoing: Bool
@ -16,7 +15,6 @@ extension MediaInfoVC {
private lazy var mediaView: MediaView = { private lazy var mediaView: MediaView = {
let result: MediaView = MediaView.init( let result: MediaView = MediaView.init(
mediaCache: mediaCache,
attachment: attachment, attachment: attachment,
isOutgoing: isOutgoing isOutgoing: isOutgoing
) )
@ -42,12 +40,7 @@ extension MediaInfoVC {
// MARK: - Lifecycle // MARK: - Lifecycle
init( init(attachment: Attachment, isOutgoing: Bool) {
mediaCache: NSCache<NSString, AnyObject>,
attachment: Attachment,
isOutgoing: Bool
) {
self.mediaCache = mediaCache
self.attachment = attachment self.attachment = attachment
self.isOutgoing = isOutgoing self.isOutgoing = isOutgoing

8
Session/Media Viewing & Editing/MediaInfoVC.swift
Unescape Escape View File

@ -9,13 +9,6 @@ final class MediaInfoVC: BaseVC {
private let attachments: [Attachment] private let attachments: [Attachment]
private let isOutgoing: Bool private let isOutgoing: Bool
// FIXME: Would be good to create a Swift-based cache and replace this
lazy var mediaCache: NSCache<NSString, AnyObject> = {
let result = NSCache<NSString, AnyObject>()
result.countLimit = 40
return result
}()
// MARK: - Initialization // MARK: - Initialization
init(attachments: [Attachment], isOutgoing: Bool) { init(attachments: [Attachment], isOutgoing: Bool) {
@ -41,7 +34,6 @@ final class MediaInfoVC: BaseVC {
attachments.forEach { attachments.forEach {
let mediaPreviewView: MediaPreviewView = MediaPreviewView( let mediaPreviewView: MediaPreviewView = MediaPreviewView(
mediaCache: mediaCache,
attachment: $0, attachment: $0,
isOutgoing: isOutgoing) isOutgoing: isOutgoing)
let mediaInfoView: MediaInfoView = MediaInfoView(attachment: $0) let mediaInfoView: MediaInfoView = MediaInfoView(attachment: $0)

Write Preview
Loading…
Cancel
Save