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

Merge branch 'mkirk/persist-devices' into release/2.31.0

Browse source
This commit is contained in:
Michael Kirk 2018-10-29 13:38:37 -06:00
parent ef25b9c191 af3102441d
commit db60083dd3
1 changed files with 8 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
SignalServiceKit/src/Contacts/SignalRecipient.m
View file

@ -161,19 +161,11 @@ NS_ASSUME_NONNULL_BEGIN
{
OWSAssertDebug(transaction);
OWSAssertDebug(devices.count > 0);
OWSLogDebug(@"adding devices: %@, to recipient: %@", devices, self);
[self reloadWithTransaction:transaction];
[self addDevices:devices];
SignalRecipient *latest = [SignalRecipient markRecipientAsRegisteredAndGet:self.recipientId
transaction:transaction];
if ([devices isSubsetOfSet:latest.devices.set]) {
return;
}
OWSLogDebug(@"adding devices: %@, to recipient: %@", devices, latest.recipientId);
[latest addDevices:devices];
[latest saveWithTransaction_internal:transaction];
[self saveWithTransaction_internal:transaction];
}
- (void)removeDevicesFromRecipient:(NSSet *)devices transaction:(YapDatabaseReadWriteTransaction *)transaction
@ -181,23 +173,12 @@ NS_ASSUME_NONNULL_BEGIN
OWSAssertDebug(transaction);
OWSAssertDebug(devices.count > 0);
OWSLogDebug(@"removing devices: %@, from registered recipient: %@", devices, self);
[self reloadWithTransaction:transaction];
[self removeDevices:devices];
SignalRecipient *_Nullable latest =
[SignalRecipient registeredRecipientForRecipientId:self.recipientId transaction:transaction];
if (!latest) {
return;
}
if (![devices intersectsSet:latest.devices.set]) {
return;
}
OWSLogDebug(@"removing devices: %@, from registered recipient: %@", devices, latest.recipientId);
[latest removeDevices:devices];
if (latest.devices.count > 0) {
[latest saveWithTransaction_internal:transaction];
if (self.devices.count > 0) {
[self saveWithTransaction_internal:transaction];
} else {
[SignalRecipient removeUnregisteredRecipient:self.recipientId transaction:transaction];
}