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/cleanup-share-avatars'

Browse source
This commit is contained in:
Michael Kirk 2018-05-10 11:33:22 -04:00
parent efa3c81f68 ed2945126a
commit e520451996
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SignalServiceKit/src/Messages/Interactions/OWSContact.h
View file

@ -117,6 +117,8 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value);
@property (nonatomic, readonly, nullable) NSString *avatarAttachmentId;
- (nullable TSAttachment *)avatarAttachmentWithTransaction:(YapDatabaseReadTransaction *)transaction;
- (void)removeAvatarAttachmentWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
- (void)saveAvatarImage:(UIImage *)image transaction:(YapDatabaseReadWriteTransaction *)transaction;
// "Profile" avatars should _not_ be saved to device contacts.
@property (nonatomic, readonly) BOOL isProfileAvatar;

7
SignalServiceKit/src/Messages/Interactions/OWSContact.m
View file

@ -499,6 +499,13 @@ NSString *NSStringForContactAddressType(OWSContactAddressType value)
self.avatarAttachmentId = attachmentStream.uniqueId;
}
- (void)removeAvatarAttachmentWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
{
TSAttachmentStream *_Nullable attachment =
[TSAttachmentStream fetchObjectWithUniqueID:self.avatarAttachmentId transaction:transaction];
[attachment removeWithTransaction:transaction];
}
#pragma mark - Phone Numbers and Recipient IDs
- (NSArray<NSString *> *)systemContactsWithSignalAccountPhoneNumbers:(id<ContactsManagerProtocol>)contactsManager

4
SignalServiceKit/src/Messages/Interactions/TSMessage.m
View file

@ -289,6 +289,10 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
[attachment removeWithTransaction:transaction];
};
if (self.contactShare.avatarAttachmentId) {
[self.contactShare removeAvatarAttachmentWithTransaction:transaction];
}
// Updates inbox thread preview
[self touchThreadWithTransaction:transaction];
}