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

Ignore empty e164 in storage service

Browse source
This commit is contained in:
Fedor Indutny 2021-08-06 11:20:11 -07:00 committed by GitHub
parent 9db8765b6c
commit cc5da98565
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ts/background.ts
View file

@ -1267,9 +1267,14 @@ export async function startApp(): Promise<void> {
const newDeviceId = window.textsecure.storage.user.getDeviceId(); const newDeviceId = window.textsecure.storage.user.getDeviceId();
const newNumber = window.textsecure.storage.user.getNumber(); const newNumber = window.textsecure.storage.user.getNumber();
const newUuid = window.textsecure.storage.user.getUuid(); const newUuid = window.textsecure.storage.user.getUuid();
const ourConversation = window.ConversationController.getOurConversation();
if (ourConversation?.get('e164') !== newNumber) {
ourConversation?.set('e164', newNumber);
}
window.reduxActions.user.userChanged({ window.reduxActions.user.userChanged({
ourConversationId: window.ConversationController.getOurConversationId(), ourConversationId: ourConversation?.get('id'),
ourDeviceId: newDeviceId, ourDeviceId: newDeviceId,
ourNumber: newNumber, ourNumber: newNumber,
ourUuid: newUuid, ourUuid: newUuid,
@ -1879,6 +1884,15 @@ export async function startApp(): Promise<void> {
window.Signal.challengeHandler = challengeHandler; window.Signal.challengeHandler = challengeHandler;
if (!window.storage.user.getNumber()) {
const ourConversation = window.ConversationController.getOurConversation();
const ourE164 = ourConversation?.get('e164');
if (ourE164) {
window.log.warn('Restoring E164 from our conversation');
window.storage.user.setNumber(ourE164);
}
}
window.dispatchEvent(new Event('storage_ready')); window.dispatchEvent(new Event('storage_ready'));
window.log.info('Expiration start timestamp cleanup: starting...'); window.log.info('Expiration start timestamp cleanup: starting...');

2
ts/services/storageRecordOps.ts
View file

@ -854,7 +854,7 @@ export async function mergeAccountRecord(
window.storage.put('primarySendsSms', primarySendsSms); window.storage.put('primarySendsSms', primarySendsSms);
} }
if (typeof accountE164 === 'string') { if (typeof accountE164 === 'string' && accountE164) {
window.storage.put('accountE164', accountE164); window.storage.put('accountE164', accountE164);
window.storage.user.setNumber(accountE164); window.storage.user.setNumber(accountE164);
} }