@ -1165,12 +1165,10 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
}
}
NSString * _Nullable avatarUrlPathAtStart = userProfile . avatarUrlPath ;
NSString * _Nullable avatarUrlPathAtStart = userProfile . avatarUrlPath ;
if ( userProfile . profileKey. keyData . length < 1 || userProfile . avatarUrlPath. length < 1 ) {
if ( userProfile . . length < 1 ) {
return ;
return ;
}
}
OWSAES256Key * profileKeyAtStart = userProfile . profileKey ;
NSString * fileName = [ self generateAvatarFilename ] ;
NSString * fileName = [ self generateAvatarFilename ] ;
NSString * filePath = [ OWSUserProfile profileAvatarFilepathWithFilename : fileName ] ;
NSString * filePath = [ OWSUserProfile profileAvatarFilepathWithFilename : fileName ] ;
@ -1188,88 +1186,62 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
NSString * tempDirectory = OWSTemporaryDirectory ( ) ;
NSString * tempDirectory = OWSTemporaryDirectory ( ) ;
NSString * tempFilePath = [ tempDirectory stringByAppendingPathComponent : fileName ] ;
NSString * tempFilePath = [ tempDirectory stringByAppendingPathComponent : fileName ] ;
void ( ^completionHandler ) ( NSURLResponse * _Nonnull , NSURL * _Nullable , NSError * _Nullable ) = ^(
NSURLResponse * _Nonnull response , NSURL * _Nullable filePathParam , NSError * _Nullable error ) {
NSString * profilePictureURL = userProfile . avatarUrlPath ;
/ / Ensure disk IO and decryption occurs off the main thread .
NSError * serializationError ;
dispatch_async ( dispatch_get_global_queue ( DISPATCH_QUEUE_PRIORITY_DEFAULT , 0 ) , ^{
NSMutableURLRequest * request =
NSData * _Nullable encryptedData = [ NSData dataWithContentsOfFile : tempFilePath ] ;
[ self . avatarHTTPManager . requestSerializer requestWithMethod : @ "GET "
NSData * _Nullable decryptedData = encryptedData ;
URLString : profilePictureURL
UIImage * _Nullable image = nil ;
parameters : nil
if ( decryptedData ) {
error : & serializationError ] ;
BOOL success = [ decryptedData writeToFile : filePath atomically : YES ] ;
if ( serializationError ) {
if ( success ) {
OWSFailDebug ( @ "serializationError : %@", serializationError);
image = [ UIImage imageWithContentsOfFile : filePath ] ;
return ;
}
}
}
NSURLSession * session = [ NSURLSession sharedSession ] ;
NSURLSessionTask * downloadTask = [ session downloadTaskWithRequest : request completionHandler : ^( NSURL * location , NSURLResponse * response , NSError * error ) {
@ synchronized ( self . currentAvatarDownloads )
@ synchronized ( self . currentAvatarDownloads )
{
{
[ self . currentAvatarDownloads removeObject : userProfile . recipientId ] ;
[ self . currentAvatarDownloads removeObject : userProfile . recipientId ] ;
}
}
OWSUserProfile * latestUserProfile =
if ( error ) {
[ OWSUserProfile getOrBuildUserProfileForRecipientId : userProfile . recipientId
OWSLogError ( @ "Dowload failed : %@", error);
dbConnection : self . dbConnection ] ;
return ;
if ( latestUserProfile . profileKey . keyData . length < 1
}
|| ![ latestUserProfile . profileKey isEqual : userProfile . profileKey ] ) {
OWSLogWarn ( @ "Ignoring avatar download for obsolete user profile . ") ;
} else if ( ![ avatarUrlPathAtStart isEqualToString : latestUserProfile . avatarUrlPath ] ) {
OWSLogInfo ( @ "avatar url has changed during download ") ;
if ( latestUserProfile . avatarUrlPath . length > 0 ) {
[ self downloadAvatarForUserProfile : latestUserProfile ] ;
}
} else if ( error ) {
OWSLogError ( @ "avatar download for %@ failed with error: %@", userProfile.recipientId, error);
} else if ( !encryptedData ) {
OWSLogError ( @ "avatar encrypted data for %@ could not be read.", userProfile.recipientId);
} else if ( !decryptedData ) {
OWSLogError ( @ "avatar data for %@ could not be decrypted.", userProfile.recipientId);
} else if ( !image ) {
OWSLogError (
@ "avatar image for %@ could not be loaded with error: %@", userProfile.recipientId, error);
} else {
[ self updateProfileAvatarCache : image filename : fileName ] ;
[ latestUserProfile updateWithAvatarFileName : fileName dbConnection : self . dbConnection completion : nil ] ;
NSFileManager * fileManager = [ NSFileManager defaultManager ] ;
NSURL * fileURL = [ NSURL fileURLWithPath : filePath ] ;
NSError * moveError ;
if ( ![ fileManager moveItemAtURL : location toURL : fileURL error : & moveError ] ) {
OWSLogError ( @ "MoveItemAtURL for avatar failed : %@", moveError);
return ;
}
}
/ / If we ' re updating the profile that corresponds to our local number ,
UIImage * image = [ UIImage imageWithContentsOfFile : [ fileURL path ] ] ;
/ / update the local profile as well .
if ( image ) {
NSString * _Nullable localNumber = self . tsAccountManager . localNumber ;
dispatch_async ( dispatch_get_main_queue ( ) , ^{
if ( localNumber && [ localNumber isEqualToString : userProfile . recipientId ] ) {
OWSUserProfile * localUserProfile = self . localUserProfile ;
OWSAssertDebug ( localUserProfile ) ;
[ localUserProfile updateWithAvatarFileName : fileName dbConnection : self . dbConnection completion : nil ] ;
[ self updateProfileAvatarCache : image filename : fileName ] ;
[ self updateProfileAvatarCache : image filename : fileName ] ;
}
OWSAssertDebug ( backgroundTask ) ;
OWSUserProfile * latestUserProfile =
backgroundTask = nil ;
[ OWSUserProfile getOrBuildUserProfileForRecipientId : userProfile . recipientId
} ) ;
dbConnection : self . dbConnection ] ;
} ;
NSString * profilePictureURL = userProfile . avatarUrlPath ;
[ latestUserProfile updateWithAvatarFileName : fileName dbConnection : self . dbConnection completion : ^{
NSError * serializationError ;
[ [ NSNotificationCenter defaultCenter ]
NSMutableURLRequest * request =
postNotificationNameAsync : OWSContactsManagerSignalAccountsDidChangeNotification
[ self . avatarHTTPManager . requestSerializer requestWithMethod : @ "GET "
object : nil ] ;
URLString : profilePictureURL
} ] ;
parameters : nil
} ) ;
error : & serializationError ] ;
if ( serializationError ) {
OWSFailDebug ( @ "serializationError : %@", serializationError);
return ;
}
}
__block * downloadTask = [ self . avatarHTTPManager downloadTaskWithRequest : request
progress : ^( NSProgress * _Nonnull downloadProgress ) {
} ] ;
OWSLogVerbose (
@ "Downloading avatar for %@ %f", userProfile.recipientId, downloadProgress.fractionCompleted);
}
destination : ^NSURL * _Nonnull ( NSURL * _Nonnull targetPath , NSURLResponse * _Nonnull response ) {
return [ NSURL fileURLWithPath : tempFilePath ] ;
}
completionHandler : completionHandler ] ;
[ downloadTask resume ] ;
[ downloadTask resume ] ;
} ) ;
} ) ;
} }
@ -1334,8 +1306,11 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
{ {
OWSUserProfile * userProfile = [ OWSUserProfile getOrBuildUserProfileForRecipientId : contactID transaction : transaction ] ;
OWSUserProfile * userProfile = [ OWSUserProfile getOrBuildUserProfileForRecipientId : contactID transaction : transaction ] ;
NSString * oldProfilePictureURL = userProfile . avatarUrlPath ;
NSString * oldProfilePictureURL = userProfile . avatarUrlPath ;
[ userProfile updateWithProfileName : displayName avatarUrlPath : profilePictureURL avatarFileName : @ "" transaction : transaction completion : nil ] ;
/ / Note : we keep using the old file name until we have the new one
if ( ![ oldProfilePictureURL isEqual : profilePictureURL ] ) {
/ / ( otherwise the profile picuture would disspear for a short time )
NSString * oldAvatarFileName = userProfile . avatarFileName ;
[ userProfile updateWithProfileName : displayName avatarUrlPath : profilePictureURL avatarFileName : oldAvatarFileName transaction : transaction completion : nil ] ;
if ( profilePictureURL && ![ oldProfilePictureURL isEqual : profilePictureURL ] ) {
[ self downloadAvatarForUserProfile : userProfile ] ;
[ self downloadAvatarForUserProfile : userProfile ] ;
}
}
} }
Maxim Shishmarev
6 years ago