From d844c5141ec9241a1905b14d88d107987d334aeb Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 19 Feb 2021 10:35:11 +1100 Subject: [PATCH] remove unprocessed from store. Nothing was stored in the store it was simply as passthrough to the Data file. No we directly call the data file instead --- Gruntfile.js | 2 -- libtextsecure/storage/unprocessed.js | 39 ---------------------------- ts/receiver/cache.ts | 38 +++++++++++++++------------ ts/receiver/receiver.ts | 2 +- ts/session/utils/syncUtils.ts | 2 +- 5 files changed, 23 insertions(+), 60 deletions(-) delete mode 100644 libtextsecure/storage/unprocessed.js diff --git a/Gruntfile.js b/Gruntfile.js index 557e0085b..d09285c67 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -76,12 +76,10 @@ module.exports = grunt => { 'libtextsecure/errors.js', 'libtextsecure/libsignal-protocol.js', 'libtextsecure/protocol_wrapper.js', - 'libtextsecure/crypto.js', 'libtextsecure/storage.js', 'libtextsecure/storage/user.js', 'libtextsecure/storage/groups.js', - 'libtextsecure/storage/unprocessed.js', 'libtextsecure/protobufs.js', 'libtextsecure/helpers.js', 'libtextsecure/stringview.js', diff --git a/libtextsecure/storage/unprocessed.js b/libtextsecure/storage/unprocessed.js deleted file mode 100644 index d32603159..000000000 --- a/libtextsecure/storage/unprocessed.js +++ /dev/null @@ -1,39 +0,0 @@ -/* global window */ - -// eslint-disable-next-line func-names -(function() { - /** *************************************** - *** Not-yet-processed message storage *** - **************************************** */ - window.textsecure = window.textsecure || {}; - window.textsecure.storage = window.textsecure.storage || {}; - - window.textsecure.storage.unprocessed = { - getCount() { - return window.Signal.Data.getUnprocessedCount(); - }, - getAll() { - return window.Signal.Data.getAllUnprocessed(); - }, - get(id) { - return window.Signal.Data.getUnprocessedById(id); - }, - add(data) { - return window.Signal.Data.saveUnprocessed(data, { - forceSave: true, - }); - }, - updateAttempts(id, attempts) { - return window.Signal.Data.updateUnprocessedAttempts(id, attempts); - }, - addDecryptedData(id, data) { - return window.Signal.Data.updateUnprocessedWithData(id, data); - }, - remove(id) { - return window.Signal.Data.removeUnprocessed(id); - }, - removeAll() { - return window.Signal.Data.removeAllUnprocessed(); - }, - }; -})(); diff --git a/ts/receiver/cache.ts b/ts/receiver/cache.ts index 02a0c2be9..6c94fe805 100644 --- a/ts/receiver/cache.ts +++ b/ts/receiver/cache.ts @@ -1,12 +1,22 @@ import { EnvelopePlus } from './types'; import { StringUtils } from '../session/utils'; import _ from 'lodash'; +import { + getAllUnprocessed, + getUnprocessedById, + getUnprocessedCount, + removeAllUnprocessed, + removeUnprocessed, + saveUnprocessed, + updateUnprocessedAttempts, + updateUnprocessedWithData, +} from '../data/data'; export async function removeFromCache(envelope: EnvelopePlus) { const { id } = envelope; window.log.info(`removing from cache envelope: ${id}`); - return window.textsecure.storage.unprocessed.remove(id); + return removeUnprocessed(id); } export async function addToCache( @@ -28,23 +38,23 @@ export async function addToCache( data.senderIdentity = envelope.senderIdentity; } - return window.textsecure.storage.unprocessed.add(data); + return saveUnprocessed(data, { forceSave: true }); } async function fetchAllFromCache(): Promise> { const { textsecure } = window; - const count = await textsecure.storage.unprocessed.getCount(); + const count = await getUnprocessedCount(); if (count > 1500) { - await textsecure.storage.unprocessed.removeAll(); + await removeAllUnprocessed(); window.log.warn( `There were ${count} messages in cache. Deleted all instead of reprocessing` ); return []; } - const items = await textsecure.storage.unprocessed.getAll(); + const items = await getAllUnprocessed(); return items; } @@ -65,12 +75,9 @@ export async function getAllFromCache() { 'getAllFromCache final attempt for envelope', item.id ); - await textsecure.storage.unprocessed.remove(item.id); + await removeUnprocessed(item.id); } else { - await textsecure.storage.unprocessed.updateAttempts( - item.id, - attempts - ); + await updateUnprocessedAttempts(item.id, attempts); } } catch (error) { window.log.error( @@ -109,12 +116,9 @@ export async function getAllFromCacheForSource(source: string) { 'getAllFromCache final attempt for envelope', item.id ); - await textsecure.storage.unprocessed.remove(item.id); + await removeUnprocessed(item.id); } else { - await textsecure.storage.unprocessed.updateAttempts( - item.id, - attempts - ); + await updateUnprocessedAttempts(item.id, attempts); } } catch (error) { window.log.error( @@ -133,7 +137,7 @@ export async function updateCache( plaintext: ArrayBuffer ): Promise { const { id } = envelope; - const item = await window.textsecure.storage.unprocessed.get(id); + const item = await getUnprocessedById(id); if (!item) { window.log.error(`updateCache: Didn't find item ${id} in cache to update`); return; @@ -148,5 +152,5 @@ export async function updateCache( item.decrypted = StringUtils.decode(plaintext, 'base64'); - return window.textsecure.storage.unprocessed.addDecryptedData(item.id, item); + return updateUnprocessedWithData(item.id, item); } diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts index cbea0a2cf..982ca0f60 100644 --- a/ts/receiver/receiver.ts +++ b/ts/receiver/receiver.ts @@ -233,7 +233,7 @@ async function queueCached(item: any) { try { const { id } = item; - await textsecure.storage.unprocessed.remove(id); + await removeUnprocessed(id); } catch (deleteError) { window.log.error( 'queueCached error deleting item', diff --git a/ts/session/utils/syncUtils.ts b/ts/session/utils/syncUtils.ts index d8cba68b6..e9ab76191 100644 --- a/ts/session/utils/syncUtils.ts +++ b/ts/session/utils/syncUtils.ts @@ -25,7 +25,7 @@ export const syncConfigurationIfNeeded = async () => { const allConvos = ConversationController.getInstance().getConversations(); const configMessage = await getCurrentConfigurationMessage(allConvos); try { - window.log.info('syncConfigurationIfNeeded with', configMessage); + // window.log.info('syncConfigurationIfNeeded with', configMessage); await getMessageQueue().sendSyncMessage(configMessage); } catch (e) {