Page MenuHomePhorge
Files F33320083

D14242.1768841702.diff
No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

D14242.1768841702.diff
View Options

diff --git a/lib/hooks/primary-device-hooks.js b/lib/hooks/primary-device-hooks.js
--- a/lib/hooks/primary-device-hooks.js
+++ b/lib/hooks/primary-device-hooks.js
@@ -3,7 +3,7 @@
import invariant from 'invariant';
import * as React from 'react';
-import { getOwnPeerDevices } from '../selectors/user-selectors.js';
+import { getOwnPeerDevices, isLoggedIn } from '../selectors/user-selectors.js';
import { IdentityClientContext } from '../shared/identity-client-context.js';
import { useSelector } from '../utils/redux-utils.js';
@@ -24,4 +24,36 @@
}, [getAuthMetadata, userDevicesInfos]);
}
-export { useCheckIfPrimaryDevice };
+type DeviceKind = 'primary' | 'secondary' | 'unknown';
+function useDeviceKind(): DeviceKind {
+ const identityContext = React.useContext(IdentityClientContext);
+ invariant(identityContext, 'identity context not set');
+ const { getAuthMetadata } = identityContext;
+
+ const userDevicesInfos = useSelector(getOwnPeerDevices);
+ const loggedIn = useSelector(isLoggedIn);
+
+ const [deviceKind, setDeviceKind] = React.useState<DeviceKind>('unknown');
+
+ React.useEffect(() => {
+ if (!loggedIn || userDevicesInfos.length === 0) {
+ setDeviceKind('unknown');
+ return;
+ }
+
+ const primaryDeviceID = userDevicesInfos[0].deviceID;
+
+ void (async () => {
+ const { deviceID } = await getAuthMetadata();
+ if (primaryDeviceID === deviceID) {
+ setDeviceKind('primary');
+ } else {
+ setDeviceKind('secondary');
+ }
+ })();
+ }, [getAuthMetadata, loggedIn, userDevicesInfos]);
+
+ return deviceKind;
+}
+
+export { useCheckIfPrimaryDevice, useDeviceKind };
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
@@ -8,7 +8,7 @@
useCurrentIdentityUserState,
type CurrentIdentityUserState,
} from 'lib/hooks/peer-list-hooks.js';
-import { useCheckIfPrimaryDevice } from 'lib/hooks/primary-device-hooks.js';
+import { useDeviceKind } from 'lib/hooks/primary-device-hooks.js';
import { isLoggedIn } from 'lib/selectors/user-selectors.js';
import { IdentityClientContext } from 'lib/shared/identity-client-context.js';
import { useStaffAlert } from 'lib/shared/staff-utils.js';
@@ -29,7 +29,7 @@
state => state.lifecycleState === 'background',
);
const canPerformBackupOperation = loggedIn && !isBackground;
- const checkIfPrimaryDevice = useCheckIfPrimaryDevice();
+ const deviceKind = useDeviceKind();
const { showAlertToStaff } = useStaffAlert();
const latestBackupInfo = useSelector(
state => state.backupStore.latestBackupInfo,
@@ -48,44 +48,38 @@
const migrateToNewFlow = useMigrationToNewFlow();
React.useEffect(() => {
- if (!staffCanSee || startingBackupHandlerInProgress.current) {
+ if (
+ !staffCanSee ||
+ startingBackupHandlerInProgress.current ||
+ deviceKind !== 'primary'
+ ) {
return;
}
- void (async () => {
- startingBackupHandlerInProgress.current = true;
- const isPrimaryDevice = await checkIfPrimaryDevice();
- if (!isPrimaryDevice) {
- startingBackupHandlerInProgress.current = false;
- return;
- }
-
- 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);
- }
+ 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);
}
+ }
- if (handlerStarted && !canPerformBackupOperation) {
- try {
- commCoreModule.stopBackupHandler();
- setHandlerStarted(false);
- } catch (err) {
- const message = getMessageForException(err) ?? 'unknown error';
- showAlertToStaff('Error stopping backup handler', message);
- console.log('Error stopping backup handler:', message);
- }
+ if (handlerStarted && !canPerformBackupOperation) {
+ try {
+ commCoreModule.stopBackupHandler();
+ setHandlerStarted(false);
+ } catch (err) {
+ const message = getMessageForException(err) ?? 'unknown error';
+ showAlertToStaff('Error stopping backup handler', message);
+ console.log('Error stopping backup handler:', message);
}
- startingBackupHandlerInProgress.current = false;
- })();
+ }
}, [
canPerformBackupOperation,
- checkIfPrimaryDevice,
+ deviceKind,
handlerStarted,
showAlertToStaff,
staffCanSee,
@@ -96,7 +90,8 @@
!staffCanSee ||
!canPerformBackupOperation ||
!handlerStarted ||
- backupUploadInProgress.current
+ backupUploadInProgress.current ||
+ deviceKind === 'unknown'
) {
return;
}
@@ -104,13 +99,9 @@
void (async () => {
backupUploadInProgress.current = true;
- let isPrimaryDevice, userID, deviceID;
+ let userID, deviceID;
try {
- const [isPrimaryDeviceResult, authMetadata] = await Promise.all([
- checkIfPrimaryDevice(),
- getAuthMetadata(),
- ]);
- isPrimaryDevice = isPrimaryDeviceResult;
+ const authMetadata = await getAuthMetadata();
userID = authMetadata.userID;
deviceID = authMetadata.deviceID;
} catch (e) {
@@ -141,7 +132,8 @@
// When this is a primary device and there is no latest backup it
// needs to be updated. This handles cases after restoration
// or after registration.
- const shouldCreateUserKeysBackup = isPrimaryDevice && !latestBackupInfo;
+ const shouldCreateUserKeysBackup =
+ deviceKind === 'primary' && !latestBackupInfo;
if (!shouldDoMigration && !shouldCreateUserKeysBackup) {
backupUploadInProgress.current = false;
@@ -184,8 +176,8 @@
})();
}, [
canPerformBackupOperation,
- checkIfPrimaryDevice,
createUserKeysBackup,
+ deviceKind,
dispatchActionPromise,
getAuthMetadata,
getCurrentIdentityUserState,

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 19, 4:55 PM (4 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5957356
Default Alt Text
D14242.1768841702.diff (6 KB)

Event Timeline