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

Clean up ahead of CR. 

// FREEBIE
This commit is contained in:
Matthew Chen 2017-08-18 15:22:27 -04:00
parent 4578a72ab2
commit a340c9ebdc
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/src/ViewControllers/ConversationView/MessagesViewController.m
View File

@ -2193,7 +2193,7 @@ typedef enum : NSUInteger {
OWSFail(@"Unexpected tap for system message."); OWSFail(@"Unexpected tap for system message.");
break; break;
case OWSContactOffersAdapter: case OWSContactOffersAdapter:
// TODO: OWSFail(@"Unexpected tap for contacts offer.");
break; break;
default: default:
DDLogDebug(@"Unhandled bubble touch for interaction: %@.", interaction); DDLogDebug(@"Unhandled bubble touch for interaction: %@.", interaction);

18
Signal/src/util/ThreadUtil.m
View File

@ -236,23 +236,6 @@ NS_ASSUME_NONNULL_BEGIN
} }
}]; }];
__block TSInteraction *lastCallOrMessage = nil;
[[transaction ext:TSMessageDatabaseViewExtensionName]
enumerateRowsInGroup:thread.uniqueId
withOptions:NSEnumerationReverse
usingBlock:^(
NSString *collection, NSString *key, id object, id metadata, NSUInteger index, BOOL *stop) {
OWSAssert([object isKindOfClass:[TSInteraction class]]);
if ([object isKindOfClass:[TSIncomingMessage class]] ||
[object isKindOfClass:[TSOutgoingMessage class]] ||
[object isKindOfClass:[TSCall class]]) {
lastCallOrMessage = object;
*stop = YES;
}
}];
NSUInteger outgoingMessageCount = NSUInteger outgoingMessageCount =
[[TSDatabaseView threadOutgoingMessageDatabaseView:transaction] numberOfItemsInGroup:thread.uniqueId]; [[TSDatabaseView threadOutgoingMessageDatabaseView:transaction] numberOfItemsInGroup:thread.uniqueId];
NSUInteger threadMessageCount = NSUInteger threadMessageCount =
@ -439,7 +422,6 @@ NS_ASSUME_NONNULL_BEGIN
= (shouldHaveBlockOffer || shouldHaveAddToContactsOffer || shouldHaveAddToProfileWhitelistOffer); = (shouldHaveBlockOffer || shouldHaveAddToContactsOffer || shouldHaveAddToProfileWhitelistOffer);
if (isContactThread) { if (isContactThread) {
TSContactThread *contactThread = (TSContactThread *)thread; TSContactThread *contactThread = (TSContactThread *)thread;
// TODO: Set this property.
if (contactThread.hasDismissedOffers) { if (contactThread.hasDismissedOffers) {
shouldHaveContactOffers = NO; shouldHaveContactOffers = NO;
} }