|
|
@ -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];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|