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

Closes #270 #271 #273

Browse Source
pull/1/head
Frederic Jacobs 10 years ago
parent f3f3eb55cc
commit bf8f2bb263
5 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
Signal/src/environment/PreferencesUtil.m
Unescape Escape View File

@ -135,7 +135,7 @@
if (preference) { if (preference) {
return [preference unsignedIntegerValue]; return [preference unsignedIntegerValue];
} else { } else {
return TSImageQualityUncropped; return TSImageQualityMedium;
} }
} }

2
Signal/src/textsecure/Messages/TSMessage.h
Unescape Escape View File

@ -23,7 +23,7 @@ typedef NS_ENUM(NSInteger, TSGroupMetaMessage){
@interface TSMessage : TSInteraction @interface TSMessage : TSInteraction
@property (nonatomic, readonly) NSMutableArray *attachments; @property (nonatomic, readonly) NSMutableArray *attachments;
@property (nonatomic, readonly) NSString *body; @property (nonatomic) NSString *body;
@property (nonatomic) TSGroupMetaMessage groupMetaMessage; @property (nonatomic) TSGroupMetaMessage groupMetaMessage;
- (instancetype)initWithTimestamp:(uint64_t)timestamp - (instancetype)initWithTimestamp:(uint64_t)timestamp

1
Signal/src/textsecure/Messages/TSMessagesManager+attachments.h
Unescape Escape View File

@ -12,7 +12,6 @@
@interface TSMessagesManager (attachments) @interface TSMessagesManager (attachments)
- (void)handleReceivedMediaMessage:(IncomingPushMessageSignal*)message withContent:(PushMessageContent*)content; - (void)handleReceivedMediaMessage:(IncomingPushMessageSignal*)message withContent:(PushMessageContent*)content;
- (void)retrieveAttachment:(TSAttachment*)attachment;
- (void)sendAttachment:(NSData*)attachmentData contentType:(NSString*)contentType inMessage:(TSOutgoingMessage*)outgoingMessage thread:(TSThread*)thread; - (void)sendAttachment:(NSData*)attachmentData contentType:(NSString*)contentType inMessage:(TSOutgoingMessage*)outgoingMessage thread:(TSThread*)thread;
@end @end

34
Signal/src/textsecure/Messages/TSMessagesManager+attachments.m
Unescape Escape View File

@ -52,7 +52,7 @@ dispatch_queue_t attachmentsQueue() {
[attachmentPointer saveWithTransaction:transaction]; [attachmentPointer saveWithTransaction:transaction];
dispatch_async(attachmentsQueue(), ^{ dispatch_async(attachmentsQueue(), ^{
[self retrieveAttachment:attachmentPointer]; [self retrieveAttachment:attachmentPointer messageId:[TSInteraction stringFromTimeStamp:message.timestamp]];
}); });
[retrievedAttachments addObject:attachmentPointer.uniqueId]; [retrievedAttachments addObject:attachmentPointer.uniqueId];
@ -93,6 +93,7 @@ dispatch_queue_t attachmentsQueue() {
[result.pointer saveWithTransaction:transaction]; [result.pointer saveWithTransaction:transaction];
}]; }];
outgoingMessage.body = nil;
[outgoingMessage.attachments addObject:attachementId]; [outgoingMessage.attachments addObject:attachementId];
[self sendMessage:outgoingMessage inThread:thread]; [self sendMessage:outgoingMessage inThread:thread];
@ -113,28 +114,27 @@ dispatch_queue_t attachmentsQueue() {
[self sendAttachment:attachmentData contentType:contentType inMessage:message thread:thread]; [self sendAttachment:attachmentData contentType:contentType inMessage:message thread:thread];
} }
- (void)retrieveAttachment:(TSAttachmentPointer*)attachment { - (void)retrieveAttachment:(TSAttachmentPointer*)attachment messageId:(NSString*)messageId {
TSAttachmentRequest *attachmentRequest = [[TSAttachmentRequest alloc] initWithId:[attachment identifier] TSAttachmentRequest *attachmentRequest = [[TSAttachmentRequest alloc] initWithId:[attachment identifier]
relay:attachment.relay]; relay:attachment.relay];
[[TSNetworkManager sharedManager] queueAuthenticatedRequest:attachmentRequest success:^(NSURLSessionDataTask *task, id responseObject) { [[TSNetworkManager sharedManager] queueAuthenticatedRequest:attachmentRequest success:^(NSURLSessionDataTask *task, id responseObject) {
if ([responseObject isKindOfClass:[NSDictionary class]]) { if ([responseObject isKindOfClass:[NSDictionary class]]) {
NSString *location = [(NSDictionary*)responseObject objectForKey:@"location"]; dispatch_async(attachmentsQueue(), ^{
NSData *data = [self downloadFromLocation:location]; NSString *location = [(NSDictionary*)responseObject objectForKey:@"location"];
if (data) { NSData *data = [self downloadFromLocation:location];
dispatch_async(attachmentsQueue(), ^{ if (data) {
[self decryptedAndSaveAttachment:attachment data:data]; [self decryptedAndSaveAttachment:attachment data:data messageId:messageId];
}); }
} });
} }
} failure:^(NSURLSessionDataTask *task, NSError *error) { } failure:^(NSURLSessionDataTask *task, NSError *error) {
DDLogError(@"Failed task %@ error: %@", task.description, error.description); DDLogError(@"Failed task %@ error: %@", task.description, error.description);
}]; }];
} }
- (void)decryptedAndSaveAttachment:(TSAttachmentPointer*)attachment data:(NSData*)cipherText { - (void)decryptedAndSaveAttachment:(TSAttachmentPointer*)attachment data:(NSData*)cipherText messageId:(NSString*)messageId {
NSData *plaintext = [Cryptography decryptAttachment:cipherText withKey:attachment.encryptionKey]; NSData *plaintext = [Cryptography decryptAttachment:cipherText withKey:attachment.encryptionKey];
if (!plaintext) { if (!plaintext) {
@ -145,12 +145,16 @@ dispatch_queue_t attachmentsQueue() {
contentType:attachment.contentType]; contentType:attachment.contentType];
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[stream saveWithTransaction:transaction]; [stream saveWithTransaction:transaction];
if([attachment.avatarOfGroupId length]!=0) { if([attachment.avatarOfGroupId length]!=0) {
GroupModel *emptyModelToFillOutId = [[GroupModel alloc] initWithTitle:nil memberIds:nil image:nil groupId:attachment.avatarOfGroupId]; // TODO refactor the TSGroupThread to just take in an ID (as it is all that it uses). Should not take in more than it uses GroupModel *emptyModelToFillOutId = [[GroupModel alloc] initWithTitle:nil memberIds:nil image:nil groupId:attachment.avatarOfGroupId]; // TODO refactor the TSGroupThread to just take in an ID (as it is all that it uses). Should not take in more than it uses
TSGroupThread* gThread = [TSGroupThread getOrCreateThreadWithGroupModel:emptyModelToFillOutId transaction:transaction]; TSGroupThread* gThread = [TSGroupThread getOrCreateThreadWithGroupModel:emptyModelToFillOutId transaction:transaction];
gThread.groupModel.groupImage=[stream image]; gThread.groupModel.groupImage=[stream image];
[gThread saveWithTransaction:transaction]; [gThread saveWithTransaction:transaction];
} else {
// Causing message to be reloaded in view.
TSMessage *message = [TSMessage fetchObjectWithUniqueID:messageId transaction:transaction];
[message saveWithTransaction:transaction];
} }
}]; }];
} }
@ -160,12 +164,13 @@ dispatch_queue_t attachmentsQueue() {
__block NSData *data; __block NSData *data;
AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager]; AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager];
manager.completionQueue = attachmentsQueue();
manager.requestSerializer = [AFHTTPRequestSerializer serializer]; manager.requestSerializer = [AFHTTPRequestSerializer serializer];
[manager.requestSerializer setValue:@"application/octet-stream" forHTTPHeaderField:@"Content-Type"]; [manager.requestSerializer setValue:@"application/octet-stream" forHTTPHeaderField:@"Content-Type"];
manager.responseSerializer = [AFHTTPResponseSerializer serializer]; manager.responseSerializer = [AFHTTPResponseSerializer serializer];
manager.completionQueue = dispatch_get_main_queue();
dispatch_semaphore_t sema = dispatch_semaphore_create(0); dispatch_semaphore_t sema = dispatch_semaphore_create(0);
[manager GET:location parameters:nil success:^(AFHTTPRequestOperation *operation, id responseObject) { [manager GET:location parameters:nil success:^(AFHTTPRequestOperation *operation, id responseObject) {
data = responseObject; data = responseObject;
dispatch_semaphore_signal(sema); dispatch_semaphore_signal(sema);
@ -173,6 +178,7 @@ dispatch_queue_t attachmentsQueue() {
DDLogError(@"Failed to retreive attachment with error: %@", error.description); DDLogError(@"Failed to retreive attachment with error: %@", error.description);
dispatch_semaphore_signal(sema); dispatch_semaphore_signal(sema);
}]; }];
dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER); dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
return data; return data;

7
Signal/src/view controllers/MessagesViewController.m
Unescape Escape View File

@ -913,7 +913,7 @@ typedef enum : NSUInteger {
forNotifications:notifications forNotifications:notifications
withMappings:self.messageMappings]; withMappings:self.messageMappings];
__block BOOL containsInsertion = NO; __block BOOL scrollToBottom = NO;
if (!messageRowChanges) { if (!messageRowChanges) {
return; return;
@ -937,7 +937,7 @@ typedef enum : NSUInteger {
TSInteraction * interaction = [self interactionAtIndexPath:rowChange.newIndexPath]; TSInteraction * interaction = [self interactionAtIndexPath:rowChange.newIndexPath];
[[TSAdapterCacheManager sharedManager] cacheAdapter:[TSMessageAdapter messageViewDataWithInteraction:interaction inThread:self.thread] forInteractionId:interaction.uniqueId]; [[TSAdapterCacheManager sharedManager] cacheAdapter:[TSMessageAdapter messageViewDataWithInteraction:interaction inThread:self.thread] forInteractionId:interaction.uniqueId];
[self.collectionView insertItemsAtIndexPaths:@[ rowChange.newIndexPath ]]; [self.collectionView insertItemsAtIndexPaths:@[ rowChange.newIndexPath ]];
containsInsertion = YES; scrollToBottom = YES;
break; break;
} }
case YapDatabaseViewChangeMove : case YapDatabaseViewChangeMove :
@ -960,6 +960,7 @@ typedef enum : NSUInteger {
} }
[self.collectionView reloadItemsAtIndexPaths:rowsToUpdate]; [self.collectionView reloadItemsAtIndexPaths:rowsToUpdate];
scrollToBottom = YES;
break; break;
} }
} }
@ -969,7 +970,7 @@ typedef enum : NSUInteger {
[self.collectionView.collectionViewLayout invalidateLayoutWithContext:[JSQMessagesCollectionViewFlowLayoutInvalidationContext context]]; [self.collectionView.collectionViewLayout invalidateLayoutWithContext:[JSQMessagesCollectionViewFlowLayoutInvalidationContext context]];
[self.collectionView reloadData]; [self.collectionView reloadData];
} }
if (containsInsertion) { if (scrollToBottom) {
[self scrollToBottomAnimated:YES]; [self scrollToBottomAnimated:YES];
} }
}]; }];

Write Preview
Loading…
Cancel
Save