-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #21120 from wordpress-mobile/task/reduce-memory-usage
Fix high memory usage in Reader
- Loading branch information
Showing
19 changed files
with
148 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| #import "UIAlertControllerProxy.h" | ||
| #import <WordPressUI/WordPressUI.h> | ||
| #import "WordPress-Swift.h" | ||
|
|
||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| #import "MeHeaderView.h" | ||
| #import "Blog.h" | ||
| #import <WordPressUI/WordPressUI.h> | ||
| #import "WordPress-Swift.h" | ||
|
|
||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| import Foundation | ||
| import AlamofireImage | ||
| import WordPressUI | ||
| import SDWebImage | ||
|
|
||
| final class MemoryCache { | ||
| /// A shared image cache used by the entire system. | ||
| static let shared = MemoryCache() | ||
|
|
||
| private let cache = NSCache<NSString, AnyObject>() | ||
|
|
||
| private init() { | ||
| self.cache.totalCostLimit = 256_000_000 // 256 MB | ||
|
|
||
| NotificationCenter.default.addObserver(self, selector: #selector(didReceiveMemoryWarning), name: UIApplication.didReceiveMemoryWarningNotification, object: nil) | ||
| } | ||
|
|
||
| @objc private func didReceiveMemoryWarning() { | ||
| cache.removeAllObjects() | ||
| } | ||
|
|
||
| // MARK: - UIImage | ||
|
|
||
| func setImage(_ image: UIImage, forKey key: String) { | ||
| cache.setObject(image, forKey: key as NSString, cost: Int(image.sd_memoryCost)) | ||
| } | ||
|
|
||
| func getImage(forKey key: String) -> UIImage? { | ||
| cache.object(forKey: key as NSString) as? UIImage | ||
| } | ||
|
|
||
| func removeImage(forKey key: String) { | ||
| cache.removeObject(forKey: key as NSString) | ||
| } | ||
|
|
||
| // MARK: - Data | ||
|
|
||
| func setData(_ data: Data, forKey key: String) { | ||
| cache.setObject(data as NSData, forKey: key as NSString, cost: data.count) | ||
| } | ||
|
|
||
| func geData(forKey key: String) -> Data? { | ||
| cache.object(forKey: key as NSString) as? Data | ||
| } | ||
|
|
||
| func removeData(forKey key: String) { | ||
| cache.removeObject(forKey: key as NSString) | ||
| } | ||
| } | ||
|
|
||
| extension MemoryCache { | ||
| /// Registers the cache with all the image loading systems used by the app. | ||
| func register() { | ||
| // WordPressUI | ||
| WordPressUI.ImageCache.shared = WordpressUICacheAdapter(cache: .shared) | ||
|
|
||
| // AlamofireImage | ||
| UIImageView.af_sharedImageDownloader = AlamofireImage.ImageDownloader( | ||
| imageCache: AlamofireImageCacheAdapter(cache: .shared) | ||
| ) | ||
|
|
||
| // WordPress.AnimatedImageCache uses WordPress.MemoryCache directly | ||
| } | ||
| } | ||
|
|
||
| private struct WordpressUICacheAdapter: WordPressUI.ImageCaching { | ||
| let cache: MemoryCache | ||
|
|
||
| func setImage(_ image: UIImage, forKey key: String) { | ||
| cache.setImage(image, forKey: key) | ||
| } | ||
|
|
||
| func getImage(forKey key: String) -> UIImage? { | ||
| cache.getImage(forKey: key) | ||
| } | ||
| } | ||
|
|
||
| private struct AlamofireImageCacheAdapter: AlamofireImage.ImageRequestCache { | ||
| let cache: MemoryCache | ||
|
|
||
| func image(for request: URLRequest, withIdentifier identifier: String?) -> AlamofireImage.Image? { | ||
| image(withIdentifier: cacheKey(for: request, identifier: identifier)) | ||
| } | ||
|
|
||
| func add(_ image: AlamofireImage.Image, for request: URLRequest, withIdentifier identifier: String?) { | ||
| add(image, withIdentifier: cacheKey(for: request, identifier: identifier)) | ||
| } | ||
|
|
||
| func removeImage(for request: URLRequest, withIdentifier identifier: String?) -> Bool { | ||
| removeImage(withIdentifier: cacheKey(for: request, identifier: identifier)) | ||
| } | ||
|
|
||
| func image(withIdentifier identifier: String) -> AlamofireImage.Image? { | ||
| cache.getImage(forKey: identifier) | ||
| } | ||
|
|
||
| func add(_ image: AlamofireImage.Image, withIdentifier identifier: String) { | ||
| cache.setImage(image, forKey: identifier) | ||
| } | ||
|
|
||
| func removeImage(withIdentifier identifier: String) -> Bool { | ||
| cache.removeImage(forKey: identifier) | ||
| return true | ||
| } | ||
|
|
||
| func removeAllImages() -> Bool { | ||
| // Do nothing (the app decides when to remove images) | ||
| return true | ||
| } | ||
|
|
||
| private func cacheKey(for request: URLRequest, identifier: String?) -> String { | ||
| var key = request.url?.absoluteString ?? "" | ||
| if let identifier = identifier { | ||
| key += "-\(identifier)" | ||
| } | ||
| return key | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.