diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts index 08eb8944a6..35cdc17957 100644 --- a/ts/RemoteConfig.ts +++ b/ts/RemoteConfig.ts @@ -11,8 +11,6 @@ export type ConfigKeyType = | 'desktop.clientExpiration' | 'desktop.disableGV1' | 'desktop.groupCallOutboundRing' - | 'desktop.groupCalling' - | 'desktop.gv2' | 'desktop.internalUser' | 'desktop.messageCleanup' | 'desktop.mandatoryProfileSharing' @@ -25,8 +23,6 @@ export type ConfigKeyType = | 'desktop.sendSenderKey3' | 'desktop.showUserBadges2' | 'desktop.showUserBadges.beta' - | 'desktop.storage' - | 'desktop.storageWrite3' | 'desktop.usernames' | 'global.calling.maxGroupCallRingSize' | 'global.groupsv2.groupSizeHardLimit' diff --git a/ts/background.ts b/ts/background.ts index fdcc5607c3..d8104630fc 100644 --- a/ts/background.ts +++ b/ts/background.ts @@ -1838,55 +1838,6 @@ export async function startApp(): Promise { } ); - // Listen for changes to the `desktop.gv2` remote configuration flag - const removeGv2Listener = window.Signal.RemoteConfig.onChange( - 'desktop.gv2', - async ({ enabled }) => { - if (!enabled) { - return; - } - - // Erase current manifest version so we re-process storage service data - await window.storage.remove('manifestVersion'); - - // Kick off window.storage service fetch to grab GroupV2 information - await window.Signal.Services.runStorageServiceSyncJob(); - - // This is a one-time thing - removeGv2Listener(); - } - ); - - window.Signal.RemoteConfig.onChange( - 'desktop.storage', - async ({ enabled }) => { - if (!enabled) { - await window.storage.remove('storageKey'); - return; - } - - await window.storage.remove('manifestVersion'); - - if (window.ConversationController.areWePrimaryDevice()) { - log.warn( - 'onChange/desktop.storage: We are primary device; not sending key sync request' - ); - return; - } - - try { - await singleProtoJobQueue.add( - window.textsecure.messaging.getRequestKeySyncMessage() - ); - } catch (error) { - log.error( - 'desktop.storage/onChange: Failed to queue sync message', - Errors.toLogFormat(error) - ); - } - } - ); - if (resolveOnAppView) { resolveOnAppView(); resolveOnAppView = undefined; @@ -2237,6 +2188,17 @@ export async function startApp(): Promise { ); } } + + try { + await singleProtoJobQueue.add( + window.textsecure.messaging.getRequestKeySyncMessage() + ); + } catch (error) { + log.error( + 'Failed to queue request key sync message', + Errors.toLogFormat(error) + ); + } } window.storage.onready(async () => { diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts index 8e3121b68e..24d7047bf7 100644 --- a/ts/models/conversations.ts +++ b/ts/models/conversations.ts @@ -5039,14 +5039,6 @@ export class ConversationModel extends window.Backbone // [X] markedUnread // [X] dontNotifyForMentionsIfMuted captureChange(logMessage: string): void { - if (!window.Signal.RemoteConfig.isEnabled('desktop.storageWrite3')) { - log.info( - 'conversation.captureChange: Returning early; desktop.storageWrite3 is falsey' - ); - - return; - } - log.info('storageService[captureChange]', logMessage, this.idForLogging()); this.set({ needsStorageServiceSync: true });