From 5fde64ef1e77492f87ca198e77658307cccaae83 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 21 Nov 2019 10:10:34 +1100 Subject: [PATCH] Debug multi device revocation --- .../src/Loki/Database/OWSPrimaryStorage+Loki.swift | 4 ++-- SignalServiceKit/src/Messages/OWSMessageManager.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift index 71ba0eedc..f8565cd75 100644 --- a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift +++ b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift @@ -1,8 +1,8 @@ public extension OWSPrimaryStorage { - private func getDeviceLinkCollection(for primaryDevice: String) -> String { - return "LokiDeviceLinkCollection-\(primaryDevice)" + private func getDeviceLinkCollection(for masterHexEncodedPublicKey: String) -> String { + return "LokiDeviceLinkCollection-\(masterHexEncodedPublicKey)" } public func setDeviceLinks(_ deviceLinks: Set, in transaction: YapDatabaseReadWriteTransaction) { diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index 47fcdee95..aa4ff7ebc 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -1196,11 +1196,11 @@ NS_ASSUME_NONNULL_BEGIN return; } [LKStorageAPI getDeviceLinksAssociatedWith:userHexEncodedPublicKey].thenOn(dispatch_get_main_queue(), ^(NSSet *deviceLinks) { - if (![deviceLinks contains:^BOOL(LKDeviceLink *deviceLink) { + if ([deviceLinks contains:^BOOL(LKDeviceLink *deviceLink) { return [deviceLink.master.hexEncodedPublicKey isEqual:senderHexEncodedPublicKey] && [deviceLink.slave.hexEncodedPublicKey isEqual:userHexEncodedPublicKey]; }]) { [NSUserDefaults.standardUserDefaults setBool:YES forKey:@"wasUnlinked"]; - [NSNotificationCenter.defaultCenter postNotification:NSNotification.dataNukeRequested]; + [NSNotificationCenter.defaultCenter postNotificationName:NSNotification.dataNukeRequested object:nil]; } }); }