Fix crash when artwork data cant be transformed into uiimage

TortugaPower · Jun 26, 2019 · 2643962 · 2643962
1 parent 3a022a3
commit 2643962
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/BookPlayer/Library/LibraryViewController.swift b/BookPlayer/Library/LibraryViewController.swift
@@ -375,7 +375,7 @@ extension LibraryViewController {
             }
             let nextIndex = forward ? currentIndex + 1 : currentIndex - 1
 
-            while nextIndex >= 0 && nextIndex < playListCells.count {
+            while nextIndex >= 0, nextIndex < playListCells.count {
                 let cell = playListCells[nextIndex]
                 return UIAccessibilityCustomRotorItemResult(targetElement: cell, targetRange: nil)
             }

diff --git a/Shared/Extensions/UIColor+Sweetercolor.swift b/Shared/Extensions/UIColor+Sweetercolor.swift
@@ -408,9 +408,9 @@ extension UIColor {
             h_p_bar = h_1_p + h_2_p
         } else if abs(h_1_p - h_2_p) <= 180 {
             h_p_bar = (h_1_p + h_2_p) / 2
-        } else if abs(h_1_p - h_2_p) > 180 && (h_1_p + h_2_p) < 360 {
+        } else if abs(h_1_p - h_2_p) > 180, (h_1_p + h_2_p) < 360 {
             h_p_bar = (h_1_p + h_2_p + 360) / 2
-        } else if abs(h_1_p - h_2_p) > 180 && (h_1_p + h_2_p) >= 360 {
+        } else if abs(h_1_p - h_2_p) > 180, (h_1_p + h_2_p) >= 360 {
             h_p_bar = (h_1_p + h_2_p - 360) / 2
         }
 

diff --git a/Shared/Models/LibraryItem+CoreDataClass.swift b/Shared/Models/LibraryItem+CoreDataClass.swift
@@ -18,11 +18,12 @@ public class LibraryItem: NSManagedObject, Codable {
             return cachedArtwork
         }
 
-        guard let artworkData = self.artworkData else {
+        guard let artworkData = self.artworkData,
+            let image = UIImage(data: artworkData as Data) else {
             return #imageLiteral(resourceName: "defaultArtwork")
         }
 
-        self.cachedArtwork = UIImage(data: artworkData as Data)
+        self.cachedArtwork = image
         return self.cachedArtwork!
     }
 

diff --git a/Shared/WatchConnectivityService.swift b/Shared/WatchConnectivityService.swift
@@ -24,7 +24,7 @@ public class WatchConnectivityService: NSObject, WCSessionDelegate {
         // consider prompting the user to install it for a better experience
 
         #if os(iOS)
-        if let session = self.session, session.isPaired && session.isWatchAppInstalled {
+        if let session = self.session, session.isPaired, session.isWatchAppInstalled {
             return session
         } else {
             return nil