diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e2ecbb..81fe2de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to MacTorn will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.4.6] - 2025-01-25 + +### Fixed +- Fixed incorrect "Released" notification triggering when landing from travel +- "Released! 🎉 - You are now free" notification now only fires when released from Hospital or Jail, not when arriving from airplane travel + ## [1.4.5] - 2025-01-25 ### Fixed diff --git a/MacTorn-v1.4.6.zip b/MacTorn-v1.4.6.zip new file mode 100644 index 0000000..d99770a Binary files /dev/null and b/MacTorn-v1.4.6.zip differ diff --git a/MacTorn/MacTorn.xcodeproj/project.pbxproj b/MacTorn/MacTorn.xcodeproj/project.pbxproj index a99cf69..e50e3d8 100644 --- a/MacTorn/MacTorn.xcodeproj/project.pbxproj +++ b/MacTorn/MacTorn.xcodeproj/project.pbxproj @@ -639,7 +639,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.4.5; + MARKETING_VERSION = 1.4.6; PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -666,7 +666,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.4.5; + MARKETING_VERSION = 1.4.6; PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -684,7 +684,7 @@ DEVELOPMENT_TEAM = ""; GENERATE_INFOPLIST_FILE = YES; MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 1.4.5; + MARKETING_VERSION = 1.4.6; PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; @@ -702,7 +702,7 @@ DEVELOPMENT_TEAM = ""; GENERATE_INFOPLIST_FILE = YES; MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 1.4.5; + MARKETING_VERSION = 1.4.6; PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; @@ -720,7 +720,7 @@ DEVELOPMENT_TEAM = ""; GENERATE_INFOPLIST_FILE = YES; MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 1.4.5; + MARKETING_VERSION = 1.4.6; PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; @@ -737,7 +737,7 @@ DEVELOPMENT_TEAM = ""; GENERATE_INFOPLIST_FILE = YES; MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 1.4.5; + MARKETING_VERSION = 1.4.6; PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; diff --git a/MacTorn/MacTorn/ViewModels/AppState.swift b/MacTorn/MacTorn/ViewModels/AppState.swift index 072504e..b7caede 100644 --- a/MacTorn/MacTorn/ViewModels/AppState.swift +++ b/MacTorn/MacTorn/ViewModels/AppState.swift @@ -662,7 +662,7 @@ class AppState: ObservableObject { } if let prevStatus = previousStatus, let currentStatus = newData.status { - if !prevStatus.isOkay && currentStatus.isOkay { + if (prevStatus.isInHospital || prevStatus.isInJail) && currentStatus.isOkay { NotificationManager.shared.send(title: "Released! 🎉", body: "You are now free", type: .released) } }