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
138 lines
5.8 KiB
Objective-C
138 lines
5.8 KiB
Objective-C
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
|
|
|
#import "OWSOrphanedDataCleaner.h"
|
|
#import "TSAttachmentStream.h"
|
|
#import "TSContactThread.h"
|
|
#import "TSIncomingMessage.h"
|
|
#import "TSStorageManager.h"
|
|
#import <XCTest/XCTest.h>
|
|
|
|
@interface OWSOrphanedDataCleanerTest : XCTestCase
|
|
|
|
@end
|
|
|
|
@implementation OWSOrphanedDataCleanerTest
|
|
|
|
- (void)setUp
|
|
{
|
|
[super setUp];
|
|
// Register views, etc.
|
|
[[TSStorageManager sharedManager] setupDatabase];
|
|
|
|
// Set up initial conditions & Sanity check
|
|
[TSAttachmentStream deleteAttachments];
|
|
XCTAssertEqual(0, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);
|
|
[TSAttachmentStream removeAllObjectsInCollection];
|
|
XCTAssertEqual(0, [TSAttachmentStream numberOfKeysInCollection]);
|
|
[TSIncomingMessage removeAllObjectsInCollection];
|
|
XCTAssertEqual(0, [TSIncomingMessage numberOfKeysInCollection]);
|
|
[TSThread removeAllObjectsInCollection];
|
|
XCTAssertEqual(0, [TSThread numberOfKeysInCollection]);
|
|
}
|
|
|
|
- (void)tearDown
|
|
{
|
|
[super tearDown];
|
|
}
|
|
|
|
- (void)testInteractionsWithoutThreadAreDeleted
|
|
{
|
|
// This thread is intentionally not saved. It's meant to recreate a situation we've seen where interactions exist
|
|
// that reference the id of a thread that no longer exists. Presumably this is the result of a deleted thread not
|
|
// properly deleting it's interactions.
|
|
TSContactThread *unsavedThread = [[TSContactThread alloc] initWithUniqueId:@"this-thread-does-not-exist"];
|
|
|
|
TSIncomingMessage *incomingMessage = [[TSIncomingMessage alloc] initWithTimestamp:1
|
|
inThread:unsavedThread
|
|
authorId:@"fake-author-id"
|
|
messageBody:@"footch"];
|
|
[incomingMessage save];
|
|
XCTAssertEqual(1, [TSIncomingMessage numberOfKeysInCollection]);
|
|
|
|
[[OWSOrphanedDataCleaner new] removeOrphanedData];
|
|
XCTAssertEqual(0, [TSIncomingMessage numberOfKeysInCollection]);
|
|
}
|
|
|
|
- (void)testInteractionsWithThreadAreNotDeleted
|
|
{
|
|
TSContactThread *savedThread = [[TSContactThread alloc] initWithUniqueId:@"this-thread-exists"];
|
|
[savedThread save];
|
|
|
|
TSIncomingMessage *incomingMessage = [[TSIncomingMessage alloc] initWithTimestamp:1
|
|
inThread:savedThread
|
|
authorId:@"fake-author-id"
|
|
messageBody:@"footch"];
|
|
[incomingMessage save];
|
|
XCTAssertEqual(1, [TSIncomingMessage numberOfKeysInCollection]);
|
|
|
|
[[OWSOrphanedDataCleaner new] removeOrphanedData];
|
|
XCTAssertEqual(1, [TSIncomingMessage numberOfKeysInCollection]);
|
|
}
|
|
|
|
- (void)testFilesWithoutInteractionsAreDeleted
|
|
{
|
|
NSError *error;
|
|
TSAttachmentStream *attachmentStream = [[TSAttachmentStream alloc] initWithContentType:@"image/jpeg"];
|
|
[attachmentStream writeData:[NSData new] error:&error];
|
|
[attachmentStream save];
|
|
NSString *orphanedFilePath = [attachmentStream filePath];
|
|
BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:orphanedFilePath];
|
|
XCTAssert(fileExists);
|
|
XCTAssertEqual(1, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);
|
|
|
|
[[OWSOrphanedDataCleaner new] removeOrphanedData];
|
|
fileExists = [[NSFileManager defaultManager] fileExistsAtPath:orphanedFilePath];
|
|
XCTAssertFalse(fileExists);
|
|
XCTAssertEqual(0, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);
|
|
}
|
|
|
|
- (void)testFilesWithInteractionsAreNotDeleted
|
|
{
|
|
TSContactThread *savedThread = [[TSContactThread alloc] initWithUniqueId:@"this-thread-exists"];
|
|
[savedThread save];
|
|
|
|
NSError *error;
|
|
TSAttachmentStream *attachmentStream = [[TSAttachmentStream alloc] initWithContentType:@"image/jpeg"];
|
|
[attachmentStream writeData:[NSData new] error:&error];
|
|
[attachmentStream save];
|
|
|
|
TSIncomingMessage *incomingMessage = [[TSIncomingMessage alloc] initWithTimestamp:1
|
|
inThread:savedThread
|
|
authorId:@"fake-author-id"
|
|
messageBody:@"footch"
|
|
attachmentIds:@[ attachmentStream.uniqueId ]];
|
|
[incomingMessage save];
|
|
|
|
NSString *attachmentFilePath = [attachmentStream filePath];
|
|
BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:attachmentFilePath];
|
|
XCTAssert(fileExists);
|
|
XCTAssertEqual(1, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);
|
|
|
|
[[OWSOrphanedDataCleaner new] removeOrphanedData];
|
|
|
|
fileExists = [[NSFileManager defaultManager] fileExistsAtPath:attachmentFilePath];
|
|
XCTAssert(fileExists);
|
|
XCTAssertEqual(1, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);
|
|
}
|
|
|
|
- (void)testFilesWithoutAttachmentStreamsAreDeleted
|
|
{
|
|
NSError *error;
|
|
TSAttachmentStream *attachmentStream = [[TSAttachmentStream alloc] initWithContentType:@"image/jpeg"];
|
|
[attachmentStream writeData:[NSData new] error:&error];
|
|
// Intentionally not saved, because we want a lingering file.
|
|
|
|
|
|
NSString *orphanedFilePath = [attachmentStream filePath];
|
|
BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:orphanedFilePath];
|
|
XCTAssert(fileExists);
|
|
XCTAssertEqual(1, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);
|
|
|
|
[[OWSOrphanedDataCleaner new] removeOrphanedData];
|
|
fileExists = [[NSFileManager defaultManager] fileExistsAtPath:orphanedFilePath];
|
|
XCTAssertFalse(fileExists);
|
|
XCTAssertEqual(0, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);
|
|
}
|
|
|
|
@end
|