oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't emit "user profile changed" notifications if nothing changed.

This commit is contained in:
Matthew Chen 2017-12-08 15:21:08 -05:00
parent 7b4aa4056c
commit f684482c54
8 changed files with 215 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Signal/src/ViewControllers/AvatarViewHelper.m
View File

@ -130,7 +130,9 @@ NS_ASSUME_NONNULL_BEGIN
CropScaleImageViewController *vc = [[CropScaleImageViewController alloc]
initWithSrcImage:rawAvatar
successCompletion:^(UIImage *_Nonnull dstImage) {
[self.delegate avatarDidChange:dstImage];
dispatch_async(dispatch_get_main_queue(), ^{
[self.delegate avatarDidChange:dstImage];
});
}];
[self.delegate.fromViewController
presentViewController:vc

1
Signal/src/ViewControllers/NewGroupViewController.m
View File

@ -619,6 +619,7 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68;
- (void)avatarDidChange:(UIImage *)image
{
OWSAssert([NSThread isMainThread]);
OWSAssert(image);
self.groupAvatar = image;

1
Signal/src/ViewControllers/ProfileViewController.m
View File

@ -577,6 +577,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat
- (void)avatarDidChange:(UIImage *)image
{
OWSAssert([NSThread isMainThread]);
OWSAssert(image);
self.avatar = [image resizedImageToFillPixelSize:CGSizeMake(kOWSProfileManager_MaxAvatarDiameter,

1
Signal/src/ViewControllers/UpdateGroupViewController.m
View File

@ -496,6 +496,7 @@ NS_ASSUME_NONNULL_BEGIN
- (void)avatarDidChange:(UIImage *)image
{
OWSAssert([NSThread isMainThread]);
OWSAssert(image);
self.groupAvatar = image;

2
Signal/src/environment/ExperienceUpgrades/ExperienceUpgrade.swift
View File

@ -54,7 +54,7 @@ class ExperienceUpgrade: TSYapDatabaseObject {
// these models in a "change log" archive.
if propertyKey == "title" || propertyKey == "body" || propertyKey == "image" {
return MTLPropertyStorageNone
} else if propertyKey == "uniqueId" || propertyKey == "seenAt" {
} else if propertyKey == "uniqueId" || propertyKey == "seenAt" || propertyKey == "hasEverBeenSaved" {
return super.storageBehaviorForProperty(withKey: propertyKey)
} else {
// Being conservative here in case we rename a property.

257
SignalMessaging/profiles/OWSUserProfile.m
View File

@ -87,18 +87,21 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
#pragma mark - Update With... Methods
- (void)finalizeWithCompletion:(nullable OWSUserProfileCompletion)externalCompletion didChange:(BOOL)didChange
- (void)finalizeWithCompletion:(nullable OWSUserProfileCompletion)externalCompletion
{
DDLogVerbose(@"%@, after: %@", self.logTag, self.debugDescription);
if (externalCompletion) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), externalCompletion);
}
if (!didChange) {
return;
}
BOOL isLocalUserProfile = [self.recipientId isEqualToString:kLocalProfileUniqueId];
// if (isLocalUserProfile) {
// [DDLog flushLog];
// DDLogError(@"%@", self.logTag);
// }
dispatch_async(dispatch_get_main_queue(), ^{
if (isLocalUserProfile) {
// We populate an initial (empty) profile on launch of a new install, but until
@ -134,24 +137,34 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
dbConnection:(YapDatabaseConnection *)dbConnection
completion:(nullable OWSUserProfileCompletion)completion
{
__block BOOL didChange = NO;
DDLogVerbose(@"%@ %s, before: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (self.hasEverBeenSaved) {
BOOL didChange = NO;
didChange |= [self didStringChange:self.profileName newValue:[profileName ows_stripped]];
didChange |= [self didStringChange:self.avatarUrlPath newValue:avatarUrlPath];
didChange |= [self didStringChange:self.avatarFileName newValue:avatarFileName];
if (!didChange) {
DDLogVerbose(@"%@ Ignoring update in %s: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (completion) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), completion);
}
return;
}
}
[dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[self applyChangeToSelfAndLatestCopy:transaction
changeBlock:^(OWSUserProfile *userProfile) {
didChange |= [self didStringChange:userProfile.profileName
newValue:[profileName ows_stripped]];
didChange |=
[self didStringChange:userProfile.avatarUrlPath newValue:avatarUrlPath];
didChange |=
[self didStringChange:userProfile.avatarFileName newValue:avatarFileName];
[userProfile setProfileName:[profileName ows_stripped]];
[userProfile setAvatarUrlPath:avatarUrlPath];
[userProfile setAvatarFileName:avatarFileName];
}
saveIfMissing:YES];
}];
[self finalizeWithCompletion:completion didChange:didChange];
[self finalizeWithCompletion:completion];
}
- (void)updateWithProfileName:(nullable NSString *)profileName
@ -161,18 +174,29 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
dbConnection:(YapDatabaseConnection *)dbConnection
completion:(nullable OWSUserProfileCompletion)completion
{
__block BOOL didChange = NO;
DDLogVerbose(@"%@ %s, before: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (self.hasEverBeenSaved) {
BOOL didChange = NO;
didChange |= [self didStringChange:self.profileName newValue:[profileName ows_stripped]];
didChange |= [self didStringChange:self.avatarUrlPath newValue:avatarUrlPath];
didChange |= [self didStringChange:self.avatarFileName newValue:avatarFileName];
didChange |= [self didDateChange:self.lastUpdateDate newValue:lastUpdateDate];
if (!didChange) {
DDLogVerbose(@"%@ Ignoring update in %s: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (completion) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), completion);
}
return;
}
}
[dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[self
applyChangeToSelfAndLatestCopy:transaction
changeBlock:^(OWSUserProfile *userProfile) {
didChange |= [self didStringChange:userProfile.profileName
newValue:[profileName ows_stripped]];
didChange |= [self didStringChange:userProfile.avatarUrlPath newValue:avatarUrlPath];
didChange |=
[self didStringChange:userProfile.avatarFileName newValue:avatarFileName];
didChange |= [self didDateChange:userProfile.lastUpdateDate newValue:lastUpdateDate];
[userProfile setProfileName:[profileName ows_stripped]];
[userProfile setAvatarUrlPath:avatarUrlPath];
[userProfile setAvatarFileName:avatarFileName];
@ -180,7 +204,7 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
}
saveIfMissing:YES];
}];
[self finalizeWithCompletion:completion didChange:didChange];
[self finalizeWithCompletion:completion];
}
- (void)updateWithProfileName:(nullable NSString *)profileName
@ -189,23 +213,35 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
dbConnection:(YapDatabaseConnection *)dbConnection
completion:(nullable OWSUserProfileCompletion)completion
{
__block BOOL didChange = NO;
DDLogVerbose(@"%@ %s, before: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (self.hasEverBeenSaved) {
BOOL didChange = NO;
didChange |= [self didStringChange:self.profileName newValue:[profileName ows_stripped]];
didChange |= [self didStringChange:self.avatarUrlPath newValue:avatarUrlPath];
didChange |= [self didDateChange:self.lastUpdateDate newValue:lastUpdateDate];
if (!didChange) {
DDLogVerbose(@"%@ Ignoring update in %s: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (completion) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), completion);
}
return;
}
}
[dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[self
applyChangeToSelfAndLatestCopy:transaction
changeBlock:^(OWSUserProfile *userProfile) {
didChange |= [self didStringChange:userProfile.profileName
newValue:[profileName ows_stripped]];
didChange |= [self didStringChange:userProfile.avatarUrlPath newValue:avatarUrlPath];
didChange |= [self didDateChange:userProfile.lastUpdateDate newValue:lastUpdateDate];
[userProfile setProfileName:[profileName ows_stripped]];
[userProfile setAvatarUrlPath:avatarUrlPath];
[userProfile setLastUpdateDate:lastUpdateDate];
}
saveIfMissing:YES];
}];
[self finalizeWithCompletion:completion didChange:didChange];
[self finalizeWithCompletion:completion];
}
- (void)updateWithProfileName:(nullable NSString *)profileName
@ -215,18 +251,28 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
dbConnection:(YapDatabaseConnection *)dbConnection
completion:(nullable OWSUserProfileCompletion)completion
{
__block BOOL didChange = NO;
DDLogVerbose(@"%@ %s, before: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (self.hasEverBeenSaved) {
BOOL didChange = NO;
didChange |= [self didStringChange:self.profileName newValue:[profileName ows_stripped]];
didChange |= [self didKeyChange:self.profileKey newValue:profileKey];
didChange |= [self didStringChange:self.avatarUrlPath newValue:avatarUrlPath];
didChange |= [self didStringChange:self.avatarFileName newValue:avatarFileName];
if (!didChange) {
DDLogVerbose(@"%@ Ignoring update in %s: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (completion) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), completion);
}
return;
}
}
[dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[self applyChangeToSelfAndLatestCopy:transaction
changeBlock:^(OWSUserProfile *userProfile) {
didChange |= [self didStringChange:userProfile.profileName
newValue:[profileName ows_stripped]];
didChange |= [self didKeyChange:userProfile.profileKey newValue:profileKey];
didChange |=
[self didStringChange:userProfile.avatarUrlPath newValue:avatarUrlPath];
didChange |=
[self didStringChange:userProfile.avatarFileName newValue:avatarFileName];
[userProfile setProfileName:[profileName ows_stripped]];
[userProfile setProfileKey:profileKey];
[userProfile setAvatarUrlPath:avatarUrlPath];
@ -234,7 +280,7 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
}
saveIfMissing:YES];
}];
[self finalizeWithCompletion:completion didChange:didChange];
[self finalizeWithCompletion:completion];
}
- (void)updateWithAvatarUrlPath:(nullable NSString *)avatarUrlPath
@ -242,75 +288,124 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
dbConnection:(YapDatabaseConnection *)dbConnection
completion:(nullable OWSUserProfileCompletion)completion
{
__block BOOL didChange = NO;
DDLogVerbose(@"%@ %s, before: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (self.hasEverBeenSaved) {
BOOL didChange = NO;
didChange |= [self didStringChange:self.avatarUrlPath newValue:avatarUrlPath];
didChange |= [self didStringChange:self.avatarFileName newValue:avatarFileName];
if (!didChange) {
DDLogVerbose(@"%@ Ignoring update in %s: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (completion) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), completion);
}
return;
}
}
[dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[self applyChangeToSelfAndLatestCopy:transaction
changeBlock:^(OWSUserProfile *userProfile) {
didChange |=
[self didStringChange:userProfile.avatarUrlPath newValue:avatarUrlPath];
didChange |=
[self didStringChange:userProfile.avatarFileName newValue:avatarFileName];
[userProfile setAvatarUrlPath:avatarUrlPath];
[userProfile setAvatarFileName:avatarFileName];
}
saveIfMissing:YES];
}];
[self finalizeWithCompletion:completion didChange:didChange];
[self finalizeWithCompletion:completion];
}
- (void)updateWithAvatarFileName:(nullable NSString *)avatarFileName
dbConnection:(YapDatabaseConnection *)dbConnection
completion:(nullable OWSUserProfileCompletion)completion
{
__block BOOL didChange = NO;
DDLogVerbose(@"%@ %s, before: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (self.hasEverBeenSaved) {
BOOL didChange = NO;
didChange |= [self didStringChange:self.avatarFileName newValue:avatarFileName];
if (!didChange) {
DDLogVerbose(@"%@ Ignoring update in %s: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (completion) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), completion);
}
return;
}
}
[dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[self applyChangeToSelfAndLatestCopy:transaction
changeBlock:^(OWSUserProfile *userProfile) {
didChange |=
[self didStringChange:userProfile.avatarFileName newValue:avatarFileName];
[userProfile setAvatarFileName:avatarFileName];
}
saveIfMissing:YES];
}];
[self finalizeWithCompletion:completion didChange:didChange];
[self finalizeWithCompletion:completion];
}
- (void)updateWithLastUpdateDate:(nullable NSDate *)lastUpdateDate
dbConnection:(YapDatabaseConnection *)dbConnection
completion:(nullable OWSUserProfileCompletion)completion
{
__block BOOL didChange = NO;
DDLogVerbose(@"%@ %s, before: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (self.hasEverBeenSaved) {
BOOL didChange = NO;
didChange |= [self didDateChange:self.lastUpdateDate newValue:lastUpdateDate];
if (!didChange) {
DDLogVerbose(@"%@ Ignoring update in %s: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (completion) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), completion);
}
return;
}
}
[dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[self applyChangeToSelfAndLatestCopy:transaction
changeBlock:^(OWSUserProfile *userProfile) {
didChange |=
[self didDateChange:userProfile.lastUpdateDate newValue:lastUpdateDate];
[userProfile setLastUpdateDate:lastUpdateDate];
}
saveIfMissing:YES];
}];
[self finalizeWithCompletion:completion didChange:didChange];
[self finalizeWithCompletion:completion];
}
- (void)clearWithProfileKey:(OWSAES256Key *)profileKey
dbConnection:(YapDatabaseConnection *)dbConnection
completion:(nullable OWSUserProfileCompletion)completion;
{
DDLogVerbose(@"%@ %s, before: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
OWSAssert(profileKey);
__block BOOL didChange = NO;
if (self.hasEverBeenSaved) {
BOOL didChange = NO;
didChange |= [self didKeyChange:self.profileKey newValue:profileKey];
didChange |= [self didStringChange:self.profileName newValue:nil];
didChange |= [self didStringChange:self.avatarUrlPath newValue:nil];
didChange |= [self didStringChange:self.avatarFileName newValue:nil];
didChange |= [self didDateChange:self.lastUpdateDate newValue:nil];
if (!didChange) {
DDLogVerbose(@"%@ Ignoring update in %s: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (completion) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), completion);
}
return;
}
}
[dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[self applyChangeToSelfAndLatestCopy:transaction
changeBlock:^(OWSUserProfile *userProfile) {
didChange |= [self didKeyChange:userProfile.profileKey newValue:profileKey];
didChange |= [self didStringChange:userProfile.profileName newValue:nil];
didChange |= [self didStringChange:userProfile.avatarUrlPath newValue:nil];
didChange |= [self didStringChange:userProfile.avatarFileName newValue:nil];
didChange |= [self didDateChange:userProfile.lastUpdateDate newValue:nil];
[userProfile setProfileKey:profileKey];
[userProfile setProfileName:nil];
[userProfile setAvatarUrlPath:nil];
@ -319,28 +414,39 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
}
saveIfMissing:YES];
}];
[self finalizeWithCompletion:completion didChange:didChange];
[self finalizeWithCompletion:completion];
}
- (void)updateWithProfileKey:(OWSAES256Key *)profileKey
dbConnection:(YapDatabaseConnection *)dbConnection
completion:(nullable OWSUserProfileCompletion)completion;
{
DDLogVerbose(@"%@ %s, before: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
OWSAssert(profileKey);
self.profileKey = profileKey;
if (self.hasEverBeenSaved) {
BOOL didChange = NO;
didChange |= [self didKeyChange:self.profileKey newValue:profileKey];
if (!didChange) {
DDLogVerbose(@"%@ Ignoring update in %s: %@", self.logTag, __PRETTY_FUNCTION__, self.debugDescription);
if (completion) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), completion);
}
return;
}
}
__block BOOL didChange = NO;
[dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
[self applyChangeToSelfAndLatestCopy:transaction
changeBlock:^(OWSUserProfile *userProfile) {
didChange |= [self didKeyChange:userProfile.profileKey newValue:profileKey];
[userProfile setProfileKey:profileKey];
}
saveIfMissing:YES];
}];
[self finalizeWithCompletion:completion didChange:didChange];
[self finalizeWithCompletion:completion];
}
- (BOOL)didStringChange:(NSString *_Nullable)oldValue newValue:(NSString *_Nullable)newValue
@ -406,6 +512,19 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
return TSYapDatabaseObject.dbReadWriteConnection;
}
- (NSString *)debugDescription
{
return [NSString stringWithFormat:@"%@ %p %@ %@ %@ %@ %@ %f",
self.logTag,
self,
self.recipientId,
self.profileKey.keyData.hexadecimalString,
self.profileName,
self.avatarUrlPath,
self.avatarFileName,
self.lastUpdateDate.timeIntervalSinceNow];
}
@end
NS_ASSUME_NONNULL_END

2
SignalServiceKit/src/Storage/TSYapDatabaseObject.h
View File

@ -13,6 +13,8 @@ NS_ASSUME_NONNULL_BEGIN
@interface TSYapDatabaseObject : MTLModel
@property (atomic, readonly) BOOL hasEverBeenSaved;
/**
* Initializes a new database object with a unique identifier
*

19
SignalServiceKit/src/Storage/TSYapDatabaseObject.m
View File

@ -8,6 +8,14 @@
NS_ASSUME_NONNULL_BEGIN
@interface TSYapDatabaseObject ()
@property (atomic) BOOL hasEverBeenSaved;
@end
#pragma mark -
@implementation TSYapDatabaseObject
- (instancetype)init
@ -29,12 +37,21 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable instancetype)initWithCoder:(NSCoder *)coder
{
return [super initWithCoder:coder];
self = [super initWithCoder:coder];
if (!self) {
return self;
}
self.hasEverBeenSaved = YES;
return self;
}
- (void)saveWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
{
[transaction setObject:self forKey:self.uniqueId inCollection:[[self class] collection]];
self.hasEverBeenSaved = YES;
}
- (void)save