signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'charlesmchen/iOS10upgradeNag' into release/3.8.3

Browse Source
This commit is contained in:
Matthew Chen 2020-05-08 15:46:19 -03:00
commit cb166b09b7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/translations/en.lproj/Localizable.strings
View File

@ -3807,7 +3807,7 @@
"UPGRADE_EXPERIENCE_INTRODUCING_PINS_SETUP_TITLE" = "Introducing PINs";
/* Message for the alert indicating that user should upgrade iOS. */
"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 10 or later. Please upgrade in Settings app >> General >> Software Update.";
"UPGRADE_IOS_ALERT_MESSAGE" = "Signal will soon require iOS 11 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";

9
SignalMessaging/Views/OWSActionSheets.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// Copyright (c) 2020 Open Whisper Systems. All rights reserved.
//
import Foundation
@ -119,10 +119,9 @@ import Foundation
@objc
public class func showIOSUpgradeNagIfNecessary() {
// Our min SDK is iOS9, so this will only show for iOS9 users
// TODO: Start nagging iOS 10 users now that we're bumping up
// our min SDK to iOS 10.
if #available(iOS 10.0, *) { return }
// We want to nag iOS 10 users now that we're bumping up
// our min SDK to iOS 11.
if #available(iOS 11.0, *) { return }
// Don't nag legacy users if this is an end of life build
// (the last build their OS version supports)