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

Respond to CR.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent 1e43e93371
commit 9dfeb132cb
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File

4
Signal/src/Profiles/OWSProfileManager.h
Unescape Escape View File

@ -9,8 +9,8 @@ NS_ASSUME_NONNULL_BEGIN
extern NSString *const kNSNotificationName_LocalProfileDidChange;
extern NSString *const kNSNotificationName_OtherUsersProfileDidChange;
extern NSString *const kNSNotificationName_ProfileWhitelistDidChange;
extern NSString *const kNSNotificationName_ProfileRecipientId;
extern NSString *const kNSNotificationName_ProfileGroupId;
extern NSString *const kNSNotificationKey_ProfileRecipientId;
extern NSString *const kNSNotificationKey_ProfileGroupId;
extern const NSUInteger kOWSProfileManager_MaxAvatarDiameter;

16
Signal/src/Profiles/OWSProfileManager.m
Unescape Escape View File

@ -88,8 +88,8 @@ NSString *const kLocalProfileUniqueId = @"kLocalProfileUniqueId";
NSString *const kNSNotificationName_LocalProfileDidChange = @"kNSNotificationName_LocalProfileDidChange";
NSString *const kNSNotificationName_OtherUsersProfileDidChange = @"kNSNotificationName_OtherUsersProfileDidChange";
NSString *const kNSNotificationName_ProfileWhitelistDidChange = @"kNSNotificationName_ProfileWhitelistDidChange";
NSString *const kNSNotificationName_ProfileRecipientId = @"kNSNotificationName_ProfileRecipientId";
NSString *const kNSNotificationName_ProfileGroupId = @"kNSNotificationName_ProfileGroupId";
NSString *const kNSNotificationKey_ProfileRecipientId = @"kNSNotificationKey_ProfileRecipientId";
NSString *const kNSNotificationKey_ProfileGroupId = @"kNSNotificationKey_ProfileGroupId";
NSString *const kOWSProfileManager_UserWhitelistCollection = @"kOWSProfileManager_UserWhitelistCollection";
NSString *const kOWSProfileManager_GroupWhitelistCollection = @"kOWSProfileManager_GroupWhitelistCollection";
@ -255,7 +255,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
postNotificationName:kNSNotificationName_OtherUsersProfileDidChange
object:nil
userInfo:@{
kNSNotificationName_ProfileRecipientId : userProfile.recipientId,
kNSNotificationKey_ProfileRecipientId : userProfile.recipientId,
}];
}
});
@ -673,7 +673,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
[[NSNotificationCenter defaultCenter] postNotificationName:kNSNotificationName_ProfileWhitelistDidChange
object:nil
userInfo:@{
kNSNotificationName_ProfileRecipientId : recipientId,
kNSNotificationKey_ProfileRecipientId : recipientId,
}];
});
});
@ -715,7 +715,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
postNotificationName:kNSNotificationName_ProfileWhitelistDidChange
object:nil
userInfo:@{
kNSNotificationName_ProfileRecipientId : recipientId,
kNSNotificationKey_ProfileRecipientId : recipientId,
}];
}
});
@ -754,16 +754,14 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
return;
}
[self.dbConnection setObject:@(1)
forKey:groupIdKey
inCollection:kOWSProfileManager_GroupWhitelistCollection];
[self.dbConnection setBool:YES forKey:groupIdKey inCollection:kOWSProfileManager_GroupWhitelistCollection];
self.groupProfileWhitelistCache[groupIdKey] = @(YES);
dispatch_async(dispatch_get_main_queue(), ^{
[[NSNotificationCenter defaultCenter] postNotificationName:kNSNotificationName_ProfileWhitelistDidChange
object:nil
userInfo:@{
kNSNotificationName_ProfileGroupId : groupId,
kNSNotificationKey_ProfileGroupId : groupId,
}];
});
}

6
Signal/src/ViewControllers/ConversationView/MessagesViewController.m
Unescape Escape View File

@ -351,7 +351,7 @@ typedef enum : NSUInteger {
{
OWSAssert([NSThread isMainThread]);
NSString *recipientId = notification.userInfo[kNSNotificationName_ProfileRecipientId];
NSString *recipientId = notification.userInfo[kNSNotificationKey_ProfileRecipientId];
OWSAssert(recipientId.length > 0);
if (recipientId.length > 0 && [self.thread.recipientIdentifiers containsObject:recipientId]) {
// Reload all cells.
@ -364,8 +364,8 @@ typedef enum : NSUInteger {
OWSAssert([NSThread isMainThread]);
// If profile whitelist just changed, we may want to hide a profile whitelist offer.
NSString *_Nullable recipientId = notification.userInfo[kNSNotificationName_ProfileRecipientId];
NSData *_Nullable groupId = notification.userInfo[kNSNotificationName_ProfileGroupId];
NSString *_Nullable recipientId = notification.userInfo[kNSNotificationKey_ProfileRecipientId];
NSData *_Nullable groupId = notification.userInfo[kNSNotificationKey_ProfileGroupId];
if (recipientId.length > 0 && [self.thread.recipientIdentifiers containsObject:recipientId]) {
[self ensureDynamicInteractions];
} else if (groupId.length > 0 && self.thread.isGroupThread) {

Write Preview
Loading…
Cancel
Save