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

Fix "unknown attachment" notifications

Browse source 
The transaction in which the attachments were created hasn't been
committed yet.

// FREEBIE
This commit is contained in:
Michael Kirk 2017-09-29 15:49:03 -04:00
parent 9d5874025e
commit a2421d5b3e
5 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Signal/src/environment/NotificationsManager.m
View file

@ -251,11 +251,15 @@ NSString *const kNotificationsManagerNewMesssageSoundName = @"NewMessage.aifc";
- (void)notifyUserForIncomingMessage:(TSIncomingMessage *)message
inThread:(TSThread *)thread
contactsManager:(id<ContactsManagerProtocol>)contactsManager
transaction:(YapDatabaseReadTransaction *)transaction
{
OWSAssert(message);
OWSAssert(thread);
OWSAssert(contactsManager);
// While batch processing, some of the necessary changes have not been commited.
NSString *messageDescription = [message previewTextWithTransaction:transaction];
dispatch_async(dispatch_get_main_queue(), ^{
if (thread.isMuted) {
return;
@ -263,7 +267,6 @@ NSString *const kNotificationsManagerNewMesssageSoundName = @"NewMessage.aifc";
BOOL shouldPlaySound = [self shouldPlaySoundForNotification];
NSString *messageDescription = message.description;
NSString *senderName = [contactsManager displayNameForPhoneIdentifier:message.authorId];
NSString *groupName = [thread.name stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
if (groupName.length < 1) {

1
SignalServiceKit/src/Messages/Interactions/TSMessage.h
View file

@ -51,6 +51,7 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER;
- (BOOL)hasAttachments;
- (NSString *)previewTextWithTransaction:(YapDatabaseReadTransaction *)transaction;
@end

16
SignalServiceKit/src/Messages/Interactions/TSMessage.m
View file

@ -199,6 +199,22 @@ static const NSUInteger OWSMessageSchemaVersion = 3;
}
}
- (NSString *)previewTextWithTransaction:(YapDatabaseReadTransaction *)transaction
{
if ([self hasAttachments]) {
NSString *attachmentId = self.attachmentIds[0];
TSAttachment *attachment = [TSAttachment fetchObjectWithUniqueID:attachmentId transaction:transaction];
if (attachment) {
return attachment.description;
} else {
return NSLocalizedString(@"UNKNOWN_ATTACHMENT_LABEL", @"In Inbox view, last message label for thread with corrupted attachment.");
}
} else {
return self.body;
}
}
// TODO deprecate this and implement something like previewTextWithTransaction: for all TSInteractions
- (NSString *)description
{
if ([self hasAttachments]) {

3
SignalServiceKit/src/Messages/OWSMessageManager.m
View file

@ -948,7 +948,8 @@ NS_ASSUME_NONNULL_BEGIN
[[TextSecureKitEnv sharedEnv].notificationsManager notifyUserForIncomingMessage:incomingMessage
inThread:thread
contactsManager:self.contactsManager];
contactsManager:self.contactsManager
transaction:transaction];
}
return incomingMessage;

4
SignalServiceKit/src/Protocols/NotificationsProtocol.h
View file

@ -5,13 +5,15 @@
@class TSErrorMessage;
@class TSIncomingMessage;
@class TSThread;
@class YapDatabaseReadTransaction;
@protocol ContactsManagerProtocol;
@protocol NotificationsProtocol <NSObject>
- (void)notifyUserForIncomingMessage:(TSIncomingMessage *)incomingMessage
inThread:(TSThread *)thread
contactsManager:(id<ContactsManagerProtocol>)contactsManager;
contactsManager:(id<ContactsManagerProtocol>)contactsManager
transaction:(YapDatabaseReadTransaction *)transaction;
- (void)notifyUserForErrorMessage:(TSErrorMessage *)error inThread:(TSThread *)thread;