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

Fixed a crash which could occur while processing message request notifications due to not using a DB transaction

This commit is contained in:
Morgan Pretty 2022-03-10 16:50:48 +11:00
parent b3d18b0135
commit c2e13f02bc
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Session/Notifications/AppNotifications.swift
View File

@ -175,7 +175,7 @@ public class NotificationPresenter: NSObject, NotificationsProtocol {
} }
else if thread.isMessageRequest() && CurrentAppContext().appUserDefaults()[.hasHiddenMessageRequests] { else if thread.isMessageRequest() && CurrentAppContext().appUserDefaults()[.hasHiddenMessageRequests] {
// If there are other interactions on this thread already then don't show the notification // If there are other interactions on this thread already then don't show the notification
if thread.numberOfInteractions() > 1 { return } if thread.numberOfInteractions(with: transaction) > 1 { return }
CurrentAppContext().appUserDefaults()[.hasHiddenMessageRequests] = false CurrentAppContext().appUserDefaults()[.hasHiddenMessageRequests] = false
} }

2
SessionMessagingKit/Threads/TSThread.h
View File

@ -67,6 +67,8 @@ BOOL IsNoteToSelfEnabled(void);
*/ */
- (NSUInteger)numberOfInteractions; - (NSUInteger)numberOfInteractions;
- (NSUInteger)numberOfInteractionsWithTransaction:(YapDatabaseReadTransaction *)transaction;
- (NSUInteger)unreadMessageCountWithTransaction:(YapDatabaseReadTransaction *)transaction - (NSUInteger)unreadMessageCountWithTransaction:(YapDatabaseReadTransaction *)transaction
NS_SWIFT_NAME(unreadMessageCount(transaction:)); NS_SWIFT_NAME(unreadMessageCount(transaction:));

9
SessionMessagingKit/Threads/TSThread.m
View File

@ -233,12 +233,17 @@ BOOL IsNoteToSelfEnabled(void)
{ {
__block NSUInteger count; __block NSUInteger count;
[[self dbReadConnection] readWithBlock:^(YapDatabaseReadTransaction *transaction) { [[self dbReadConnection] readWithBlock:^(YapDatabaseReadTransaction *transaction) {
YapDatabaseViewTransaction *interactionsByThread = [transaction ext:TSMessageDatabaseViewExtensionName]; count = [self numberOfInteractionsWithTransaction:transaction];
count = [interactionsByThread numberOfItemsInGroup:self.uniqueId];
}]; }];
return count; return count;
} }
- (NSUInteger)numberOfInteractionsWithTransaction:(YapDatabaseReadTransaction *)transaction
{
YapDatabaseViewTransaction *interactionsByThread = [transaction ext:TSMessageDatabaseViewExtensionName];
return [interactionsByThread numberOfItemsInGroup:self.uniqueId];
}
- (NSArray<id<OWSReadTracking>> *)unseenMessagesWithTransaction:(YapDatabaseReadTransaction *)transaction - (NSArray<id<OWSReadTracking>> *)unseenMessagesWithTransaction:(YapDatabaseReadTransaction *)transaction
{ {
NSMutableArray<id<OWSReadTracking>> *messages = [NSMutableArray new]; NSMutableArray<id<OWSReadTracking>> *messages = [NSMutableArray new];

2
SessionNotificationServiceExtension/NSENotificationPresenter.swift
View File

@ -22,7 +22,7 @@ public class NSENotificationPresenter: NSObject, NotificationsProtocol {
} }
else if thread.isMessageRequest() && CurrentAppContext().appUserDefaults()[.hasHiddenMessageRequests] { else if thread.isMessageRequest() && CurrentAppContext().appUserDefaults()[.hasHiddenMessageRequests] {
// If there are other interactions on this thread already then don't show the notification // If there are other interactions on this thread already then don't show the notification
if thread.numberOfInteractions() > 1 { return } if thread.numberOfInteractions(with: transaction) > 1 { return }
CurrentAppContext().appUserDefaults()[.hasHiddenMessageRequests] = false CurrentAppContext().appUserDefaults()[.hasHiddenMessageRequests] = false
} }