diff --git a/lib/ops/entries-store-ops.js b/lib/ops/entries-store-ops.js --- a/lib/ops/entries-store-ops.js +++ b/lib/ops/entries-store-ops.js @@ -44,6 +44,7 @@ export type ClientDBReplaceEntryOperation = { +type: 'replace_entry', +payload: ClientDBEntryInfo, + +isBackedUp: boolean, }; export type ClientDBEntryStoreOperation = @@ -120,6 +121,7 @@ return { type: 'replace_entry', payload: convertEntryInfoIntoClientDBEntryInfo(operation.payload), + isBackedUp: operation.payload.isBackedUp, }; }); }, diff --git a/lib/ops/entries-store-ops.test.js b/lib/ops/entries-store-ops.test.js --- a/lib/ops/entries-store-ops.test.js +++ b/lib/ops/entries-store-ops.test.js @@ -148,6 +148,7 @@ id: key, entry: JSON.stringify(entryStore.entryInfos[key]), }, + isBackedUp: false, }, ]); }); diff --git a/lib/ops/message-store-ops.js b/lib/ops/message-store-ops.js --- a/lib/ops/message-store-ops.js +++ b/lib/ops/message-store-ops.js @@ -80,16 +80,19 @@ export type ClientDBReplaceMessageOperation = { +type: 'replace', +payload: ClientDBMessageInfo, + +isBackedUp: boolean, }; export type ClientDBReplaceThreadsOperation = { +type: 'replace_threads', +payload: { +threads: $ReadOnlyArray }, + +isBackedUp: boolean, }; export type ClientDBReplaceLocalMessageInfoOperation = { +type: 'replace_local_message_info', +payload: ClientDBLocalMessageInfo, + +isBackedUp: boolean, }; export type MessageStoreOperation = @@ -201,6 +204,7 @@ payload: translateRawMessageInfoToClientDBMessageInfo( messageStoreOperation.payload.messageInfo, ), + isBackedUp: messageStoreOperation.payload.isBackedUp, }; } @@ -224,6 +228,7 @@ payload: { threads: dbThreadMessageInfos, }, + isBackedUp: messageStoreOperation.payload.isBackedUp, }; } else if (messageStoreOperation.type === 'replace_local_message_info') { return { @@ -234,6 +239,7 @@ messageStoreOperation.payload.localMessageInfo, ), }, + isBackedUp: messageStoreOperation.payload.isBackedUp, }; } return messageStoreOperation; diff --git a/lib/ops/thread-activity-store-ops.js b/lib/ops/thread-activity-store-ops.js --- a/lib/ops/thread-activity-store-ops.js +++ b/lib/ops/thread-activity-store-ops.js @@ -41,6 +41,7 @@ export type ClientDBReplaceThreadActivityEntryOperation = { +type: 'replace_thread_activity_entry', +payload: ClientDBThreadActivityEntry, + +isBackedUp: boolean, }; export type ClientDBThreadActivityStoreOperation = @@ -120,6 +121,7 @@ id, threadActivityStoreEntry, }), + isBackedUp: threadActivityStoreOperation.payload.isBackedUp, }; }); }, diff --git a/lib/ops/thread-store-ops.js b/lib/ops/thread-store-ops.js --- a/lib/ops/thread-store-ops.js +++ b/lib/ops/thread-store-ops.js @@ -34,6 +34,7 @@ export type ClientDBReplaceThreadOperation = { +type: 'replace', +payload: ClientDBThreadInfo, + +isBackedUp: boolean, }; export type ClientDBThreadStoreOperation = @@ -83,6 +84,7 @@ payload: convertRawThreadInfoToClientDBThreadInfo( threadStoreOperation.payload.threadInfo, ), + isBackedUp: threadStoreOperation.payload.isBackedUp, }; } return threadStoreOperation; diff --git a/native/redux/client-db-utils.js b/native/redux/client-db-utils.js --- a/native/redux/client-db-utils.js +++ b/native/redux/client-db-utils.js @@ -46,7 +46,7 @@ return state; } -function createUpdateDBOpsForMessageStoreMessages( +function deprecatedCreateUpdateDBOpsForMessageStoreMessages( clientDBMessageInfos: $ReadOnlyArray, migrationFunc: ( $ReadOnlyArray, @@ -62,6 +62,7 @@ convertedRawMessageInfos.map(messageInfo => ({ type: 'replace', payload: translateRawMessageInfoToClientDBMessageInfo(messageInfo), + isBackedUp: false, })); return [ @@ -72,7 +73,7 @@ ]; } -function createUpdateDBOpsForMessageStoreThreads( +function deprecatedCreateUpdateDBOpsForMessageStoreThreads( messageStoreThreads: $ReadOnlyArray, migrationFunc: TranslatedThreadMessageInfos => TranslatedThreadMessageInfos, ): $ReadOnlyArray { @@ -95,6 +96,7 @@ translateThreadMessageInfoToClientDBThreadMessageInfo(id, thread), ), }, + isBackedUp: false, }, ]; } @@ -102,6 +104,6 @@ export { updateClientDBThreadStoreThreadInfos, createUpdateDBOpsForThreadStoreThreadInfos, - createUpdateDBOpsForMessageStoreMessages, - createUpdateDBOpsForMessageStoreThreads, + deprecatedCreateUpdateDBOpsForMessageStoreMessages, + deprecatedCreateUpdateDBOpsForMessageStoreThreads, }; diff --git a/native/redux/deprecated-client-db-utils.js b/native/redux/deprecated-client-db-utils.js --- a/native/redux/deprecated-client-db-utils.js +++ b/native/redux/deprecated-client-db-utils.js @@ -86,6 +86,7 @@ ...convertedClientDBThreadInfos.map((thread: ClientDBThreadInfo) => ({ type: 'replace', payload: thread, + isBackedUp: false, })), ]; } diff --git a/native/redux/persist.js b/native/redux/persist.js --- a/native/redux/persist.js +++ b/native/redux/persist.js @@ -143,8 +143,8 @@ import { getUUID } from 'lib/utils/uuid.js'; import { - createUpdateDBOpsForMessageStoreMessages, - createUpdateDBOpsForMessageStoreThreads, + deprecatedCreateUpdateDBOpsForMessageStoreMessages, + deprecatedCreateUpdateDBOpsForMessageStoreThreads, updateClientDBThreadStoreThreadInfos, } from './client-db-utils.js'; import { defaultState } from './default-state.js'; @@ -518,6 +518,7 @@ ...Object.keys(messages).map((id: string) => ({ type: 'replace', payload: translateRawMessageInfoToClientDBMessageInfo(messages[id]), + isBackedUp: false, })), ]; try { @@ -630,6 +631,7 @@ ...convertedClientDBThreadInfos.map((thread: ClientDBThreadInfo) => ({ type: 'replace', payload: thread, + isBackedUp: false, })), ]; @@ -716,14 +718,15 @@ await commCoreModule.getClientDBStore(); const messageStoreThreadsOperations = - createUpdateDBOpsForMessageStoreThreads( + deprecatedCreateUpdateDBOpsForMessageStoreThreads( messageStoreThreads, convertMessageStoreThreadsToNewIDSchema, ); const messageStoreMessagesOperations = - createUpdateDBOpsForMessageStoreMessages(messages, messageInfos => - messageInfos.map(convertRawMessageInfoToNewIDSchema), + deprecatedCreateUpdateDBOpsForMessageStoreMessages( + messages, + messageInfos => messageInfos.map(convertRawMessageInfoToNewIDSchema), ); const threadOperations = @@ -1051,6 +1054,7 @@ ...convertedClientDBThreadInfos.map((thread: ClientDBThreadInfo) => ({ type: 'replace', payload: thread, + isBackedUp: false, })), ]; diff --git a/web/redux/persist.js b/web/redux/persist.js --- a/web/redux/persist.js +++ b/web/redux/persist.js @@ -481,6 +481,7 @@ threadStoreOperations.push({ type: 'replace', payload: clientDBThreadInfo, + isBackedUp: false, }); }