Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-05-20 06:39:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

RelinkDialog: Show something different when primary device

Browse Source
This commit is contained in:
Scott Nonnenberg
2026-04-28 23:54:53 +10:00
committed by GitHub
parent d791bb880c
commit 4b79efa033
14 changed files with 183 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ts/sql/Server.node.ts
+12 -3
View File
@@ -30,7 +30,10 @@ import type { ReactionType } from '../types/Reactions.std.ts';
import { ReactionReadStatus } from '../types/Reactions.std.ts';
import type { AciString, ServiceIdString } from '../types/ServiceId.std.ts';
import { isServiceIdString } from '../types/ServiceId.std.ts';
import { STORAGE_KEYS_TO_PRESERVE_AFTER_UNLINK } from '../types/StorageKeys.std.ts';
import {
STORAGE_KEYS_TO_PRESERVE_WHEN_PRIMARY,
STORAGE_KEYS_TO_PRESERVE_AFTER_UNLINK,
} from '../types/StorageKeys.std.ts';
import type { StoryDistributionIdString } from '../types/StoryDistributionId.std.ts';
import * as Errors from '../types/errors.std.ts';
import { assertDev, strictAssert } from '../util/assert.std.ts';
@@ -8546,7 +8549,7 @@ function removeAll(db: WritableDB): void {
}
// Anything that isn't user-visible data
function removeAllConfiguration(db: WritableDB): void {
function removeAllConfiguration(db: WritableDB, isPrimary: boolean): void {
db.transaction(() => {
db.exec(
`
@@ -8576,7 +8579,13 @@ function removeAllConfiguration(db: WritableDB): void {
})
.all();
const allowedSet = new Set<string>(STORAGE_KEYS_TO_PRESERVE_AFTER_UNLINK);
let allowedSet = new Set<string>(STORAGE_KEYS_TO_PRESERVE_AFTER_UNLINK);
if (isPrimary) {
allowedSet = allowedSet.union(
new Set<string>(STORAGE_KEYS_TO_PRESERVE_WHEN_PRIMARY)
);
}
for (const id of itemIds) {
if (!allowedSet.has(id)) {
removeById(db, 'items', id);