Skip to content

Commit

Permalink
Merge branch 'nt/doe-on' into release/3.19.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Imperiopolis committed Oct 7, 2020
2 parents 4246ec3 + af6e97c commit 294319b
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@ extension ConversationViewController: MessageActionsDelegate {
}

func messageActionsDeleteItem(_ conversationViewItem: ConversationViewItem) {
// Only show the new menu at all if the feature is on.
guard RemoteConfig.deleteForEveryone else { return conversationViewItem.deleteAction() }

let actionSheetController = ActionSheetController(message: NSLocalizedString(
"MESSAGE_ACTION_DELETE_FOR_TITLE",
comment: "The title for the action sheet asking who the user wants to delete the message for."
Expand Down Expand Up @@ -144,7 +141,6 @@ extension ConversationViewController: MessageActionsDelegate {
// * you haven't already remotely deleted this message
// * it has been less than 3 hours since you sent the message
func canBeRemotelyDeleted(conversationViewItem: ConversationViewItem) -> Bool {
guard RemoteConfig.deleteForEveryone else { return false }
guard let outgoingMessage = conversationViewItem.interaction as? TSOutgoingMessage else { return false }
guard !outgoingMessage.wasRemotelyDeleted else { return false }
guard Date.ows_millisecondTimestamp() - outgoingMessage.timestamp <= (kHourInMs * 3) else { return false }
Expand Down
2 changes: 1 addition & 1 deletion Signal/translations/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -2342,7 +2342,7 @@
"MESSAGE_ACTION_DELETE_FOR_EVERYONE" = "Delete for Everyone";

/* A one-time confirmation that you want to delete for everyone */
"MESSAGE_ACTION_DELETE_FOR_EVERYONE_CONFIRMATION" = "This message will be permanently deleted for everyone in the chat. Members will be able to see that you deleted a message.";
"MESSAGE_ACTION_DELETE_FOR_EVERYONE_CONFIRMATION" = "This message will be deleted for everyone in the chat if they’re on a recent version of Signal. They will be able to see that you deleted a message.";

/* The title for the action sheet asking who the user wants to delete the message for. */
"MESSAGE_ACTION_DELETE_FOR_TITLE" = "Who would you like to delete this message for?";
Expand Down
4 changes: 0 additions & 4 deletions SignalServiceKit/src/Util/RemoteConfigManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ public class RemoteConfig: BaseFlags {
return isEnabled(.uuidSafetyNumbers)
}

@objc
public static var deleteForEveryone: Bool { isEnabled(.deleteForEveryone) }

@objc
public static var versionedProfileFetches: Bool {
if DebugFlags.forceVersionedProfiles { return true }
Expand Down Expand Up @@ -320,7 +317,6 @@ private struct Flags {
case kbs
case groupsV2CreateGroupsV4
case groupsV2GoodCitizenV4
case deleteForEveryone
case versionedProfiles
case mentions
case uuidSafetyNumbers
Expand Down

0 comments on commit 294319b

Please sign in to comment.