Page MenuHomePhabricator
Files F3523556

D14059.id46200.diff
No OneTemporary
Actions

D14059.id46200.diff
View Options

diff --git a/native/backup/backup-handler.js b/native/backup/backup-handler.js
--- a/native/backup/backup-handler.js
+++ b/native/backup/backup-handler.js
@@ -2,11 +2,14 @@
import * as React from 'react';
+import { createUserKeysBackupActionTypes } from 'lib/actions/backup-actions.js';
import { useCheckIfPrimaryDevice } from 'lib/hooks/primary-device-hooks.js';
import { isLoggedIn } from 'lib/selectors/user-selectors.js';
import { useStaffAlert } from 'lib/shared/staff-utils.js';
import { getMessageForException } from 'lib/utils/errors.js';
+import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js';
+import { useClientBackup } from './use-client-backup.js';
import { commCoreModule } from '../native-modules.js';
import { useSelector } from '../redux/redux-utils.js';
import { useStaffCanSee } from '../utils/staff-utils.js';
@@ -20,6 +23,13 @@
const canPerformBackupOperation = loggedIn && !isBackground;
const checkIfPrimaryDevice = useCheckIfPrimaryDevice();
const { showAlertToStaff } = useStaffAlert();
+ const latestBackupInfo = useSelector(
+ state => state.backupStore.latestBackupInfo,
+ );
+ const dispatchActionPromise = useDispatchActionPromise();
+ const { createUserKeysBackup } = useClientBackup();
+ const backupUploadInProgress = React.useRef<boolean>(false);
+ const [handlerStarted, setHandlerStarted] = React.useState(false);
React.useEffect(() => {
if (!staffCanSee) {
@@ -32,17 +42,21 @@
return;
}
- if (canPerformBackupOperation) {
+ if (!handlerStarted && canPerformBackupOperation) {
try {
commCoreModule.startBackupHandler();
+ setHandlerStarted(true);
} catch (err) {
const message = getMessageForException(err) ?? 'unknown error';
showAlertToStaff('Error starting backup handler', message);
console.log('Error starting backup handler:', message);
}
- } else {
+ }
+
+ if (handlerStarted && !canPerformBackupOperation) {
try {
commCoreModule.stopBackupHandler();
+ setHandlerStarted(false);
} catch (err) {
const message = getMessageForException(err) ?? 'unknown error';
showAlertToStaff('Error stopping backup handler', message);
@@ -51,12 +65,58 @@
}
})();
}, [
- staffCanSee,
- loggedIn,
- isBackground,
+ canPerformBackupOperation,
checkIfPrimaryDevice,
+ handlerStarted,
+ showAlertToStaff,
+ staffCanSee,
+ ]);
+
+ React.useEffect(() => {
+ if (
+ !staffCanSee ||
+ !canPerformBackupOperation ||
+ !handlerStarted ||
+ backupUploadInProgress.current ||
+ !!latestBackupInfo
+ ) {
+ return;
+ }
+
+ void (async () => {
+ backupUploadInProgress.current = true;
+ const isPrimaryDevice = await checkIfPrimaryDevice();
+ if (!isPrimaryDevice) {
+ backupUploadInProgress.current = false;
+ return;
+ }
+
+ try {
+ const promise = (async () => {
+ const backupID = await createUserKeysBackup();
+ return {
+ backupID,
+ timestamp: Date.now(),
+ };
+ })();
+ void dispatchActionPromise(createUserKeysBackupActionTypes, promise);
+ await promise;
+ } catch (err) {
+ const message = getMessageForException(err) ?? 'unknown error';
+ showAlertToStaff('Error creating User Keys backup', message);
+ console.log('Error creating User Keys backup:', message);
+ }
+ backupUploadInProgress.current = false;
+ })();
+ }, [
canPerformBackupOperation,
+ checkIfPrimaryDevice,
+ createUserKeysBackup,
+ dispatchActionPromise,
+ handlerStarted,
+ latestBackupInfo,
showAlertToStaff,
+ staffCanSee,
]);
return null;

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 24, 9:42 AM (3 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2698392
Default Alt Text
D14059.id46200.diff (3 KB)

Event Timeline