Newly added group members should have expire time

Send expire timer with group info updates and in group updates that add a user.
7 years ago · 0cf751d34f
parent a9e5d43fc8
commit 0cf751d34f
14 changed files with 61 additions and 19 deletions
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@ -3918,7 +3918,11 @@ typedef enum : NSUInteger {

        groupThread.groupModel = newGroupModel;
        [groupThread saveWithTransaction:transaction];
-        message = [TSOutgoingMessage outgoingMessageInThread:groupThread groupMetaMessage:TSGroupMessageUpdate];
+
+        uint32_t expiresInSeconds = [groupThread disappearingMessagesDurationWithTransaction:transaction];
+        message = [TSOutgoingMessage outgoingMessageInThread:groupThread
+                                            groupMetaMessage:TSGroupMessageUpdate
+                                            expiresInSeconds:expiresInSeconds];
        [message updateWithCustomMessage:updateGroupInfo transaction:transaction];
    }];

--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
@ -3766,7 +3766,8 @@ typedef OWSContact * (^OWSContactBlock)(YapDatabaseReadWriteTransaction *transac
        }];
    OWSAssert(thread);

-    TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread groupMetaMessage:TSGroupMessageNew];
+    TSOutgoingMessage *message =
+        [TSOutgoingMessage outgoingMessageInThread:thread groupMetaMessage:TSGroupMessageNew expiresInSeconds:0];
    [message updateWithCustomMessage:NSLocalizedString(@"GROUP_CREATED", nil)];

    OWSMessageSender *messageSender = [Environment current].messageSender;
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
@ -75,8 +75,8 @@ NS_ASSUME_NONNULL_BEGIN
                                             YapDatabaseReadWriteTransaction *_Nonnull transaction) {
                                             OWSDisappearingMessagesConfiguration *config =
                                                 [OWSDisappearingMessagesConfiguration
-                                                     fetchOrCreateDefaultWithThreadId:thread.uniqueId
-                                                                          transaction:transaction];
+                                                     fetchOrBuildDefaultWithThreadId:thread.uniqueId
+                                                                         transaction:transaction];
                                             [config removeWithTransaction:transaction];
                                         }];
                                     }]];
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@ -938,8 +938,9 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
                          preferredStyle:UIAlertControllerStyleAlert];
            [self presentViewController:removingFromGroup animated:YES completion:nil];

-            TSOutgoingMessage *message =
-                [TSOutgoingMessage outgoingMessageInThread:thread groupMetaMessage:TSGroupMessageQuit];
+            TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread
+                                                                   groupMetaMessage:TSGroupMessageQuit
+                                                                   expiresInSeconds:0];
            [self.messageSender enqueueMessage:message
                success:^{
                    [self dismissViewControllerAnimated:YES
--- a/Signal/src/ViewControllers/NewGroupViewController.m
+++ b/Signal/src/ViewControllers/NewGroupViewController.m
@ -482,8 +482,9 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68;
        presentFromViewController:self
                        canCancel:NO
                  backgroundBlock:^(ModalActivityIndicatorViewController *modalActivityIndicator) {
-                      TSOutgoingMessage *message =
-                          [TSOutgoingMessage outgoingMessageInThread:thread groupMetaMessage:TSGroupMessageNew];
+                      TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:thread
+                                                                             groupMetaMessage:TSGroupMessageNew
+                                                                             expiresInSeconds:0];

                      [message updateWithCustomMessage:NSLocalizedString(@"GROUP_CREATED", nil)];

--- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
@ -937,7 +937,7 @@ NS_ASSUME_NONNULL_BEGIN
 {
    TSGroupThread *gThread = (TSGroupThread *)self.thread;
    TSOutgoingMessage *message =
-        [TSOutgoingMessage outgoingMessageInThread:gThread groupMetaMessage:TSGroupMessageQuit];
+        [TSOutgoingMessage outgoingMessageInThread:gThread groupMetaMessage:TSGroupMessageQuit expiresInSeconds:0];
    [self.messageSender enqueueMessage:message
        success:^{
            DDLogInfo(@"%@ Successfully left group.", self.logTag);
--- a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h
+++ b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.h
@ -23,8 +23,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, readonly) BOOL dictionaryValueDidChange;
@property (readonly, getter=isNewRecord) BOOL newRecord;

-+ (instancetype)fetchOrCreateDefaultWithThreadId:(NSString *)threadId
-                                     transaction:(YapDatabaseReadTransaction *)transaction;
+ (instancetype)fetchOrBuildDefaultWithThreadId:(NSString *)threadId
+                                    transaction:(YapDatabaseReadTransaction *)transaction;

 + (NSArray<NSNumber *> *)validDurationsSeconds;
 + (uint32_t)maxDurationSeconds;
--- a/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m
+++ b/SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m
@ -50,8 +50,8 @@ NS_ASSUME_NONNULL_BEGIN
    return self;
 }

-+ (instancetype)fetchOrCreateDefaultWithThreadId:(NSString *)threadId
-                                     transaction:(YapDatabaseReadTransaction *)transaction
+ (instancetype)fetchOrBuildDefaultWithThreadId:(NSString *)threadId
+                                    transaction:(YapDatabaseReadTransaction *)transaction
 {
    OWSDisappearingMessagesConfiguration *savedConfiguration =
        [self fetchObjectWithUniqueID:threadId transaction:transaction];
--- a/SignalServiceKit/src/Contacts/TSThread.h
+++ b/SignalServiceKit/src/Contacts/TSThread.h
@ -6,6 +6,7 @@

 NS_ASSUME_NONNULL_BEGIN

+@class OWSDisappearingMessagesConfiguration;
@class TSInteraction;
@class TSInvalidIdentityKeyReceivingErrorMessage;

@ -122,6 +123,13 @@ NS_ASSUME_NONNULL_BEGIN

 - (void)removeAllThreadInteractionsWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;

+
+#pragma mark Disappearing Messages
+
+- (OWSDisappearingMessagesConfiguration *)disappearingMessagesConfigurationWithTransaction:
+    (YapDatabaseReadTransaction *)transaction;
+- (uint32_t)disappearingMessagesDurationWithTransaction:(YapDatabaseReadTransaction *)transaction;
+
 #pragma mark Drafts

 /**
--- a/SignalServiceKit/src/Contacts/TSThread.m
+++ b/SignalServiceKit/src/Contacts/TSThread.m
@ -5,6 +5,7 @@
 #import "TSThread.h"
 #import "NSDate+OWS.h"
 #import "NSString+SSK.h"
+#import "OWSDisappearingMessagesConfiguration.h"
 #import "OWSPrimaryStorage.h"
 #import "OWSReadTracking.h"
 #import "TSDatabaseView.h"
@ -324,6 +325,26 @@ NS_ASSUME_NONNULL_BEGIN
    }
 }

+#pragma mark Disappearing Messages
+
+- (OWSDisappearingMessagesConfiguration *)disappearingMessagesConfigurationWithTransaction:
+    (YapDatabaseReadTransaction *)transaction
+{
+    return [OWSDisappearingMessagesConfiguration fetchOrBuildDefaultWithThreadId:self.uniqueId transaction:transaction];
+}
+
+- (uint32_t)disappearingMessagesDurationWithTransaction:(YapDatabaseReadTransaction *)transaction
+{
+
+    OWSDisappearingMessagesConfiguration *config = [self disappearingMessagesConfigurationWithTransaction:transaction];
+
+    if (!config.isEnabled) {
+        return 0;
+    } else {
+        return config.durationSeconds;
+    }
+}
+
 #pragma mark Archival

 - (nullable NSDate *)archivalDate
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.h
@ -106,7 +106,8 @@ typedef NS_ENUM(NSInteger, TSGroupMetaMessage) {
                          quotedMessage:(nullable TSQuotedMessage *)quotedMessage;

 + (instancetype)outgoingMessageInThread:(nullable TSThread *)thread
-                       groupMetaMessage:(TSGroupMetaMessage)groupMetaMessage;
+                       groupMetaMessage:(TSGroupMetaMessage)groupMetaMessage
+                       expiresInSeconds:(uint32_t)expiresInSeconds;

@property (readonly) TSOutgoingMessageState messageState;
@property (readonly) BOOL wasDeliveredToAnyRecipient;
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
@ -275,12 +275,13 @@ NSString *NSStringForOutgoingMessageRecipientState(OWSOutgoingMessageRecipientSt

 + (instancetype)outgoingMessageInThread:(nullable TSThread *)thread
                       groupMetaMessage:(TSGroupMetaMessage)groupMetaMessage
+                       expiresInSeconds:(uint32_t)expiresInSeconds;
 {
    return [[TSOutgoingMessage alloc] initOutgoingMessageWithTimestamp:[NSDate ows_millisecondTimeStamp]
                                                              inThread:thread
                                                           messageBody:nil
                                                         attachmentIds:[NSMutableArray new]
-                                                      expiresInSeconds:0
+                                                      expiresInSeconds:expiresInSeconds
                                                       expireStartedAt:0
                                                        isVoiceMessage:NO
                                                      groupMetaMessage:groupMetaMessage
--- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m
+++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m
@ -205,8 +205,8 @@ void AssertIsOnDisappearingMessagesQueue()
    // Become eventually consistent in the case that the remote changed their settings at the same time.
    // Also in case remote doesn't support expiring messages
    OWSDisappearingMessagesConfiguration *disappearingMessagesConfiguration =
-        [OWSDisappearingMessagesConfiguration fetchOrCreateDefaultWithThreadId:message.uniqueThreadId
-                                                                   transaction:transaction];
+        [OWSDisappearingMessagesConfiguration fetchOrBuildDefaultWithThreadId:message.uniqueThreadId
+                                                                  transaction:transaction];

    if (message.expiresInSeconds == 0) {
        disappearingMessagesConfiguration.enabled = NO;
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@ -888,8 +888,12 @@ NS_ASSUME_NONNULL_BEGIN

    NSString *updateGroupInfo =
        [gThread.groupModel getInfoStringAboutUpdateTo:gThread.groupModel contactsManager:self.contactsManager];
-    TSOutgoingMessage *message =
-        [TSOutgoingMessage outgoingMessageInThread:gThread groupMetaMessage:TSGroupMessageUpdate];
+
+    uint32_t expiresInSeconds = [gThread disappearingMessagesDurationWithTransaction:transaction];
+    TSOutgoingMessage *message = [TSOutgoingMessage outgoingMessageInThread:gThread
+                                                           groupMetaMessage:TSGroupMessageUpdate
+                                                           expiresInSeconds:expiresInSeconds];
+
    [message updateWithCustomMessage:updateGroupInfo transaction:transaction];
    // Only send this group update to the requester.
    [message updateWithSendingToSingleGroupRecipient:envelope.source transaction:transaction];