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

Remove unused storage keys

Browse source
This commit is contained in:
Fedor Indutny 2024-03-08 16:53:29 -08:00 committed by GitHub
parent 39fbf6b0bd
commit b410d14753
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ts/background.ts
View file

@ -53,7 +53,7 @@ import * as KeyboardLayout from './services/keyboardLayout';
import * as StorageService from './services/storage'; import * as StorageService from './services/storage';
import { usernameIntegrity } from './services/usernameIntegrity'; import { usernameIntegrity } from './services/usernameIntegrity';
import { RoutineProfileRefresher } from './routineProfileRefresh'; import { RoutineProfileRefresher } from './routineProfileRefresh';
import { isOlderThan, toDayMillis } from './util/timestamp'; import { isOlderThan } from './util/timestamp';
import { isValidReactionEmoji } from './reactions/isValidReactionEmoji'; import { isValidReactionEmoji } from './reactions/isValidReactionEmoji';
import type { ConversationModel } from './models/conversations'; import type { ConversationModel } from './models/conversations';
import { getContact, isIncoming } from './messages/helpers'; import { getContact, isIncoming } from './messages/helpers';
@ -826,27 +826,6 @@ export async function startApp(): Promise<void> {
window.document.body.classList.remove('window-focused') window.document.body.classList.remove('window-focused')
); );
// How long since we were last running?
const lastHeartbeat = toDayMillis(window.storage.get('lastHeartbeat', 0));
const previousLastStartup = window.storage.get('lastStartup');
await window.storage.put('lastStartup', Date.now());
const THIRTY_DAYS = 30 * 24 * 60 * 60 * 1000;
if (lastHeartbeat > 0 && isOlderThan(lastHeartbeat, THIRTY_DAYS)) {
log.warn(
`This instance has not been used for 30 days. Last heartbeat: ${lastHeartbeat}. Last startup: ${previousLastStartup}.`
);
await unlinkAndDisconnect();
}
// Start heartbeat timer
await window.storage.put('lastHeartbeat', toDayMillis(Date.now()));
const TWELVE_HOURS = 12 * 60 * 60 * 1000;
setInterval(
() => window.storage.put('lastHeartbeat', toDayMillis(Date.now())),
TWELVE_HOURS
);
const currentVersion = window.getVersion(); const currentVersion = window.getVersion();
lastVersion = window.storage.get('version'); lastVersion = window.storage.get('version');
newVersion = !lastVersion || currentVersion !== lastVersion; newVersion = !lastVersion || currentVersion !== lastVersion;
@ -954,6 +933,11 @@ export async function startApp(): Promise<void> {
window.SignalContext.restartApp(); window.SignalContext.restartApp();
return; return;
} }
if (window.isBeforeVersion(lastVersion, 'v7.3.0-beta.1')) {
await window.storage.remove('lastHeartbeat');
await window.storage.remove('lastStartup');
}
} }
setAppLoadingScreenMessage( setAppLoadingScreenMessage(

4
ts/types/Storage.d.ts vendored
View file

@ -77,8 +77,6 @@ export type StorageAccessType = {
hasStoriesDisabled: boolean; hasStoriesDisabled: boolean;
storyViewReceiptsEnabled: boolean; storyViewReceiptsEnabled: boolean;
identityKeyMap: IdentityKeyMap; identityKeyMap: IdentityKeyMap;
lastHeartbeat: number;
lastStartup: number;
lastAttemptedToRefreshProfilesAt: number; lastAttemptedToRefreshProfilesAt: number;
lastResortKeyUpdateTime: number; lastResortKeyUpdateTime: number;
lastResortKeyUpdateTimePNI: number; lastResortKeyUpdateTimePNI: number;
@ -172,6 +170,8 @@ export type StorageAccessType = {
senderCertificateWithUuid: never; senderCertificateWithUuid: never;
signaling_key: never; signaling_key: never;
signedKeyRotationRejected: number; signedKeyRotationRejected: number;
lastHeartbeat: never;
lastStartup: never;
}; };
export type StorageInterface = { export type StorageInterface = {