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

Respond to CR.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent df2ee6ba55
commit d28467aac6
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

42
Signal/src/util/ThreadUtil.m
Unescape Escape View File

@ -98,9 +98,9 @@ NS_ASSUME_NONNULL_BEGIN
[storageManager.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { [storageManager.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
const int kMaxBlockOfferOutgoingMessageCount = 10; const int kMaxBlockOfferOutgoingMessageCount = 10;
__block OWSAddToContactsOfferMessage *addToContactsOffer = nil; __block OWSAddToContactsOfferMessage *existingAddToContactsOffer = nil;
__block OWSUnknownContactBlockOfferMessage *blockOffer = nil; __block OWSUnknownContactBlockOfferMessage *existingBlockOffer = nil;
__block TSUnreadIndicatorInteraction *unreadIndicator = nil; __block TSUnreadIndicatorInteraction *existingUnreadIndicator = nil;
__block TSIncomingMessage *firstIncomingMessage = nil; __block TSIncomingMessage *firstIncomingMessage = nil;
__block TSOutgoingMessage *firstOutgoingMessage = nil; __block TSOutgoingMessage *firstOutgoingMessage = nil;
__block TSIncomingMessage *firstUnreadMessage = nil; __block TSIncomingMessage *firstUnreadMessage = nil;
@ -112,14 +112,14 @@ NS_ASSUME_NONNULL_BEGIN
NSString *collection, NSString *key, id object, id metadata, NSUInteger index, BOOL *stop) { NSString *collection, NSString *key, id object, id metadata, NSUInteger index, BOOL *stop) {
if ([object isKindOfClass:[OWSUnknownContactBlockOfferMessage class]]) { if ([object isKindOfClass:[OWSUnknownContactBlockOfferMessage class]]) {
OWSAssert(!blockOffer); OWSAssert(!existingBlockOffer);
blockOffer = (OWSUnknownContactBlockOfferMessage *)object; existingBlockOffer = (OWSUnknownContactBlockOfferMessage *)object;
} else if ([object isKindOfClass:[OWSAddToContactsOfferMessage class]]) { } else if ([object isKindOfClass:[OWSAddToContactsOfferMessage class]]) {
OWSAssert(!addToContactsOffer); OWSAssert(!existingAddToContactsOffer);
addToContactsOffer = (OWSAddToContactsOfferMessage *)object; existingAddToContactsOffer = (OWSAddToContactsOfferMessage *)object;
} else if ([object isKindOfClass:[TSUnreadIndicatorInteraction class]]) { } else if ([object isKindOfClass:[TSUnreadIndicatorInteraction class]]) {
OWSAssert(!unreadIndicator); OWSAssert(!existingUnreadIndicator);
unreadIndicator = (TSUnreadIndicatorInteraction *)object; existingUnreadIndicator = (TSUnreadIndicatorInteraction *)object;
} else if ([object isKindOfClass:[TSIncomingMessage class]]) { } else if ([object isKindOfClass:[TSIncomingMessage class]]) {
TSIncomingMessage *incomingMessage = (TSIncomingMessage *)object; TSIncomingMessage *incomingMessage = (TSIncomingMessage *)object;
if (!firstIncomingMessage) { if (!firstIncomingMessage) {
@ -213,9 +213,9 @@ NS_ASSUME_NONNULL_BEGIN
const int kAddToContactsOfferOffset = -2; const int kAddToContactsOfferOffset = -2;
const int kUnreadIndicatorOfferOffset = -1; const int kUnreadIndicatorOfferOffset = -1;
if (blockOffer && !shouldHaveBlockOffer) { if (existingBlockOffer && !shouldHaveBlockOffer) {
[blockOffer removeWithTransaction:transaction]; [existingBlockOffer removeWithTransaction:transaction];
} else if (!blockOffer && shouldHaveBlockOffer) { } else if (!existingBlockOffer && shouldHaveBlockOffer) {
DDLogInfo(@"Creating block offer for unknown contact"); DDLogInfo(@"Creating block offer for unknown contact");
// We want the block offer to be the first interaction in their // We want the block offer to be the first interaction in their
@ -231,9 +231,9 @@ NS_ASSUME_NONNULL_BEGIN
[offerMessage saveWithTransaction:transaction]; [offerMessage saveWithTransaction:transaction];
} }
if (addToContactsOffer && !shouldHaveAddToContactsOffer) { if (existingAddToContactsOffer && !shouldHaveAddToContactsOffer) {
[addToContactsOffer removeWithTransaction:transaction]; [existingAddToContactsOffer removeWithTransaction:transaction];
} else if (!addToContactsOffer && shouldHaveAddToContactsOffer) { } else if (!existingAddToContactsOffer && shouldHaveAddToContactsOffer) {
DDLogInfo(@"Creating 'add to contacts' offer for unknown contact"); DDLogInfo(@"Creating 'add to contacts' offer for unknown contact");
@ -252,8 +252,8 @@ NS_ASSUME_NONNULL_BEGIN
BOOL shouldHaveUnreadIndicator BOOL shouldHaveUnreadIndicator
= ((firstUnreadMessage != nil || fixedUnreadIndicatorTimestamp != nil) && !hideUnreadMessagesIndicator); = ((firstUnreadMessage != nil || fixedUnreadIndicatorTimestamp != nil) && !hideUnreadMessagesIndicator);
if (!shouldHaveUnreadIndicator) { if (!shouldHaveUnreadIndicator) {
if (unreadIndicator) { if (existingUnreadIndicator) {
[unreadIndicator removeWithTransaction:transaction]; [existingUnreadIndicator removeWithTransaction:transaction];
} }
} else { } else {
// We want the block offer to appear just before the first unread incoming // We want the block offer to appear just before the first unread incoming
@ -264,13 +264,13 @@ NS_ASSUME_NONNULL_BEGIN
? [fixedUnreadIndicatorTimestamp longLongValue] ? [fixedUnreadIndicatorTimestamp longLongValue]
: ((long long)firstUnreadMessage.timestamp + kUnreadIndicatorOfferOffset)); : ((long long)firstUnreadMessage.timestamp + kUnreadIndicatorOfferOffset));
if (indicatorTimestamp && unreadIndicator.timestamp == indicatorTimestamp) { if (indicatorTimestamp && existingUnreadIndicator.timestamp == indicatorTimestamp) {
// Keep the existing indicator; it is in the correct position. // Keep the existing indicator; it is in the correct position.
result.unreadIndicator = unreadIndicator; result.unreadIndicator = existingUnreadIndicator;
} else { } else {
if (unreadIndicator) { if (existingUnreadIndicator) {
[unreadIndicator removeWithTransaction:transaction]; [existingUnreadIndicator removeWithTransaction:transaction];
} }
DDLogInfo(@"%@ Creating TSUnreadIndicatorInteraction", self.tag); DDLogInfo(@"%@ Creating TSUnreadIndicatorInteraction", self.tag);

Write Preview
Loading…
Cancel
Save