oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/failedAttachmentDownloads'

Browse source
This commit is contained in:
Matthew Chen 2017-03-29 12:41:47 -04:00
parent 5250d327e4 32d856ff2d
commit 00e88fefb0
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Podfile.lock
View file

@ -131,7 +131,7 @@ CHECKOUT OPTIONS:
:commit: 23a5d1b67afc4dd028198202e25fd2e06ce396d7
:git: https://github.com/WhisperSystems/SignalProtocolKit.git
SignalServiceKit:
:commit: fbd3859a850fc7cd187ffabef9108f88f787a832
:commit: 7bbbd2fb9da67eafe5309a8e6348ea5680ce5404
:git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket:
:commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf

2
Signal/src/AppDelegate.m
View file

@ -25,6 +25,7 @@
#import <AxolotlKit/SessionCipher.h>
#import <PromiseKit/AnyPromise.h>
#import <SignalServiceKit/OWSDisappearingMessagesJob.h>
#import <SignalServiceKit/OWSFailedAttachmentDownloadsJob.h>
#import <SignalServiceKit/OWSFailedMessagesJob.h>
#import <SignalServiceKit/OWSIncomingMessageReadObserver.h>
#import <SignalServiceKit/OWSMessageSender.h>
@ -176,6 +177,7 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
// Mark all "attempting out" messages as "unsent", i.e. any messages that were not successfully
// sent before the app exited should be marked as failures.
[[[OWSFailedMessagesJob alloc] initWithStorageManager:[TSStorageManager sharedManager]] run];
[[[OWSFailedAttachmentDownloadsJob alloc] initWithStorageManager:[TSStorageManager sharedManager]] run];
[AppStoreRating setupRatingLibrary];
}];

16
Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
View file

@ -155,12 +155,16 @@
TSAttachmentPointer *pointer = (TSAttachmentPointer *)attachment;
adapter.messageType = TSInfoMessageAdapter;
if (pointer.isDownloading) {
adapter.messageBody = NSLocalizedString(@"ATTACHMENT_DOWNLOADING", nil);
} else if (pointer.hasFailed) {
adapter.messageBody = NSLocalizedString(@"ATTACHMENT_DOWNLOAD_FAILED", nil);
} else {
adapter.messageBody = NSLocalizedString(@"ATTACHMENT_QUEUED", nil);
switch (pointer.state) {
case TSAttachmentPointerStateEnqueued:
adapter.messageBody = NSLocalizedString(@"ATTACHMENT_QUEUED", nil);
break;
case TSAttachmentPointerStateDownloading:
adapter.messageBody = NSLocalizedString(@"ATTACHMENT_DOWNLOADING", nil);
break;
case TSAttachmentPointerStateFailed:
adapter.messageBody = NSLocalizedString(@"ATTACHMENT_DOWNLOAD_FAILED", nil);
break;
}
} else {
DDLogError(@"We retrieved an attachment that doesn't have a known type : %@",

2
Signal/src/view controllers/MessagesViewController.m
View file

@ -1586,7 +1586,7 @@ typedef enum : NSUInteger {
// FIXME possible for pointer to get stuck in isDownloading state if app is closed while downloading.
// see: https://github.com/WhisperSystems/Signal-iOS/issues/1254
if (!pointer.isDownloading) {
if (pointer.state != TSAttachmentPointerStateDownloading) {
OWSAttachmentsProcessor *processor =
[[OWSAttachmentsProcessor alloc] initWithAttachmentPointer:pointer
networkManager:self.networkManager];