Merge pull request #618 from glouel/testfix

Fix crash on coordinates where calculating dawn/dusk may not be possi…
JohnCoates · Nov 1, 2018 · d7f03d6 · d7f03d6
2 parents 270da51 + e6a73c8
commit d7f03d6
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 44 deletions.
diff --git a/Aerial/Source/Models/Time/TimeManagement.swift b/Aerial/Source/Models/Time/TimeManagement.swift
@@ -162,20 +162,35 @@ class TimeManagement: NSObject {
 
                 switch preferences.solarMode {
                 case Preferences.SolarMode.official.rawValue:
-                    sunriseString = dateFormatter.string(from: (solar?.sunrise)!)
-                    sunsetString = dateFormatter.string(from: (solar?.sunset)!)
+                    guard let sunrise = solar?.sunrise, let sunset = solar?.sunset else {
+                       return (false, "Can't process your coordinates, please verify")
+                    }
+                    sunriseString = dateFormatter.string(from: sunrise)
+                    sunsetString = dateFormatter.string(from: sunset)
                 case Preferences.SolarMode.strict.rawValue:
-                    sunriseString = dateFormatter.string(from: (solar?.strictSunrise)!)
-                    sunsetString = dateFormatter.string(from: (solar?.strictSunset)!)
+                    guard let sunrise = solar?.strictSunrise, let sunset = solar?.strictSunset else {
+                        return (false, "Can't process your coordinates, please verify")
+                    }
+                    sunriseString = dateFormatter.string(from: sunrise)
+                    sunsetString = dateFormatter.string(from: sunset)
                 case Preferences.SolarMode.civil.rawValue:
-                    sunriseString = dateFormatter.string(from: (solar?.civilSunrise)!)
-                    sunsetString = dateFormatter.string(from: (solar?.civilSunset)!)
+                    guard let sunrise = solar?.civilSunrise, let sunset = solar?.civilSunset else {
+                        return (false, "Can't process your coordinates, please verify")
+                    }
+                    sunriseString = dateFormatter.string(from: sunrise)
+                    sunsetString = dateFormatter.string(from: sunset)
                 case Preferences.SolarMode.nautical.rawValue:
-                    sunriseString = dateFormatter.string(from: (solar?.nauticalSunrise)!)
-                    sunsetString = dateFormatter.string(from: (solar?.nauticalSunset)!)
+                    guard let sunrise = solar?.nauticalSunrise, let sunset = solar?.nauticalSunset else {
+                        return (false, "Can't process your coordinates, please verify")
+                    }
+                    sunriseString = dateFormatter.string(from: sunrise)
+                    sunsetString = dateFormatter.string(from: sunset)
                 default:
-                    sunriseString = dateFormatter.string(from: (solar?.astronomicalSunrise)!)
-                    sunsetString = dateFormatter.string(from: (solar?.astronomicalSunset)!)
+                    guard let sunrise = solar?.astronomicalSunrise, let sunset = solar?.astronomicalSunset else {
+                        return (false, "Can't process your coordinates, please verify")
+                    }
+                    sunriseString = dateFormatter.string(from: sunrise)
+                    sunsetString = dateFormatter.string(from: sunset)
                 }
 
                 if preferences.solarMode == Preferences.SolarMode.official.rawValue ||

diff --git a/Resources/Info.plist b/Resources/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.5beta3</string>
+	<string>1.4.5beta4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.5beta3</string>
+	<string>1.4.5beta4</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSMinimumSystemVersion</key>