From 58d99a480f3b1f19225fd40b32e305e5c40d2184 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 21 Mar 2019 15:25:56 -0700 Subject: [PATCH] Notify iOS9 users occasionally that iOS10 will soon be required --- Signal/translations/en.lproj/Localizable.strings | 2 +- SignalMessaging/Views/OWSAlerts.swift | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index dfbc5329e..c5585ead8 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -2484,7 +2484,7 @@ "UPGRADE_EXPERIENCE_VIDEO_TITLE" = "Hello Secure Video Calls!"; /* Message for the alert indicating that user should upgrade iOS. */ -"UPGRADE_IOS_ALERT_MESSAGE" = "Signal requires iOS 9 or later. Please use the Software Update feature in the iOS Settings app."; +"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update."; /* Title for the alert indicating that user should upgrade iOS. */ "UPGRADE_IOS_ALERT_TITLE" = "Upgrade iOS"; diff --git a/SignalMessaging/Views/OWSAlerts.swift b/SignalMessaging/Views/OWSAlerts.swift index ec4e1687a..db7974a1f 100644 --- a/SignalMessaging/Views/OWSAlerts.swift +++ b/SignalMessaging/Views/OWSAlerts.swift @@ -96,10 +96,8 @@ import Foundation @objc public class func showIOSUpgradeNagIfNecessary() { - // Only show the nag to iOS 8 users. - // - // NOTE: Our current minimum iOS version is 9, so this should never show. - if #available(iOS 9.0, *) { + // Our min SDK is iOS9, so this will only show for iOS9 users + if #available(iOS 10.0, *) { return } @@ -110,8 +108,7 @@ import Foundation } if let iOSUpgradeNagDate = Environment.shared.preferences.iOSUpgradeNagDate() { - // Nag no more than once every three days. - let kNagFrequencySeconds = 3 * kDayInterval + let kNagFrequencySeconds = 14 * kDayInterval guard fabs(iOSUpgradeNagDate.timeIntervalSinceNow) > kNagFrequencySeconds else { return }