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

Preserve avatar during integrity fix

Browse source
This commit is contained in:
Fedor Indutny 2024-01-10 02:20:54 +01:00 • committed by Scott Nonnenberg
parent 861f35aa53
commit 775c881688
1 changed files with 45 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

57
ts/services/usernameIntegrity.ts
View file

@ -1,14 +1,19 @@
// Copyright 2023 Signal Messenger, LLC // Copyright 2023 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only // SPDX-License-Identifier: AGPL-3.0-only
import pTimeout from 'p-timeout';
import * as Errors from '../types/errors'; import * as Errors from '../types/errors';
import { getConversation } from '../util/getConversation'; import { getConversation } from '../util/getConversation';
import { DAY } from '../util/durations'; import { MINUTE, DAY } from '../util/durations';
import { drop } from '../util/drop'; import { drop } from '../util/drop';
import { explodePromise } from '../util/explodePromise';
import { BackOff, FIBONACCI_TIMEOUTS } from '../util/BackOff'; import { BackOff, FIBONACCI_TIMEOUTS } from '../util/BackOff';
import { checkForUsername } from '../util/lookupConversationWithoutServiceId'; import { checkForUsername } from '../util/lookupConversationWithoutServiceId';
import { storageJobQueue } from '../util/JobQueue'; import { storageJobQueue } from '../util/JobQueue';
import { getAbsoluteProfileAvatarPath } from '../util/avatarUtils';
import { getProfile } from '../util/getProfile'; import { getProfile } from '../util/getProfile';
import { imagePathToBytes } from '../util/imagePathToBytes';
import { isSharingPhoneNumberWithEverybody } from '../util/phoneNumberSharingMode'; import { isSharingPhoneNumberWithEverybody } from '../util/phoneNumberSharingMode';
import * as log from '../logging/log'; import * as log from '../logging/log';
import { resolveUsernameByLink } from './username'; import { resolveUsernameByLink } from './username';
@ -17,6 +22,8 @@ import { writeProfile } from './writeProfile';
const CHECK_INTERVAL = DAY; const CHECK_INTERVAL = DAY;
const STORAGE_SERVICE_TIMEOUT = 30 * MINUTE;
class UsernameIntegrityService { class UsernameIntegrityService {
private isStarted = false; private isStarted = false;
private readonly backOff = new BackOff(FIBONACCI_TIMEOUTS); private readonly backOff = new BackOff(FIBONACCI_TIMEOUTS);
@ -131,7 +138,21 @@ class UsernameIntegrityService {
runStorageServiceSyncJob(); runStorageServiceSyncJob();
} }
window.Whisper.events.once('storageService:syncComplete', () => { // Since we already run on storage service job queue - don't await the
// promise below (otherwise deadlock will happen).
drop(this.fixProfile());
}
private async fixProfile(): Promise<void> {
const { promise: once, resolve } = explodePromise<void>();
window.Whisper.events.once('storageService:syncComplete', () => resolve());
await pTimeout(once, STORAGE_SERVICE_TIMEOUT);
const me = window.ConversationController.getOurConversationOrThrow();
{
const localValue = isSharingPhoneNumberWithEverybody(); const localValue = isSharingPhoneNumberWithEverybody();
const remoteValue = !me.get('notSharingPhoneNumber'); const remoteValue = !me.get('notSharingPhoneNumber');
if (localValue === remoteValue) { if (localValue === remoteValue) {
@ -141,19 +162,31 @@ class UsernameIntegrityService {
); );
return; return;
} }
}
log.warn( log.warn(
'usernameIntegrity: phone number sharing mode conflict not resolved, ' + 'usernameIntegrity: phone number sharing mode conflict not resolved, ' +
'updating profile' 'updating profile'
); );
drop( const profileAvatarPath = getAbsoluteProfileAvatarPath(me.attributes);
writeProfile(getConversation(me), {
oldAvatar: undefined, let avatarBuffer: Uint8Array | undefined;
newAvatar: undefined, if (profileAvatarPath) {
}) try {
); avatarBuffer = await imagePathToBytes(profileAvatarPath);
} catch (error) {
log.error('usernameIntegrity: local avatar not found, aborting');
return;
}
}
await writeProfile(getConversation(me), {
oldAvatar: avatarBuffer,
newAvatar: avatarBuffer,
}); });
log.warn('usernameIntegrity: updated profile');
} }
} }