4ba1e86ec1
Motivation
----------
We were often swallowing errors or yielding generic errors when it would
be better to provide specific errors.
We also didn't create an attachment when attachments failed to send,
making it impossible to show the user what was happening with an
in-progress or failed attachment.
Primary Changes
---------------
- Funnel all message sending through MessageSender, and remove message sending
from MessagesManager.
- Record most recent sending error so we can expose it in the UI
- Can resend attachments.
- Update message status for attachments, just like text messages
- Extracted UploadingService from MessagesManager
- Saving attachment stream before uploading gives uniform API for send vs.
resend
- update status for downloading transcript attachments
- TSAttachments have a local id, separate from the server allocated id
This allows us to save the attachment before the allocation request. Which is
is good because:
1. can show feedback to user faster.
2. allows us to show an error when allocation fails.
Code Cleanup
------------
- Replaced a lot of global singleton access with injected dependencies to make
for easier testing.
- Never save group meta messages. Rather than checking before (hopefully) every
save, do it in the save method.
- Don't use callbacks for sync code.
- Handle errors on writing attachment data
- Fix old long broken tests that weren't even running. =(
- Removed dead code
- Use constants vs define
- Port flaky travis fixes from Signal-iOS
// FREEBIE
133 lines
4.9 KiB
Objective-C
133 lines
4.9 KiB
Objective-C
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
|
|
|
#import "NSDate+millisecondTimeStamp.h"
|
|
#import "TSAttachmentStream.h"
|
|
#import "TSMessage.h"
|
|
#import "TSThread.h"
|
|
|
|
#import <XCTest/XCTest.h>
|
|
|
|
NS_ASSUME_NONNULL_BEGIN
|
|
|
|
@interface TSMessageTest : XCTestCase
|
|
|
|
@property TSThread *thread;
|
|
|
|
@end
|
|
|
|
@implementation TSMessageTest
|
|
|
|
- (void)setUp {
|
|
[super setUp];
|
|
self.thread = [[TSThread alloc] init];
|
|
}
|
|
|
|
- (void)tearDown {
|
|
// Put teardown code here. This method is called after the invocation of each test method in the class.
|
|
[super tearDown];
|
|
}
|
|
|
|
- (void)testExpiresAtWithoutStartedTimer
|
|
{
|
|
TSMessage *message = [[TSMessage alloc] initWithTimestamp:1
|
|
inThread:self.thread
|
|
messageBody:@"foo"
|
|
attachmentIds:@[]
|
|
expiresInSeconds:100];
|
|
XCTAssertEqual(0, message.expiresAt);
|
|
}
|
|
|
|
- (void)testExpiresAtWithStartedTimer
|
|
{
|
|
uint64_t now = [NSDate ows_millisecondTimeStamp];
|
|
TSMessage *message = [[TSMessage alloc] initWithTimestamp:1
|
|
inThread:self.thread
|
|
messageBody:@"foo"
|
|
attachmentIds:@[]
|
|
expiresInSeconds:10
|
|
expireStartedAt:now];
|
|
XCTAssertEqual(now + 10000, message.expiresAt);
|
|
}
|
|
|
|
- (void)testDescription
|
|
{
|
|
TSMessage *message = [[TSMessage alloc] initWithTimestamp:1 inThread:self.thread messageBody:@"My message body"];
|
|
XCTAssertEqualObjects(@"My message body", [message description]);
|
|
}
|
|
|
|
- (void)testDescriptionWithBogusAttachmentId
|
|
{
|
|
TSMessage *message = [[TSMessage alloc] initWithTimestamp:1
|
|
inThread:self.thread
|
|
messageBody:@"My message body"
|
|
attachmentIds:@[ @"fake-attachment-id" ]];
|
|
NSString *actualDescription = [message description];
|
|
XCTAssertEqualObjects(@"UNKNOWN_ATTACHMENT_LABEL", actualDescription);
|
|
}
|
|
|
|
- (void)testDescriptionWithEmptyAttachments
|
|
{
|
|
TSMessage *message =
|
|
[[TSMessage alloc] initWithTimestamp:1 inThread:self.thread messageBody:@"My message body" attachmentIds:@[]];
|
|
NSString *actualDescription = [message description];
|
|
XCTAssertEqualObjects(@"My message body", actualDescription);
|
|
}
|
|
|
|
- (void)testDescriptionWithPhotoAttachmentId
|
|
{
|
|
TSAttachment *attachment = [[TSAttachmentStream alloc] initWithContentType:@"image/jpeg"];
|
|
[attachment save];
|
|
|
|
TSMessage *message = [[TSMessage alloc] initWithTimestamp:1
|
|
inThread:self.thread
|
|
messageBody:@"My message body"
|
|
attachmentIds:@[ attachment.uniqueId ]];
|
|
NSString *actualDescription = [message description];
|
|
XCTAssertEqualObjects(@"📷 ATTACHMENT", actualDescription);
|
|
}
|
|
|
|
|
|
- (void)testDescriptionWithVideoAttachmentId
|
|
{
|
|
TSAttachment *attachment = [[TSAttachmentStream alloc] initWithContentType:@"video/mp4"];
|
|
[attachment save];
|
|
|
|
TSMessage *message = [[TSMessage alloc] initWithTimestamp:1
|
|
inThread:self.thread
|
|
messageBody:@"My message body"
|
|
attachmentIds:@[ attachment.uniqueId ]];
|
|
NSString *actualDescription = [message description];
|
|
XCTAssertEqualObjects(@"📽 ATTACHMENT", actualDescription);
|
|
}
|
|
|
|
|
|
- (void)testDescriptionWithAudioAttachmentId
|
|
{
|
|
TSAttachment *attachment = [[TSAttachmentStream alloc] initWithContentType:@"audio/mp3"];
|
|
[attachment save];
|
|
|
|
TSMessage *message = [[TSMessage alloc] initWithTimestamp:1
|
|
inThread:self.thread
|
|
messageBody:@"My message body"
|
|
attachmentIds:@[ attachment.uniqueId ]];
|
|
NSString *actualDescription = [message description];
|
|
XCTAssertEqualObjects(@"📻 ATTACHMENT", actualDescription);
|
|
}
|
|
|
|
- (void)testDescriptionWithUnkownAudioContentType
|
|
{
|
|
TSAttachment *attachment = [[TSAttachmentStream alloc] initWithContentType:@"non/sense"];
|
|
[attachment save];
|
|
|
|
TSMessage *message = [[TSMessage alloc] initWithTimestamp:1
|
|
inThread:self.thread
|
|
messageBody:@"My message body"
|
|
attachmentIds:@[ attachment.uniqueId ]];
|
|
NSString *actualDescription = [message description];
|
|
XCTAssertEqualObjects(@"ATTACHMENT", actualDescription);
|
|
}
|
|
|
|
@end
|
|
|
|
NS_ASSUME_NONNULL_END
|