keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add stress group to debug UI.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent bd416176ae
commit 7268bde506
31 changed files with 448 additions and 66 deletions
Show Stats Download Patch File Download Diff File

5
Signal/src/Signal-Bridging-Header.h
Unescape Escape View File

@ -2,8 +2,6 @@
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "AppSettingsViewController.h"
#import "AttachmentSharing.h"
#import "DebugUIPage.h"
@ -39,6 +37,7 @@
#import "UIView+OWS.h"
#import "ViewControllerUtils.h"
#import <AxolotlKit/NSData+keyVersionByte.h>
#import <Foundation/Foundation.h>
#import <JSQMessagesViewController/JSQMediaItem.h>
#import <JSQMessagesViewController/JSQMessagesMediaViewBubbleImageMasker.h>
#import <JSQMessagesViewController/UIColor+JSQMessages.h>
@ -53,7 +52,7 @@
#import <SignalServiceKit/MIMETypeUtil.h>
#import <SignalServiceKit/NSData+Base64.h>
#import <SignalServiceKit/NSData+Image.h>
#import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/NSNotificationCenter+OWS.h>
#import <SignalServiceKit/NSTimer+OWS.h>
#import <SignalServiceKit/OWSAcknowledgeMessageDeliveryRequest.h>

1
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
Unescape Escape View File

@ -12,7 +12,6 @@
#import "Environment.h"
#import "FingerprintViewController.h"
#import "FullImageViewController.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NewGroupViewController.h"
#import "OWSAudioAttachmentPlayer.h"
#import "OWSCall.h"

394
Signal/src/ViewControllers/DebugUI/DebugUIStress.m
Unescape Escape View File

@ -8,6 +8,7 @@
#import "OWSTableViewController.h"
#import "ThreadUtil.h"
#import <SignalServiceKit/Cryptography.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSDynamicOutgoingMessage.h>
#import <SignalServiceKit/SecurityUtils.h>
#import <SignalServiceKit/TSGroupThread.h>
@ -48,6 +49,15 @@ NS_ASSUME_NONNULL_BEGIN
return [NSData new];
}];
}]];
[items addObject:[OWSTableItem itemWithTitle:@"Send random noise message"
actionBlock:^{
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
NSUInteger contentLength = arc4random_uniform(32);
return [Cryptography generateRandomBytes:contentLength];
}];
}]];
[items addObject:[OWSTableItem itemWithTitle:@"Send no payload message"
actionBlock:^{
[DebugUIStress sendStressMessage:thread block:^(SignalRecipient *recipient) {
@ -64,19 +74,350 @@ NS_ASSUME_NONNULL_BEGIN
return [[contentBuilder build] data];
}];
}]];
[items addObject:[OWSTableItem itemWithTitle:@"Send random null message"
[items
addObject:[OWSTableItem itemWithTitle:@"Send random null message"
actionBlock:^{
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosNullMessageBuilder *nullMessageBuilder =
[OWSSignalServiceProtosNullMessageBuilder new];
NSUInteger contentLength = arc4random_uniform(32);
nullMessageBuilder.padding =
[Cryptography generateRandomBytes:contentLength];
contentBuilder.nullMessage = [nullMessageBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items
addObject:[OWSTableItem itemWithTitle:@"Send empty sync message"
actionBlock:^{
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder =
[OWSSignalServiceProtosSyncMessageBuilder new];
contentBuilder.syncMessage = [syncMessageBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items
addObject:[OWSTableItem itemWithTitle:@"Send empty sync sent message"
actionBlock:^{
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder =
[OWSSignalServiceProtosSyncMessageBuilder new];
OWSSignalServiceProtosSyncMessageSentBuilder *sentBuilder =
[OWSSignalServiceProtosSyncMessageSentBuilder new];
syncMessageBuilder.sent = [sentBuilder build];
contentBuilder.syncMessage = [syncMessageBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items addObject:[OWSTableItem itemWithTitle:@"Send whitespace text data message"
actionBlock:^{
[DebugUIStress sendStressMessage:thread block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder = [OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosNullMessageBuilder *nullMessageBuilder = [OWSSignalServiceProtosNullMessageBuilder new];
NSUInteger contentLength = arc4random_uniform(32);
nullMessageBuilder.padding = [Cryptography generateRandomBytes:contentLength];
contentBuilder.nullMessage = [nullMessageBuilder build];
// contentBuilder.dataMessage = [self buildDataMessage:recipient.recipientId];
return [[contentBuilder build] data];
}];
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
dataBuilder.body = @" ";
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder
thread:thread];
contentBuilder.dataMessage = [dataBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items addObject:[OWSTableItem
itemWithTitle:@"Send bad attachment data message"
actionBlock:^{
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
OWSSignalServiceProtosAttachmentPointerBuilder *attachmentPointer =
[OWSSignalServiceProtosAttachmentPointerBuilder new];
[attachmentPointer setId:arc4random_uniform(32) + 1];
[attachmentPointer setContentType:@"1"];
[attachmentPointer setSize:arc4random_uniform(32) + 1];
[attachmentPointer setDigest:[Cryptography generateRandomBytes:1]];
[attachmentPointer setFileName:@" "];
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder thread:thread];
contentBuilder.dataMessage = [dataBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items addObject:[OWSTableItem itemWithTitle:@"Send normal text data message"
actionBlock:^{
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
dataBuilder.body = @"alice";
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder
thread:thread];
contentBuilder.dataMessage = [dataBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items addObject:[OWSTableItem itemWithTitle:@"Send N text messages with same timestamp"
actionBlock:^{
uint64_t timestamp = [NSDate ows_millisecondTimeStamp];
for (int i = 0; i < 3; i++) {
[DebugUIStress
sendStressMessage:thread
timestamp:timestamp
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
dataBuilder.body = [NSString stringWithFormat:@"%@ %d",
[NSUUID UUID].UUIDString,
i];
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder
thread:thread];
contentBuilder.dataMessage = [dataBuilder build];
return [[contentBuilder build] data];
}];
}
}]];
[items addObject:[OWSTableItem
itemWithTitle:@"Send text message with current timestamp"
actionBlock:^{
uint64_t timestamp = [NSDate ows_millisecondTimeStamp];
[DebugUIStress
sendStressMessage:thread
timestamp:timestamp
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
dataBuilder.body =
[[NSUUID UUID].UUIDString stringByAppendingString:@" now"];
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder thread:thread];
contentBuilder.dataMessage = [dataBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items addObject:[OWSTableItem
itemWithTitle:@"Send text message with future timestamp"
actionBlock:^{
uint64_t timestamp = [NSDate ows_millisecondTimeStamp];
timestamp += kHourInMs;
[DebugUIStress
sendStressMessage:thread
timestamp:timestamp
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
dataBuilder.body =
[[NSUUID UUID].UUIDString stringByAppendingString:@" now"];
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder thread:thread];
contentBuilder.dataMessage = [dataBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items addObject:[OWSTableItem
itemWithTitle:@"Send text message with past timestamp"
actionBlock:^{
uint64_t timestamp = [NSDate ows_millisecondTimeStamp];
timestamp -= kHourInMs;
[DebugUIStress
sendStressMessage:thread
timestamp:timestamp
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
dataBuilder.body =
[[NSUUID UUID].UUIDString stringByAppendingString:@" now"];
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder thread:thread];
contentBuilder.dataMessage = [dataBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items addObject:[OWSTableItem itemWithTitle:@"Send N text messages with same timestamp"
actionBlock:^{
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
dataBuilder.body = @"alice";
contentBuilder.dataMessage = [dataBuilder build];
[DebugUIStress ensureGroupOfDataBuilder:dataBuilder thread:thread];
NSData *data = [[contentBuilder build] data];
uint64_t timestamp = [NSDate ows_millisecondTimeStamp];
for (int i = 0; i < 3; i++) {
[DebugUIStress sendStressMessage:thread
timestamp:timestamp
block:^(SignalRecipient *recipient) {
return data;
}];
}
}]];
[items
addObject:[OWSTableItem itemWithTitle:@"Send malformed sync sent message 1"
actionBlock:^{
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder =
[OWSSignalServiceProtosSyncMessageBuilder new];
OWSSignalServiceProtosSyncMessageSentBuilder *sentBuilder =
[OWSSignalServiceProtosSyncMessageSentBuilder new];
sentBuilder.destination = @"abc";
sentBuilder.timestamp = arc4random_uniform(32) + 1;
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
sentBuilder.message = [dataBuilder build];
syncMessageBuilder.sent = [sentBuilder build];
contentBuilder.syncMessage = [syncMessageBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items
addObject:[OWSTableItem itemWithTitle:@"Send malformed sync sent message 2"
actionBlock:^{
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder =
[OWSSignalServiceProtosSyncMessageBuilder new];
OWSSignalServiceProtosSyncMessageSentBuilder *sentBuilder =
[OWSSignalServiceProtosSyncMessageSentBuilder new];
sentBuilder.destination = @"abc";
sentBuilder.timestamp = 0;
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
sentBuilder.message = [dataBuilder build];
syncMessageBuilder.sent = [sentBuilder build];
contentBuilder.syncMessage = [syncMessageBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items
addObject:[OWSTableItem itemWithTitle:@"Send malformed sync sent message 3"
actionBlock:^{
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder =
[OWSSignalServiceProtosSyncMessageBuilder new];
OWSSignalServiceProtosSyncMessageSentBuilder *sentBuilder =
[OWSSignalServiceProtosSyncMessageSentBuilder new];
sentBuilder.destination = @"abc";
sentBuilder.timestamp = 0;
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
dataBuilder.body = @" ";
sentBuilder.message = [dataBuilder build];
syncMessageBuilder.sent = [sentBuilder build];
contentBuilder.syncMessage = [syncMessageBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items
addObject:[OWSTableItem itemWithTitle:@"Send malformed sync sent message 4"
actionBlock:^{
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder =
[OWSSignalServiceProtosSyncMessageBuilder new];
OWSSignalServiceProtosSyncMessageSentBuilder *sentBuilder =
[OWSSignalServiceProtosSyncMessageSentBuilder new];
sentBuilder.destination = @"abc";
sentBuilder.timestamp = 0;
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
dataBuilder.body = @" ";
OWSSignalServiceProtosGroupContextBuilder *groupBuilder =
[OWSSignalServiceProtosGroupContextBuilder new];
[groupBuilder setId:[Cryptography generateRandomBytes:1]];
dataBuilder.group = [groupBuilder build];
sentBuilder.message = [dataBuilder build];
syncMessageBuilder.sent = [sentBuilder build];
contentBuilder.syncMessage = [syncMessageBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items
addObject:[OWSTableItem itemWithTitle:@"Send malformed sync sent message 5"
actionBlock:^{
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder =
[OWSSignalServiceProtosSyncMessageBuilder new];
OWSSignalServiceProtosSyncMessageSentBuilder *sentBuilder =
[OWSSignalServiceProtosSyncMessageSentBuilder new];
sentBuilder.destination = @"abc";
sentBuilder.timestamp = 0;
OWSSignalServiceProtosDataMessageBuilder *dataBuilder =
[OWSSignalServiceProtosDataMessageBuilder new];
dataBuilder.body = @" ";
OWSSignalServiceProtosGroupContextBuilder *groupBuilder =
[OWSSignalServiceProtosGroupContextBuilder new];
[groupBuilder setId:[Cryptography generateRandomBytes:1]];
dataBuilder.group = [groupBuilder build];
sentBuilder.message = [dataBuilder build];
syncMessageBuilder.sent = [sentBuilder build];
contentBuilder.syncMessage = [syncMessageBuilder build];
return [[contentBuilder build] data];
}];
}]];
[items
addObject:[OWSTableItem itemWithTitle:@"Send empty sync sent message 6"
actionBlock:^{
[DebugUIStress
sendStressMessage:thread
block:^(SignalRecipient *recipient) {
OWSSignalServiceProtosContentBuilder *contentBuilder =
[OWSSignalServiceProtosContentBuilder new];
OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder =
[OWSSignalServiceProtosSyncMessageBuilder new];
OWSSignalServiceProtosSyncMessageSentBuilder *sentBuilder =
[OWSSignalServiceProtosSyncMessageSentBuilder new];
sentBuilder.destination = @"abc";
syncMessageBuilder.sent = [sentBuilder build];
contentBuilder.syncMessage = [syncMessageBuilder build];
return [[contentBuilder build] data];
}];
}]];
if ([thread isKindOfClass:[TSGroupThread class]]) {
TSGroupThread *groupThread = (TSGroupThread *)thread;
[items addObject:[OWSTableItem itemWithTitle:@"Hallucinate twin group"
@ -87,6 +428,22 @@ NS_ASSUME_NONNULL_BEGIN
return [OWSTableSection sectionWithTitle:self.name items:items];
}
+ (void)ensureGroupOfDataBuilder:(OWSSignalServiceProtosDataMessageBuilder *)dataBuilder thread:(TSThread *)thread
{
OWSAssert(dataBuilder);
OWSAssert(thread);
if (![thread isKindOfClass:[TSGroupThread class]]) {
return;
}
TSGroupThread *groupThread = (TSGroupThread *)thread;
OWSSignalServiceProtosGroupContextBuilder *groupBuilder = [OWSSignalServiceProtosGroupContextBuilder new];
[groupBuilder setType:OWSSignalServiceProtosGroupContextTypeDeliver];
[groupBuilder setId:groupThread.groupModel.groupId];
[dataBuilder setGroup:groupBuilder.build];
}
+ (void)sendStressMessage:(TSOutgoingMessage *)message
{
OWSAssert(message);
@ -106,9 +463,20 @@ NS_ASSUME_NONNULL_BEGIN
{
OWSAssert(thread);
OWSAssert(block);
OWSDynamicOutgoingMessage *message = [[OWSDynamicOutgoingMessage alloc] initWithBlock:block inThread:thread];
OWSDynamicOutgoingMessage *message = [[OWSDynamicOutgoingMessage alloc] initWithBlock:block thread:thread];
[self sendStressMessage:message];
}
+ (void)sendStressMessage:(TSThread *)thread timestamp:(uint64_t)timestamp block:(DynamicOutgoingMessageBlock)block
{
OWSAssert(thread);
OWSAssert(block);
OWSDynamicOutgoingMessage *message =
[[OWSDynamicOutgoingMessage alloc] initWithBlock:block timestamp:timestamp thread:thread];
[self sendStressMessage:message];
}

2
Signal/src/ViewControllers/FingerprintViewController.m
Unescape Escape View File

@ -12,7 +12,7 @@
#import "UIFont+OWS.h"
#import "UIUtil.h"
#import "UIView+OWS.h"
#import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSError.h>
#import <SignalServiceKit/OWSFingerprint.h>
#import <SignalServiceKit/OWSFingerprintBuilder.h>

2
Signal/src/ViewControllers/HomeViewController.m
Unescape Escape View File

@ -7,7 +7,6 @@
#import "AppSettingsViewController.h"
#import "ConversationViewController.h"
#import "InboxTableViewCell.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NewContactThreadViewController.h"
#import "OWSContactsManager.h"
#import "OWSNavigationController.h"
@ -23,6 +22,7 @@
#import "VersionMigrations.h"
#import "ViewControllerUtils.h"
#import <PromiseKit/AnyPromise.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSBlockingManager.h>
#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
#import <SignalServiceKit/OWSMessageManager.h>

2
Signal/src/ViewControllers/NewGroupViewController.m
Unescape Escape View File

@ -18,7 +18,7 @@
#import "UIUtil.h"
#import "UIView+OWS.h"
#import "UIViewController+OWS.h"
#import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/SecurityUtils.h>
#import <SignalServiceKit/SignalAccount.h>

2
Signal/src/ViewControllers/OWSConversationSettingsViewController.m
Unescape Escape View File

@ -20,7 +20,7 @@
#import "UIView+OWS.h"
#import "UpdateGroupViewController.h"
#import <25519/Curve25519.h>
#import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSDisappearingConfigurationUpdateInfoMessage.h>
#import <SignalServiceKit/OWSDisappearingMessagesConfiguration.h>
#import <SignalServiceKit/OWSMessageSender.h>

2
Signal/src/ViewControllers/UpdateGroupViewController.m
Unescape Escape View File

@ -19,7 +19,7 @@
#import "UIView+OWS.h"
#import "UIViewController+OWS.h"
#import "ViewControllerUtils.h"
#import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/SecurityUtils.h>
#import <SignalServiceKit/SignalAccount.h>

2
Signal/src/network/PushManager.m
Unescape Escape View File

@ -8,7 +8,7 @@
#import "OWSContactsManager.h"
#import "Signal-Swift.h"
#import "ThreadUtil.h"
#import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSMessageReceiver.h>
#import <SignalServiceKit/OWSMessageSender.h>
#import <SignalServiceKit/OWSReadReceiptsProcessor.h>

2
Signal/src/util/ThreadUtil.m
Unescape Escape View File

@ -8,7 +8,7 @@
#import "OWSProfileManager.h"
#import "Signal-Swift.h"
#import "TSUnreadIndicatorInteraction.h"
#import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
#import <SignalServiceKit/NSDate+OWS.h>
#import <SignalServiceKit/OWSAddToContactsOfferMessage.h>
#import <SignalServiceKit/OWSAddToProfileWhitelistOfferMessage.h>
#import <SignalServiceKit/OWSBlockingManager.h>

2
SignalServiceKit/src/Devices/OWSDevice.m
Unescape Escape View File

@ -3,7 +3,7 @@
//
#import "OWSDevice.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "OWSError.h"
#import "YapDatabaseConnection.h"
#import "YapDatabaseTransaction.h"

6
SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m
Unescape Escape View File

@ -5,14 +5,14 @@
#import "OWSSyncContactsMessage.h"
#import "Contact.h"
#import "ContactsManagerProtocol.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "OWSContactsOutputStream.h"
#import "OWSSignalServiceProtos.pb.h"
#import "OWSIdentityManager.h"
#import "OWSSignalServiceProtos.pb.h"
#import "ProfileManagerProtocol.h"
#import "SignalAccount.h"
#import "TSAttachment.h"
#import "TSAttachmentStream.h"
#import "ProfileManagerProtocol.h"
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsMessage.m
Unescape Escape View File

@ -3,7 +3,7 @@
//
#import "OWSSyncGroupsMessage.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "OWSGroupsOutputStream.h"
#import "OWSSignalServiceProtos.pb.h"
#import "TSAttachment.h"

2
SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m
Unescape Escape View File

@ -3,7 +3,7 @@
//
#import "OWSSyncGroupsRequestMessage.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "OWSSignalServiceProtos.pb.h"
NS_ASSUME_NONNULL_BEGIN

7
SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m
Unescape Escape View File

@ -1,8 +1,9 @@
// Created by Michael Kirk on 9/25/16.
// Copyright © 2016 Open Whisper Systems. All rights reserved.
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import "OWSDisappearingMessagesConfigurationMessage.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "OWSDisappearingMessagesConfiguration.h"
#import "OWSSignalServiceProtos.pb.h"

5
SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.h
Unescape Escape View File

@ -13,7 +13,10 @@ typedef NSData *_Nonnull (^DynamicOutgoingMessageBlock)(SignalRecipient *);
@interface OWSDynamicOutgoingMessage : TSOutgoingMessage
- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block inThread:(nullable TSThread *)thread;
- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block thread:(nullable TSThread *)thread;
- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block
timestamp:(uint64_t)timestamp
thread:(nullable TSThread *)thread;
@end

13
SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m
Unescape Escape View File

@ -3,7 +3,7 @@
//
#import "OWSDynamicOutgoingMessage.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "OWSSignalServiceProtos.pb.h"
NS_ASSUME_NONNULL_BEGIN
@ -18,9 +18,16 @@ NS_ASSUME_NONNULL_BEGIN
@implementation OWSDynamicOutgoingMessage
- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block inThread:(nullable TSThread *)thread
- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block thread:(nullable TSThread *)thread
{
self = [super initWithTimestamp:[NSDate ows_millisecondTimeStamp] inThread:thread];
return [self initWithBlock:block timestamp:[NSDate ows_millisecondTimeStamp] thread:thread];
}
- (instancetype)initWithBlock:(DynamicOutgoingMessageBlock)block
timestamp:(uint64_t)timestamp
thread:(nullable TSThread *)thread
{
self = [super initWithTimestamp:timestamp inThread:thread];
if (self) {
_block = block;

2
SignalServiceKit/src/Messages/Interactions/TSErrorMessage.m
Unescape Escape View File

@ -4,7 +4,7 @@
#import "TSErrorMessage.h"
#import "ContactsManagerProtocol.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "OWSMessageManager.h"
#import "TSContactThread.h"
#import "TSErrorMessage_privateConstructor.h"

2
SignalServiceKit/src/Messages/Interactions/TSInfoMessage.m
Unescape Escape View File

@ -3,7 +3,7 @@
//
#import "TSInfoMessage.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import <YapDatabase/YapDatabaseConnection.h>
NS_ASSUME_NONNULL_BEGIN

2
SignalServiceKit/src/Messages/Interactions/TSInteraction.m
Unescape Escape View File

@ -3,7 +3,7 @@
//
#import "TSInteraction.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "TSDatabaseSecondaryIndexes.h"
#import "TSStorageManager+messageIDs.h"
#import "TSThread.h"

2
SignalServiceKit/src/Messages/Interactions/TSMessage.m
Unescape Escape View File

@ -3,7 +3,7 @@
//
#import "TSMessage.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "TSAttachment.h"
#import "TSAttachmentPointer.h"
#import "TSThread.h"

2
SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
Unescape Escape View File

@ -3,7 +3,7 @@
//
#import "TSOutgoingMessage.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "OWSOutgoingSyncMessage.h"
#import "OWSSignalServiceProtos.pb.h"
#import "ProfileManagerProtocol.h"

2
SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
Unescape Escape View File

@ -3,7 +3,7 @@
//
#import "OWSDisappearingMessagesFinder.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "TSMessage.h"
#import "TSOutgoingMessage.h"
#import "TSStorageManager.h"

1
SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m
Unescape Escape View File

@ -5,7 +5,6 @@
#import "OWSDisappearingMessagesJob.h"
#import "ContactsManagerProtocol.h"
#import "NSDate+OWS.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSTimer+OWS.h"
#import "OWSDisappearingConfigurationUpdateInfoMessage.h"
#import "OWSDisappearingMessagesConfiguration.h"

2
SignalServiceKit/src/Messages/OWSIdentityManager.m
Unescape Escape View File

@ -3,7 +3,7 @@
//
#import "OWSIdentityManager.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "NSNotificationCenter+OWS.h"
#import "NotificationsProtocol.h"
#import "OWSError.h"

2
SignalServiceKit/src/Messages/OWSMessageManager.m
Unescape Escape View File

@ -6,7 +6,7 @@
#import "ContactsManagerProtocol.h"
#import "Cryptography.h"
#import "MimeTypeUtil.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "NotificationsProtocol.h"
#import "OWSAttachmentsProcessor.h"
#import "OWSBlockingManager.h"

2
SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m
Unescape Escape View File

@ -3,7 +3,7 @@
//
#import "OWSOutgoingCallMessage.h"
#import "NSDate+millisecondTimeStamp.h"
#import "NSDate+OWS.h"
#import "OWSCallAnswerMessage.h"
#import "OWSCallBusyMessage.h"
#import "OWSCallHangupMessage.h"

4
SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m
Unescape Escape View File

@ -4,10 +4,10 @@
#import "OWSOutgoingNullMessage.h"
#import "Cryptography.h"
#import "NSDate+millisecondTimeStamp.h"
#import "TSContactThread.h"
#import "NSDate+OWS.h"
#import "OWSSignalServiceProtos.pb.h"
#import "OWSVerificationStateSyncMessage.h"
#import "TSContactThread.h"
NS_ASSUME_NONNULL_BEGIN

15
SignalServiceKit/src/Util/NSDate+OWS.h
Unescape Escape View File

@ -11,4 +11,19 @@ NS_ASSUME_NONNULL_BEGIN
#define kWeekInterval (7 * kDayInterval)
#define kMonthInterval (30 * kDayInterval)
#define kSecondInMs 1000
#define kMinuteInMs (kSecondInMs * 60)
#define kHourInMs (kMinuteInMs * 60)
#define kDayInMs (kHourInMs * 24)
#define kWeekInMs (kDayInMs * 7)
#define kMonthInMs (kDayInMs * 30)
@interface NSDate (millisecondTimeStamp)
+ (uint64_t)ows_millisecondTimeStamp;
+ (NSDate *)ows_dateWithMillisecondsSince1970:(uint64_t)milliseconds;
+ (uint64_t)ows_millisecondsSince1970ForDate:(NSDate *)date;
@end
NS_ASSUME_NONNULL_END

14
SignalServiceKit/src/Util/NSDate+millisecondTimeStamp.mm → SignalServiceKit/src/Util/NSDate+OWS.mm
Unescape Escape View File

@ -1,14 +1,16 @@
// Created by Frederic Jacobs on 25/11/14.
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import "NSDate+OWS.h"
#import <chrono>
#import "NSDate+millisecondTimeStamp.h"
@implementation NSDate (millisecondTimeStamp)
+ (uint64_t)ows_millisecondTimeStamp {
uint64_t milliseconds =
(uint64_t)(std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1));
+ (uint64_t)ows_millisecondTimeStamp
{
uint64_t milliseconds
= (uint64_t)(std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1));
return milliseconds;
}

11
SignalServiceKit/src/Util/NSDate+millisecondTimeStamp.h
Unescape Escape View File

@ -1,11 +0,0 @@
// Created by Frederic Jacobs on 25/11/14.
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
@interface NSDate (millisecondTimeStamp)
+ (uint64_t)ows_millisecondTimeStamp;
+ (NSDate *)ows_dateWithMillisecondsSince1970:(uint64_t)milliseconds;
+ (uint64_t)ows_millisecondsSince1970ForDate:(NSDate *)date;
@end
Write Preview
Loading…
Cancel
Save