mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

getProfile: Only clear profile name if profile is missing it

Browse source
This commit is contained in:
Scott Nonnenberg 2025-02-05 10:36:55 +10:00 • committed by GitHub
parent efe7195bb6
commit 0d87bbb5eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ts/services/profiles.ts
View file

@ -771,10 +771,6 @@ async function doGetProfile(
Errors.toLogFormat(error)
);
isSuccessfullyDecrypted = false;
c.set({
profileName: undefined,
profileFamilyName: undefined,
});
}
}
} else {

18
ts/services/storageRecordOps.ts
View file

@ -1182,20 +1182,24 @@ export async function mergeContactRecord(
remoteName &&
(localName !== remoteName || localFamilyName !== remoteFamilyName)
) {
// Local name doesn't match remote name, fetch profile
log.info(
`mergeContactRecord: ${conversation.idForLogging()} name doesn't match remote name; overwriting`
);
details.push('updated profile name');
conversation.set({
profileName: remoteName,
profileFamilyName: remoteFamilyName,
});
if (localName) {
log.info(
`mergeContactRecord: ${conversation.idForLogging()} name doesn't match remote name; also fetching profile`
);
drop(
conversation.getProfiles().catch(() => {
/* nothing to do here; logging already happened */
})
);
details.push('refreshing profile');
} else {
conversation.set({
profileName: remoteName,
profileFamilyName: remoteFamilyName,
});
details.push('updated profile name');
}
}
conversation.set({