Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F2841969
D13109.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D13109.diff
View Options
diff --git a/lib/handlers/db-ops-handler.react.js b/lib/handlers/db-ops-handler.react.js
--- a/lib/handlers/db-ops-handler.react.js
+++ b/lib/handlers/db-ops-handler.react.js
@@ -6,7 +6,6 @@
import { usePeerToPeerCommunication } from '../tunnelbroker/peer-to-peer-context.js';
import { useTunnelbroker } from '../tunnelbroker/tunnelbroker-context.js';
import type { DBOpsEntry } from '../types/db-ops-types.js';
-import type { StoreOperations } from '../types/store-ops-types.js';
import {
type MessageProcessed,
peerToPeerMessageTypes,
@@ -16,13 +15,9 @@
import { getMessageForException } from '../utils/errors.js';
import { useDispatch, useSelector } from '../utils/redux-utils.js';
-type Props = {
- +processDBStoreOperations: StoreOperations => Promise<mixed>,
-};
-
-function DBOpsHandler(props: Props): React.Node {
+function DBOpsHandler(): React.Node {
const { sqliteAPI } = getConfig();
- const { processDBStoreOperations } = props;
+ const { processDBStoreOperations } = sqliteAPI;
const queueFront = useSelector(state => state.dbOpsStore.queuedOps[0]);
const prevQueueFront = React.useRef<?DBOpsEntry>(null);
const { sendMessageToDevice } = useTunnelbroker();
diff --git a/native/root.react.js b/native/root.react.js
--- a/native/root.react.js
+++ b/native/root.react.js
@@ -90,7 +90,7 @@
import { DimensionsUpdater } from './redux/dimensions-updater.react.js';
import { getPersistor } from './redux/persist.js';
import { store } from './redux/redux-setup.js';
-import { processDBStoreOperations, useSelector } from './redux/redux-utils.js';
+import { useSelector } from './redux/redux-utils.js';
import { RootContext } from './root-context.js';
import { MessageSearchProvider } from './search/search-provider.react.js';
import Socket from './socket.react.js';
@@ -286,7 +286,7 @@
<BackupHandler />
<IntegrityHandler />
<AccessTokenHandler />
- <DBOpsHandler processDBStoreOperations={processDBStoreOperations} />
+ <DBOpsHandler />
<UserInfosHandler />
<TunnelbrokerDeviceTokenHandler />
</>
diff --git a/web/app.react.js b/web/app.react.js
--- a/web/app.react.js
+++ b/web/app.react.js
@@ -24,6 +24,7 @@
import PlatformDetailsSynchronizer from 'lib/components/platform-details-synchronizer.react.js';
import { QRAuthProvider } from 'lib/components/qr-auth-provider.react.js';
import { StaffContextProvider } from 'lib/components/staff-provider.react.js';
+import { DBOpsHandler } from 'lib/handlers/db-ops-handler.react.js';
import { TunnelbrokerDeviceTokenHandler } from 'lib/handlers/tunnelbroker-device-token-handler.react.js';
import { UserInfosHandler } from 'lib/handlers/user-infos-handler.react.js';
import { IdentitySearchProvider } from 'lib/identity-search/identity-search-context.js';
@@ -54,7 +55,6 @@
import { MemberListSidebarProvider } from './chat/member-list-sidebar/member-list-sidebar-provider.react.js';
import { AutoJoinCommunityHandler } from './components/auto-join-community-handler.react.js';
import CommunitiesRefresher from './components/communities-refresher.react.js';
-import { DBOpsHandler } from './components/db-ops-handler.react.js';
import LogOutIfMissingCSATHandler from './components/log-out-if-missing-csat-handler.react.js';
import NavigationArrows from './components/navigation-arrows.react.js';
import MinVersionHandler from './components/version-handler.react.js';
diff --git a/web/components/db-ops-handler.react.js b/web/components/db-ops-handler.react.js
deleted file mode 100644
--- a/web/components/db-ops-handler.react.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// @flow
-
-import * as React from 'react';
-
-import { DBOpsHandler as BaseHandler } from 'lib/handlers/db-ops-handler.react.js';
-import type { StoreOperations } from 'lib/types/store-ops-types.js';
-
-import { processDBStoreOperations } from '../shared-worker/utils/store.js';
-
-function DBOpsHandler(): React.Node {
- const processOperations = React.useCallback(
- (ops: StoreOperations) => processDBStoreOperations(ops),
- [],
- );
- return <BaseHandler processDBStoreOperations={processOperations} />;
-}
-
-export { DBOpsHandler };
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Sep 30, 11:29 AM (19 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2205037
Default Alt Text
D13109.diff (4 KB)
Attached To
Mode
D13109: [lib][native] unify `DBOpsHandler` usage
Attached
Detach File
Event Timeline
Log In to Comment