oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Clean

Browse source
This commit is contained in:
Mikunj 2019-12-10 15:59:20 +11:00
parent 770d8b2f3d
commit 57db0bd211
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View file

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

2
SignalServiceKit/src/Contacts/Threads/TSContactThread.h
View file

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

2
SignalServiceKit/src/Contacts/Threads/TSContactThread.m
View file

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

2
SignalServiceKit/src/Messages/OWSMessageSender.m
View file

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