pull/71/head
Mikunj 5 years ago
parent 770d8b2f3d
commit 57db0bd211

@ -980,7 +980,7 @@ typedef enum : NSUInteger {
[self restoreSession]; [self restoreSession];
}]; }];
[bannerView setOnDismiss:^{ [bannerView setOnDismiss:^{
[thread removeAllRessionRestoreDevicesWithTransaction:nil]; [thread removeAllSessionRestoreDevicesWithTransaction:nil];
}]; }];
} }
} else { } else {
@ -1000,11 +1000,11 @@ typedef enum : NSUInteger {
// rebuild the indicator view every time. // rebuild the indicator view every time.
[self.bannerView removeFromSuperview]; [self.bannerView removeFromSuperview];
self.bannerView = nil; self.bannerView = nil;
if (self.userHasScrolled) { if (self.userHasScrolled) {
return; return;
} }
NSArray<NSString *> *noLongerVerifiedRecipientIds = [self noLongerVerifiedRecipientIds]; NSArray<NSString *> *noLongerVerifiedRecipientIds = [self noLongerVerifiedRecipientIds];
if (noLongerVerifiedRecipientIds.count > 0) { if (noLongerVerifiedRecipientIds.count > 0) {
@ -1182,7 +1182,7 @@ typedef enum : NSUInteger {
[[[TSInfoMessage alloc] initWithTimestamp:NSDate.ows_millisecondTimeStamp inThread:thread messageType:TSInfoMessageTypeLokiSessionResetInProgress] save]; [[[TSInfoMessage alloc] initWithTimestamp:NSDate.ows_millisecondTimeStamp inThread:thread messageType:TSInfoMessageTypeLokiSessionResetInProgress] save];
thread.sessionResetState = TSContactThreadSessionResetStateRequestReceived; thread.sessionResetState = TSContactThreadSessionResetStateRequestReceived;
[thread save]; [thread save];
[thread removeAllRessionRestoreDevicesWithTransaction:nil]; [thread removeAllSessionRestoreDevicesWithTransaction:nil];
} }
} }

@ -52,7 +52,7 @@ extern NSString *const TSContactThreadPrefix;
- (void)addSessionRestoreDevice:(NSString *)hexEncodedPublicKey transaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction; - (void)addSessionRestoreDevice:(NSString *)hexEncodedPublicKey transaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction;
- (void)removeAllRessionRestoreDevicesWithTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction; - (void)removeAllSessionRestoreDevicesWithTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction;
@end @end

@ -118,7 +118,7 @@ NSString *const TSContactThreadPrefix = @"c";
[self setSessionRestoreDevices:[set allObjects] transaction:transaction]; [self setSessionRestoreDevices:[set allObjects] transaction:transaction];
} }
- (void)removeAllRessionRestoreDevicesWithTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction - (void)removeAllSessionRestoreDevicesWithTransaction:(YapDatabaseReadWriteTransaction *_Nullable)transaction
{ {
[self setSessionRestoreDevices:@[] transaction:transaction]; [self setSessionRestoreDevices:@[] transaction:transaction];
} }

@ -1335,7 +1335,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
[message.thread saveFriendRequestStatus:LKThreadFriendRequestStatusRequestSent withTransaction:transaction]; [message.thread saveFriendRequestStatus:LKThreadFriendRequestStatusRequestSent withTransaction:transaction];
[message.thread removeOldOutgoingFriendRequestMessagesIfNeededWithTransaction:transaction]; [message.thread removeOldOutgoingFriendRequestMessagesIfNeededWithTransaction:transaction];
if ([message.thread isKindOfClass:[TSContactThread class]]) { if ([message.thread isKindOfClass:[TSContactThread class]]) {
[((TSContactThread *) message.thread) removeAllRessionRestoreDevicesWithTransaction:transaction]; [((TSContactThread *) message.thread) removeAllSessionRestoreDevicesWithTransaction:transaction];
} }
// Update the message // Update the message
[message saveFriendRequestStatus:LKMessageFriendRequestStatusPending withTransaction:transaction]; [message saveFriendRequestStatus:LKMessageFriendRequestStatusPending withTransaction:transaction];

Loading…
Cancel
Save