diff --git a/Signal/Images.xcassets/phone-warning.imageset/Contents.json b/Signal/Images.xcassets/phone-warning.imageset/Contents.json new file mode 100644 index 0000000000..3ed3a5defc --- /dev/null +++ b/Signal/Images.xcassets/phone-warning.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "phone-warning.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/Signal/Images.xcassets/phone-warning.imageset/phone-warning.pdf b/Signal/Images.xcassets/phone-warning.imageset/phone-warning.pdf new file mode 100644 index 0000000000..43b31d6114 Binary files /dev/null and b/Signal/Images.xcassets/phone-warning.imageset/phone-warning.pdf differ diff --git a/Signal/Megaphones/UserInterface/InactivePrimaryDeviceReminderMegaphone.swift b/Signal/Megaphones/UserInterface/InactivePrimaryDeviceReminderMegaphone.swift index 48e6e179cb..3816f2dd17 100644 --- a/Signal/Megaphones/UserInterface/InactivePrimaryDeviceReminderMegaphone.swift +++ b/Signal/Megaphones/UserInterface/InactivePrimaryDeviceReminderMegaphone.swift @@ -25,7 +25,7 @@ final class InactivePrimaryDeviceReminderMegaphone: MegaphoneView { comment: "Body for an in-app megaphone about a user's inactive primary device." ) - imageName = "inactive-linked-device-reminder-megaphone" + imageName = "phone-warning" imageContentMode = .center let viewControllerRef = fromViewController diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index ad1924f73c..b27f4254b3 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -4238,7 +4238,7 @@ "INACTIVE_LINKED_DEVICE_REMINDER_MEGAPHONE_TITLE" = "Inactive Linked Device"; /* Body for an in-app megaphone about a user's inactive primary device. */ -"INACTIVE_PRIMARY_DEVICE_REMINDER_MEGAPHONE_BODY" = "Open Signal on your phone to keep your account active"; +"INACTIVE_PRIMARY_DEVICE_REMINDER_MEGAPHONE_BODY" = "To keep your account active, open Signal on your primary device."; /* Title for a button in an in-app megaphone about a user's inactive primary device, temporarily dismissing the megaphone. */ "INACTIVE_PRIMARY_DEVICE_REMINDER_MEGAPHONE_GOT_IT_BUTTON" = "Got It"; @@ -4247,7 +4247,7 @@ "INACTIVE_PRIMARY_DEVICE_REMINDER_MEGAPHONE_LEARN_MORE_BUTTON" = "Learn more"; /* Title for an in-app megaphone about a user's inactive primary device. */ -"INACTIVE_PRIMARY_DEVICE_REMINDER_MEGAPHONE_TITLE" = "Inactive Primary Device"; +"INACTIVE_PRIMARY_DEVICE_REMINDER_MEGAPHONE_TITLE" = "Open Signal on your phone"; /* Label reminding the user that they are in archive mode, and that muted chats remain archived when they receive a new message. */ "INBOX_VIEW_ARCHIVE_MODE_MUTED_CHATS_REMINDER" = "Muted chats that are archived will remain archived when a new message arrives."; diff --git a/SignalServiceKit/Megaphones/ExperienceUpgradeManifest.swift b/SignalServiceKit/Megaphones/ExperienceUpgradeManifest.swift index 2753c60d55..e0b5acf18f 100644 --- a/SignalServiceKit/Megaphones/ExperienceUpgradeManifest.swift +++ b/SignalServiceKit/Megaphones/ExperienceUpgradeManifest.swift @@ -649,11 +649,7 @@ extension ExperienceUpgradeManifest { } public static func checkPreconditionsForInactivePrimaryDeviceReminder(tx: DBReadTransaction) -> Bool { - if FeatureFlags.inactivePrimaryDeviceMegaphone { - return DependenciesBridge.shared.inactivePrimaryDeviceStore.valueForInactivePrimaryDeviceAlert(transaction: tx) - } - - return false + return DependenciesBridge.shared.inactivePrimaryDeviceStore.valueForInactivePrimaryDeviceAlert(transaction: tx) } public static func checkPreconditionsForPinReminder(transaction: DBReadTransaction) -> Bool { diff --git a/SignalServiceKit/Util/FeatureFlags.swift b/SignalServiceKit/Util/FeatureFlags.swift index 36e4d7e429..46e48daf6d 100644 --- a/SignalServiceKit/Util/FeatureFlags.swift +++ b/SignalServiceKit/Util/FeatureFlags.swift @@ -61,8 +61,6 @@ public enum FeatureFlags { public static let libsignalEnforceMinTlsVersion = false public static let moveDraftsUpChatList = build.includes(.internal) - - public static let inactivePrimaryDeviceMegaphone = build.includes(.dev) } // MARK: -