Page MenuHomePhabricator
Files F3399870

D14056.diff
No OneTemporary
Actions

D14056.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,41 +2,60 @@
import * as React from 'react';
+import { useCheckIfPrimaryDevice } from 'lib/hooks/primary-device-hooks.js';
import { isLoggedIn } from 'lib/selectors/user-selectors.js';
+import { getMessageForException } from 'lib/utils/errors.js';
import { commCoreModule } from '../native-modules.js';
import { useSelector } from '../redux/redux-utils.js';
+import Alert from '../utils/alert.js';
import { useStaffCanSee } from '../utils/staff-utils.js';
function BackupHandler(): null {
- const isBackupEnabled = useSelector(
- state => state.localSettings.isBackupEnabled,
- );
const loggedIn = useSelector(isLoggedIn);
const staffCanSee = useStaffCanSee();
const isBackground = useSelector(
state => state.lifecycleState === 'background',
);
+ const canPerformBackupOperation = loggedIn && !isBackground;
+ const checkIfPrimaryDevice = useCheckIfPrimaryDevice();
React.useEffect(() => {
if (!staffCanSee) {
return;
}
- if (isBackupEnabled && loggedIn && !isBackground) {
- try {
- commCoreModule.startBackupHandler();
- } catch (err) {
- console.log('Error starting backup handler:', err);
+ void (async () => {
+ const isPrimaryDevice = await checkIfPrimaryDevice();
+ if (!isPrimaryDevice) {
+ return;
}
- } else {
- try {
- commCoreModule.stopBackupHandler();
- } catch (err) {
- console.log('Error stopping backup handler:', err);
+
+ if (canPerformBackupOperation) {
+ try {
+ commCoreModule.startBackupHandler();
+ } catch (err) {
+ const message = getMessageForException(err) ?? 'unknown error';
+ Alert.alert('Error starting backup handler', message);
+ console.log('Error starting backup handler:', message);
+ }
+ } else {
+ try {
+ commCoreModule.stopBackupHandler();
+ } catch (err) {
+ const message = getMessageForException(err) ?? 'unknown error';
+ Alert.alert('Error stopping backup handler', message);
+ console.log('Error stopping backup handler:', message);
+ }
}
- }
- }, [isBackupEnabled, staffCanSee, loggedIn, isBackground]);
+ })();
+ }, [
+ staffCanSee,
+ loggedIn,
+ isBackground,
+ checkIfPrimaryDevice,
+ canPerformBackupOperation,
+ ]);
return null;
}

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 3, 5:03 AM (14 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2610337
Default Alt Text
D14056.diff (2 KB)

Event Timeline