Page MenuHomePhabricator
Files F3399992

D7338.diff
No OneTemporary
Actions

D7338.diff
View Options

diff --git a/native/redux/persist.js b/native/redux/persist.js
--- a/native/redux/persist.js
+++ b/native/redux/persist.js
@@ -13,10 +13,7 @@
getContainingThreadID,
getCommunity,
} from 'lib/shared/thread-utils.js';
-import {
- DEPRECATED_unshimMessageStore,
- unshimFunc,
-} from 'lib/shared/unshim-utils.js';
+import { DEPRECATED_unshimMessageStore } from 'lib/shared/unshim-utils.js';
import { defaultEnabledApps } from 'lib/types/enabled-apps.js';
import { defaultCalendarFilters } from 'lib/types/filter-types.js';
import {
@@ -24,18 +21,15 @@
type MessageStore,
messageTypes,
type ClientDBMessageStoreOperation,
- type ClientDBMessageInfo,
} from 'lib/types/message-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js';
-import {
- translateClientDBMessageInfoToRawMessageInfo,
- translateRawMessageInfoToClientDBMessageInfo,
-} from 'lib/utils/message-ops-utils.js';
+import { translateRawMessageInfoToClientDBMessageInfo } from 'lib/utils/message-ops-utils.js';
import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js';
import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js';
import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js';
import type { AppState } from './state-types.js';
+import { unshimClientDB } from './unshim-utils.js';
import { commCoreModule } from '../native-modules.js';
import { defaultDeviceCameraInfo } from '../types/camera.js';
import { defaultGlobalThemeInfo } from '../types/themes.js';
@@ -390,90 +384,8 @@
}
return state;
},
- [32]: (state: AppState) => {
- // 1. Get messages from SQLite `messages` table.
- const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
-
- // 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
- const rawMessageInfos = clientDBMessageInfos.map(
- translateClientDBMessageInfoToRawMessageInfo,
- );
-
- // 3. "Unshim" translated `RawMessageInfo`s.
- const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
- unshimFunc(messageInfo, new Set([messageTypes.MULTIMEDIA])),
- );
-
- // 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
- const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
- translateRawMessageInfoToClientDBMessageInfo,
- );
-
- // 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
- // table and repopulate with unshimmed `ClientDBMessageInfo`s.
- const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
- {
- type: 'remove_all',
- },
- ...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
- type: 'replace',
- payload: message,
- })),
- ];
-
- // 6. Try processing `ClientDBMessageStoreOperation`s and log out if
- // `processMessageStoreOperationsSync(...)` throws an exception.
- try {
- commCoreModule.processMessageStoreOperationsSync(operations);
- } catch (exception) {
- console.log(exception);
- return { ...state, cookie: null };
- }
-
- return state;
- },
- [33]: (state: AppState) => {
- // 1. Get messages from SQLite `messages` table.
- const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
-
- // 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
- const rawMessageInfos = clientDBMessageInfos.map(
- translateClientDBMessageInfoToRawMessageInfo,
- );
-
- // 3. "Unshim" translated `RawMessageInfo`s.
- const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
- unshimFunc(messageInfo, new Set([messageTypes.REACTION])),
- );
-
- // 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
- const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
- translateRawMessageInfoToClientDBMessageInfo,
- );
-
- // 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
- // table and repopulate with unshimmed `ClientDBMessageInfo`s.
- const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
- {
- type: 'remove_all',
- },
- ...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
- type: 'replace',
- payload: message,
- })),
- ];
-
- // 6. Try processing `ClientDBMessageStoreOperation`s and log out if
- // `processMessageStoreOperationsSync(...)` throws an exception.
- try {
- commCoreModule.processMessageStoreOperationsSync(operations);
- } catch (exception) {
- console.log(exception);
- return { ...state, cookie: null };
- }
-
- return state;
- },
+ [32]: (state: AppState) => unshimClientDB(state, [messageTypes.MULTIMEDIA]),
+ [33]: (state: AppState) => unshimClientDB(state, [messageTypes.REACTION]),
[34]: state => {
const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state;
return stateSansThreadIDsToNotifIDs;
diff --git a/native/redux/unshim-utils.js b/native/redux/unshim-utils.js
new file mode 100644
--- /dev/null
+++ b/native/redux/unshim-utils.js
@@ -0,0 +1,63 @@
+// @flow
+
+import { unshimFunc } from 'lib/shared/unshim-utils.js';
+import type {
+ MessageType,
+ ClientDBMessageStoreOperation,
+ ClientDBMessageInfo,
+} from 'lib/types/message-types.js';
+import {
+ translateClientDBMessageInfoToRawMessageInfo,
+ translateRawMessageInfoToClientDBMessageInfo,
+} from 'lib/utils/message-ops-utils.js';
+
+import type { AppState } from './state-types.js';
+import { commCoreModule } from '../native-modules.js';
+
+function unshimClientDB(
+ state: AppState,
+ unshimTypes: $ReadOnlyArray<MessageType>,
+): AppState {
+ // 1. Get messages from SQLite `messages` table.
+ const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
+
+ // 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
+ const rawMessageInfos = clientDBMessageInfos.map(
+ translateClientDBMessageInfoToRawMessageInfo,
+ );
+
+ // 3. "Unshim" translated `RawMessageInfo`s.
+ const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
+ unshimFunc(messageInfo, new Set(unshimTypes)),
+ );
+
+ // 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
+ const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
+ translateRawMessageInfoToClientDBMessageInfo,
+ );
+
+ // 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
+ // table and repopulate with unshimmed `ClientDBMessageInfo`s.
+ const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
+ {
+ type: 'remove_all',
+ },
+ ...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
+ type: 'replace',
+ payload: message,
+ })),
+ ];
+
+ // 6. Try processing `ClientDBMessageStoreOperation`s and log out if
+ // `processMessageStoreOperationsSync(...)` throws an exception.
+ try {
+ commCoreModule.processMessageStoreOperationsSync(operations);
+ } catch (exception) {
+ console.log(exception);
+ return { ...state, cookie: null };
+ }
+
+ return state;
+}
+
+export { unshimClientDB };

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 3, 5:46 AM (21 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2610434
Default Alt Text
D7338.diff (7 KB)

Event Timeline