jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't delete all data if e164 changes (focus on UUID if we have it)

This commit is contained in:
Scott Nonnenberg 2021-06-08 11:54:20 -07:00 committed by GitHub
parent a918b06841
commit 13371fbeb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ts/textsecure/AccountManager.ts
View File

@ -538,20 +538,23 @@ export default class AccountManager extends EventTarget {
{ accessKey }
);
const numberChanged = previousNumber && previousNumber !== number;
const uuidChanged = previousUuid && uuid && previousUuid !== uuid;
if (numberChanged || uuidChanged) {
if (numberChanged) {
window.log.warn(
'New number is different from old number; deleting all previous data'
);
}
// We only consider the number changed if we didn't have a UUID before
const numberChanged =
!previousUuid && previousNumber && previousNumber !== number;
if (uuidChanged || numberChanged) {
if (uuidChanged) {
window.log.warn(
'New uuid is different from old uuid; deleting all previous data'
);
}
if (numberChanged) {
window.log.warn(
'New number is different from old number; deleting all previous data'
);
}
try {
await window.textsecure.storage.protocol.removeAllData();