Temp fix for iPad theme changes bug, Fixed crashes with BAD_ACCESS on AsyncTextAttachment

Author: ccrama

Slide for Reddit/AsyncTextAttachment.swift

@@ -70,39 +70,42 @@ public class AsyncTextAttachment: NSTextAttachment {
     // MARK: - Helpers
 
     private func startAsyncImageDownload() {
-        guard let imageURL = imageURL, contents == nil else {
+        guard let imageURL = imageURL else {
             return
         }
 
         DispatchQueue.global(qos: .background).async {
-            if let image = SDImageCache.shared.imageFromCache(forKey: imageURL.absoluteString) {
+            if let image = self.getCacheImage(with: imageURL) {
                 self.display(image, with: image.pngData(), url: imageURL)
             } else {
                 self.downloadImage(with: imageURL)
             }
         }
     }
 
+    private func getCacheImage(with: URL) -> UIImage? {
+        return SDImageCache.shared.imageFromCache(forKey: with.absoluteString)
+    }
+    
     private func downloadImage(with: URL) {
         SDWebImageDownloader.shared.downloadImage(with: with, options: [.decodeFirstFrameOnly], progress: nil) { (image, data, _, _) in
-            self.display(image, with: data, url: with)
+            let roundedImage = image?.circleCorners(finalSize: self.bounds.size)
+            DispatchQueue.global(qos: .background).async {
+                SDImageCache.shared.storeImage(toMemory: roundedImage, forKey: with.absoluteString)
+            }
+
+            self.display(roundedImage, with: data, url: with)
         }
     }
 
     public func display(_ image: UIImage?, with: Data?, url: URL) {
-        self.contents = with
-        
-        DispatchQueue.global(qos: .background).async {
-            SDImageCache.shared.storeImage(toMemory: image, forKey: url.absoluteString)
-        }
         let ext = url.pathExtension as CFString
         if let uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, ext, nil) {
             self.fileType = uti.takeRetainedValue() as String
         }
-        if let image = image?.circleCorners(finalSize: self.bounds.size) { //2 was causing weird clipping
+        if let image = image { //2 was causing weird clipping
             let imageSize = image.size
 
-            self.contents = image.pngData()
             self.originalImageSize = imageSize
         }
 
@@ -116,7 +119,7 @@ public class AsyncTextAttachment: NSTextAttachment {
     public override func image(forBounds imageBounds: CGRect, textContainer: NSTextContainer?, characterIndex charIndex: Int) -> UIImage? {
         if let image = image { return image }
 
-        guard let contents = contents, let image = UIImage(data: contents) else {
+        guard let url = imageURL, let image = getCacheImage(with: url) else {
             // remember reference so that we can update it later
             self.textContainer = textContainer
 

Slide for Reddit/CommentViewController.swift

@@ -1428,16 +1428,8 @@ class CommentViewController: MediaViewController, UITableViewDelegate, UITableVi
 
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
-        if #available(iOS 13.0, *) {
-            if #available(iOS 14.0, *) {
-                if UIDevice.current.userInterfaceIdiom == .pad {
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { //Wait for 0.1 seconds. There is a race condition here that sets the theme twice on iPad
-                        if previousTraitCollection?.userInterfaceStyle != self.traitCollection.userInterfaceStyle {
-                            ColorUtil.matchTraitCollection()
-                        }
-                    }
-                }
-            } else {
+        if UIDevice.current.userInterfaceIdiom == .phone { //TODO: iPad there is a bug here
+            if #available(iOS 13.0, *) {
                 if let themeChanged = previousTraitCollection?.hasDifferentColorAppearance(comparedTo: traitCollection) {
                     if themeChanged {
                         ColorUtil.matchTraitCollection()

Slide for Reddit/SettingsGeneral.swift

@@ -497,7 +497,6 @@ class SettingsGeneral: BubbleSettingTableViewController {
         actionSheetController.show(self)
     }
 
-
     func showTimeMenu(s: LinkSortType, selector: UIView?) {
         if s == .hot || s == .new || s == .rising || s == .best {
             SettingValues.defaultSorting = s
@@ -530,8 +529,9 @@ class SettingsGeneral: BubbleSettingTableViewController {
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
         self.timeMenuView = self.tableView.cellForRow(at: indexPath)!.contentView
-
-        if indexPath.section == 4 && indexPath.row == 0 {
+        if indexPath.section == 0 && indexPath.row == 1 {
+            changeFab()
+        } else if indexPath.section == 4 && indexPath.row == 0 {
             showMenu(tableView.cellForRow(at: indexPath))
         } else if indexPath.section == 4 && indexPath.row == 1 {
             showMenuComments(tableView.cellForRow(at: indexPath))

Slide for Reddit/SettingsTheme.swift

@@ -125,7 +125,7 @@ class SettingsTheme: BubbleSettingTableViewController, ColorPickerViewDelegate {
                 presenter.sourceRect = selectedTableView.bounds
             }
 
-            present(alertController, animated: true, completion: nil)
+            present(alertController, animated: false, completion: nil)
         }
     }
 
@@ -210,7 +210,6 @@ class SettingsTheme: BubbleSettingTableViewController, ColorPickerViewDelegate {
             }
 
             present(alertController, animated: true, completion: nil)
-
         }
     }
 

Slide for Reddit/SingleSubredditViewController.swift

@@ -301,8 +301,8 @@ class SingleSubredditViewController: MediaViewController, AutoplayScrollViewDele
         isModal = navigationController?.presentingViewController != nil || self.modalPresentationStyle == .fullScreen
 
         if isModal {
-            self.navigationController?.delegate = self
             if self.navigationController is TapBehindModalViewController {
+                self.navigationController?.delegate = self
                 (self.navigationController as! TapBehindModalViewController).del = self
             }
         }

Slide for Reddit/SplitMainViewController.swift

@@ -1024,6 +1024,7 @@ extension SplitMainViewController: NavigationHomeDelegate {
             }
         case .POPOVER_AFTER_NAVIGATION:
             if let nav = homeViewController.navigationController as? SwipeForwardNavigationController, nav.topViewController != self, nav.pushableViewControllers.count > 0 {
+                nav.delegate = nav //Fixes strange case where the nav delegate is either overwritten or not equal to self, which is needed for the toExecute() stuff
                 nav.pushNextViewControllerFromRight() {
                     if let present = toPresent {
                         VCPresenter.showVC(viewController: present, popupIfPossible: true, parentNavigationController: homeViewController.navigationController, parentViewController: homeViewController)