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

Update UI to reflect changes to disappearing messages configuration.

This commit is contained in:
Matthew Chen 2017-11-16 12:25:43 -05:00
parent 3380ecdbf2
commit df5aa5ef67
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
View File

@ -1134,19 +1134,6 @@ NS_ASSUME_NONNULL_BEGIN
}
}
// case TSInfoMessageAdapter: {
// // HACK this will get called when we get a new info message, but there's gotta be a better spot for this.
// OWSDisappearingMessagesConfiguration *configuration =
// [OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:self.thread.uniqueId];
// [self setBarButtonItemsForDisappearingMessagesConfiguration:configuration];
//
// if (message.shouldStartExpireTimer && [cell conformsToProtocol:@protocol(OWSExpirableMessageView)]) {
// id<OWSExpirableMessageView> expirableView = (id<OWSExpirableMessageView>)cell;
// [expirableView startExpirationTimerWithExpiresAtSeconds:message.expiresAtSeconds
// initialDurationSeconds:message.expiresInSeconds];
// }
//
#pragma mark - Gesture recognizers
- (void)handleTapGesture:(UITapGestureRecognizer *)sender

18
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View File

@ -586,10 +586,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
// unless it ever becomes possible to load this VC without going via the HomeViewController.
[self.contactsManager requestSystemContactsOnce];
[self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
self.disappearingMessagesConfiguration =
[OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:self.thread.uniqueId transaction:transaction];
}];
[self updateDisappearingMessagesConfiguration];
[self updateBarButtonItems];
[self setNavigationTitle];
@ -1528,6 +1525,14 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
}
}
- (void)updateDisappearingMessagesConfiguration
{
[self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
self.disappearingMessagesConfiguration =
[OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:self.thread.uniqueId transaction:transaction];
}];
}
- (void)setDisappearingMessagesConfiguration:
(nullable OWSDisappearingMessagesConfiguration *)disappearingMessagesConfiguration
{
@ -2818,10 +2823,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
[self setNavigationTitle];
}
[self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
self.disappearingMessagesConfiguration =
[OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:self.thread.uniqueId transaction:transaction];
}];
[self updateDisappearingMessagesConfiguration];
if (![[self.uiDatabaseConnection ext:TSMessageDatabaseViewExtensionName] hasChangesForGroup:self.thread.uniqueId
inNotifications:notifications]) {