Show in-app notification when new app version is available

Author: rablador

ios/Assets/Localizable.xcstrings

@@ -28550,6 +28550,10 @@
         }
       }
     },
+    "Install the latest app version to stay up to date." : {
+      "comment" : "Body text of an in-app notification that reminds the user to update their app to the latest version.",
+      "isCommentAutoGenerated" : true
+    },
     "Internal error occurred. Settings will be reset to defaults and device logged out." : {
       "localizations" : {
         "da" : {
@@ -58484,6 +58488,10 @@
         }
       }
     },
+    "Update available" : {
+      "comment" : "Title of an in-app notification that alerts the user that a new app version is available.",
+      "isCommentAutoGenerated" : true
+    },
     "USA" : {
       "localizations" : {
         "da" : {

…piHandlers/AppStoreMetaDataService.swift …REST/ApiHandlers/AppVersionService.swiftios/MullvadREST/ApiHandlers/AppStoreMetaDataService.swift renamed to ios/MullvadREST/ApiHandlers/AppVersionService.swift ios/MullvadREST/ApiHandlers/AppStoreMetaDataService.swift renamed to ios/MullvadREST/ApiHandlers/AppVersionService.swift

@@ -1,5 +1,5 @@
 //
-//  AppStoreMetaDataService.swift
+//  AppVersionService.swift
 //  MullvadVPN
 //
 //  Created by Jon Petersson on 2026-01-09.
@@ -9,26 +9,28 @@
 import MullvadLogging
 import MullvadSettings
 import MullvadTypes
-import UserNotifications
 
-public final class AppStoreMetaDataService: @unchecked Sendable {
+public final class AppVersionService: @unchecked Sendable {
+    public enum Deadline {
+        case now, nextCheck
+    }
+
     private var timer: DispatchSourceTimer?
     private let checkInterval: TimeInterval = Duration.days(1).timeInterval
-    private let logger = Logger(label: "AppStoreMetaDataService")
+    private let logger = Logger(label: "AppVersionService")
 
-    private let tunnelSettings: LatestTunnelSettings
     private let urlSession: URLSessionProtocol
     private let appPreferences: AppPreferences
     private let mainAppBundleIdentifier: String
-    private let appStoreLink: URL
+    private let iTunesLink: URL
+
+    public var onNewAppVersion: (() -> Void)?
 
     public init(
-        tunnelSettings: LatestTunnelSettings,
         urlSession: URLSessionProtocol,
         appPreferences: AppPreferences,
-        mainAppBundleIdentifier: String
+        mainAppBundleIdentifier: String,
     ) {
-        self.tunnelSettings = tunnelSettings
         self.urlSession = urlSession
         self.appPreferences = appPreferences
         self.mainAppBundleIdentifier = mainAppBundleIdentifier
@@ -38,28 +40,31 @@ public final class AppStoreMetaDataService: @unchecked Sendable {
             resolvingAgainstBaseURL: true
         )!
         urlComponents.queryItems = [URLQueryItem(name: "bundleId", value: mainAppBundleIdentifier)]
-        appStoreLink = urlComponents.url!
+        iTunesLink = urlComponents.url!
     }
 
-    public func scheduleTimer() {
+    public func scheduleTimer(deadline: Deadline) {
         let newTimer = DispatchSource.makeTimerSource()
 
         newTimer.setEventHandler {
             Task { [weak self] in
-                guard let self, tunnelSettings.includeAllNetworks.includeAllNetworksIsEnabled else {
-                    return
-                }
+                guard let self else { return }
 
                 let newVersionExists = (try? await performVersionCheck()) ?? false
                 if newVersionExists {
-                    sendNotification()
+                    onNewAppVersion?()
                 }
             }
         }
 
-        // Resume deadline if there's time left from previous check. Otherwise, fire away.
-        let elapsed = Date.now.timeIntervalSince(appPreferences.lastVersionCheck.date)
-        let deadline = max(checkInterval - elapsed, 0)
+        let deadline =
+            switch deadline {
+            case .now:
+                0.0
+            case .nextCheck:
+                // Resume deadline if there's time left from previous check. Otherwise, fire away.
+                max(checkInterval - Date.now.timeIntervalSince(appPreferences.lastVersionCheck.date), 0)
+            }
 
         newTimer.schedule(deadline: .now() + deadline, repeating: .seconds(Int(checkInterval)))
         newTimer.activate()
@@ -69,11 +74,11 @@ public final class AppStoreMetaDataService: @unchecked Sendable {
     }
 
     func performVersionCheck() async throws -> Bool {
-        appPreferences.lastVersionCheck.date = .now
-
         let appStoreMetaData = try await fetchAppStoreMetaData()
         let appStoreVersion = appStoreMetaData?.version ?? ""
 
+        appPreferences.lastVersionCheck.date = .now
+
         if appStoreVersion.isNewerThan(Bundle.main.shortVersion) {
             appPreferences.lastVersionCheck.version = appStoreVersion
             return true
@@ -85,7 +90,7 @@ public final class AppStoreMetaDataService: @unchecked Sendable {
     private func fetchAppStoreMetaData() async throws -> AppStoreMetaData? {
         do {
             let data = try await urlSession.data(
-                for: URLRequest(url: appStoreLink, timeoutInterval: REST.defaultAPINetworkTimeout.timeInterval)
+                for: URLRequest(url: iTunesLink, timeoutInterval: REST.defaultAPINetworkTimeout.timeInterval)
             )
             let response = try JSONDecoder().decode(AppStoreMetaDataResponse.self, from: data.0)
             return response.results.first { $0.bundleId == mainAppBundleIdentifier }
@@ -95,42 +100,6 @@ public final class AppStoreMetaDataService: @unchecked Sendable {
 
         return nil
     }
-
-    private func sendNotification() {
-        let content = UNMutableNotificationContent()
-        content.title = NSLocalizedString("Update available", comment: "")
-        content.body = String(
-            format: NSLocalizedString(
-                "Disable “%@” or disconnect before updating in order not to lose network connectivity.",
-                comment: ""
-            ),
-            "Force all apps"
-        )
-
-        // When scheduling a user notification we need to make sure that the date has not passed
-        // when it's actually added to the system. Giving it a few seconds leeway lets us be sure
-        // that this is the case.
-        let dateComponents = Calendar.current.dateComponents(
-            [.second, .minute, .hour, .day, .month, .year],
-            from: Date(timeIntervalSinceNow: 5)
-        )
-        let trigger = UNCalendarNotificationTrigger(dateMatching: dateComponents, repeats: false)
-
-        let request = UNNotificationRequest(
-            identifier: NotificationProviderIdentifier.newAppVersionSystemNotification.domainIdentifier,
-            content: content,
-            trigger: trigger
-        )
-
-        let identifier = request.identifier
-        UNUserNotificationCenter.current().add(request) { [weak self, identifier] error in
-            if let error {
-                self?.logger.error(
-                    "Failed to add notification request with identifier \(identifier). Error: \(error.description)"
-                )
-            }
-        }
-    }
 }
 
 extension String {

…Tests/AppStoreMetaDataServiceTests.swift …adRESTTests/AppVersionServiceTests.swiftios/MullvadRESTTests/AppStoreMetaDataServiceTests.swift renamed to ios/MullvadRESTTests/AppVersionServiceTests.swift ios/MullvadRESTTests/AppStoreMetaDataServiceTests.swift renamed to ios/MullvadRESTTests/AppVersionServiceTests.swift

@@ -1,5 +1,5 @@
 //
-//  AppStoreMetaDataServiceTests.swift
+//  AppVersionServiceTests.swift
 //  MullvadVPN
 //
 //  Created by Jon Petersson on 2026-01-15.
@@ -12,7 +12,7 @@ import XCTest
 @testable import MullvadREST
 @testable import MullvadSettings
 
-class AppStoreMetaDataServiceTests: XCTestCase {
+class AppVersionServiceTests: XCTestCase {
     private let encoder = JSONEncoder()
 
     func testPerformVersionCheckNewVersionExists() async throws {
@@ -30,8 +30,7 @@ class AppStoreMetaDataServiceTests: XCTestCase {
             ]
         )
 
-        let metaDataService = AppStoreMetaDataService(
-            tunnelSettings: LatestTunnelSettings(),
+        let appVersionService = AppVersionService(
             urlSession: URLSessionStub(
                 response: (mockData, URLResponse())
             ),
@@ -40,7 +39,7 @@ class AppStoreMetaDataServiceTests: XCTestCase {
 
         )
 
-        let shouldSendNotification = try await metaDataService.performVersionCheck()
+        let shouldSendNotification = try await appVersionService.performVersionCheck()
         XCTAssertTrue(shouldSendNotification)
     }
 
@@ -58,16 +57,15 @@ class AppStoreMetaDataServiceTests: XCTestCase {
             ]
         )
 
-        let metaDataService = AppStoreMetaDataService(
-            tunnelSettings: LatestTunnelSettings(),
+        let appVersionService = AppVersionService(
             urlSession: URLSessionStub(
                 response: (mockData, URLResponse())
             ),
             appPreferences: AppPreferences(),
             mainAppBundleIdentifier: bundleId
         )
 
-        let shouldSendNotification = try await metaDataService.performVersionCheck()
+        let shouldSendNotification = try await appVersionService.performVersionCheck()
         XCTAssertFalse(shouldSendNotification)
     }
 

ios/MullvadTypes/InAppNotificationDescriptor.swift

@@ -0,0 +1,69 @@
+//
+//  InAppNotificationDescriptor.swift
+//  MullvadVPN
+//
+//  Created by pronebird on 09/12/2022.
+//  Copyright © 2025 Mullvad VPN AB. All rights reserved.
+//
+
+import Foundation
+import UIKit.UIImage
+
+/// Struct describing in-app notification.
+public struct InAppNotificationDescriptor: Equatable {
+    /// Notification identifier.
+    public var identifier: NotificationProviderIdentifier
+
+    /// Notification banner style.
+    public var style: NotificationBannerStyle
+
+    /// Notification title.
+    public var title: String
+
+    /// Notification body.
+    public var body: NSAttributedString
+
+    /// Notification action (optional).
+    public var button: InAppNotificationAction?
+
+    /// Notification button action (optional).
+    public var tapAction: InAppNotificationAction?
+
+    public init(
+        identifier: NotificationProviderIdentifier,
+        style: NotificationBannerStyle,
+        title: String,
+        body: NSAttributedString,
+        button: InAppNotificationAction? = nil,
+        tapAction: InAppNotificationAction? = nil
+    ) {
+        self.identifier = identifier
+        self.style = style
+        self.title = title
+        self.body = body
+        self.button = button
+        self.tapAction = tapAction
+    }
+}
+
+/// Type describing a specific in-app notification action.
+public struct InAppNotificationAction: Equatable {
+    /// Image assigned to action button.
+    public var image: UIImage?
+
+    /// Action handler for button.
+    public var handler: (() -> Void)?
+
+    public init(image: UIImage? = nil, handler: (() -> Void)?) {
+        self.image = image
+        self.handler = handler
+    }
+
+    public static func == (lhs: InAppNotificationAction, rhs: InAppNotificationAction) -> Bool {
+        lhs.image == rhs.image
+    }
+}
+
+public enum NotificationBannerStyle {
+    case success, warning, error
+}

ios/MullvadTypes/NotificationProviderIdentifier.swift

@@ -21,7 +21,8 @@ public enum NotificationPriority: Int, Comparable {
 
 public enum NotificationProviderIdentifier: String {
     case accountExpirySystemNotification = "AccountExpiryNotification"
-    case newAppVersionSystemNotification = "NewAppVersionNotification"
+    case newAppVersionSystemNotification = "NewAppVersionSystemNotification"
+    case newAppVersionInAppNotification = "NewAppVersionInAppNotification"
     case accountExpiryInAppNotification = "AccountExpiryInAppNotification"
     case registeredDeviceInAppNotification = "RegisteredDeviceInAppNotification"
     case tunnelStatusNotificationProvider = "TunnelStatusNotificationProvider"