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

PR Feedback

Browse Source
This commit is contained in:
Nora Trapp 2021-04-29 15:41:16 -07:00
parent a927317a7e
commit dcb1a3e1e9
5 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Signal/src/ViewControllers/AppSettings/Privacy/PrivacySettingsViewController.swift
View File

@ -112,11 +112,11 @@ class PrivacySettingsViewController: OWSTableViewController2 {
let disappearingMessagesSection = OWSTableSection()
disappearingMessagesSection.headerTitle = NSLocalizedString(
"SETTINGS_DISAPPEARING_MESSAGES",
comment: "Label for the 'disappearig messages' privacy settings."
comment: "Label for the 'disappearing messages' privacy settings."
)
disappearingMessagesSection.footerTitle = NSLocalizedString(
"SETTINGS_DISAPPEARING_MESSAGES_FOOTER",
comment: "Explanation for the 'disappearig messages' privacy settings."
comment: "Explanation for the 'disappearing messages' privacy settings."
)
let disappearingMessagesConfiguration = databaseStorage.read { transaction in
OWSDisappearingMessagesConfiguration.fetchOrBuildDefaultUniversalConfiguration(with: transaction)

2
Signal/src/ViewControllers/ConversationView/CV/CVComponentState.swift
View File

@ -627,7 +627,7 @@ fileprivate extension CVComponentState.Builder {
transaction: transaction)
return build()
case .defaultDisappearingMessageTimer:
self.unknownThreadWarning = CVComponentSystemMessage.buildDefaultDisappearingMessageTimerState(
self.defaultDisappearingMessageTimer = CVComponentSystemMessage.buildDefaultDisappearingMessageTimerState(
interaction: interaction,
threadViewModel: threadViewModel,
transaction: transaction

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

@ -4759,10 +4759,10 @@
/* Confirmation text for button which deletes all message, calling, attachments, etc. */
"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON" = "Delete Everything";
/* Label for the 'disappearig messages' privacy settings. */
/* Label for the 'disappearing messages' privacy settings. */
"SETTINGS_DISAPPEARING_MESSAGES" = "Disappearing Messages";
/* Explanation for the 'disappearig messages' privacy settings. */
/* Explanation for the 'disappearing messages' privacy settings. */
"SETTINGS_DISAPPEARING_MESSAGES_FOOTER" = "Set a default disappearing message timer for all new chats started by you.";
/* Title for the 'donate to signal' link in settings. */

14
SignalMessaging/Storage Service/StorageServiceProto+Sync.swift
View File

@ -737,17 +737,9 @@ extension StorageServiceProtoAccountRecord: Dependencies {
let localConfiguration = OWSDisappearingMessagesConfiguration.fetchOrBuildDefaultUniversalConfiguration(with: transaction)
let localExpireToken = localConfiguration.asToken
let expireToken = DisappearingMessageToken.token(forProtoExpireTimer: universalExpireTimer)
if localExpireToken != expireToken {
if expireToken.isEnabled {
localConfiguration
.copyAsEnabled(withDurationSeconds: expireToken.durationSeconds)
.anyUpsert(transaction: transaction)
} else {
localConfiguration
.copy(withIsEnabled: false)
.anyUpsert(transaction: transaction)
}
let remoteExpireToken = DisappearingMessageToken.token(forProtoExpireTimer: universalExpireTimer)
if localExpireToken != remoteExpireToken {
localConfiguration.applyToken(remoteExpireToken, transaction: transaction)
}
return mergeState

2
SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.swift
View File

@ -72,6 +72,7 @@ public extension OWSDisappearingMessagesConfiguration {
}
@objc
@discardableResult
static func applyToken(_ token: DisappearingMessageToken,
toThread thread: TSThread,
transaction: SDSAnyWriteTransaction) -> OWSDisappearingMessagesConfiguration {
@ -81,6 +82,7 @@ public extension OWSDisappearingMessagesConfiguration {
}
@objc
@discardableResult
func applyToken(_ token: DisappearingMessageToken,
transaction: SDSAnyWriteTransaction) -> OWSDisappearingMessagesConfiguration {
let newConfiguration: OWSDisappearingMessagesConfiguration