Page MenuHomePhorge
Files F32126714

D15507.1765023558.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D15507.1765023558.diff
View Options

diff --git a/native/account/restore-backup-screen.react.js b/native/account/restore-backup-screen.react.js
--- a/native/account/restore-backup-screen.react.js
+++ b/native/account/restore-backup-screen.react.js
@@ -1,9 +1,12 @@
// @flow
+import invariant from 'invariant';
import * as React from 'react';
import { Text, View } from 'react-native';
import * as Progress from 'react-native-progress';
+import { useUserDataRestoreContext } from 'lib/backup/user-data-restore-context.js';
+import { IdentityClientContext } from 'lib/shared/identity-client-context.js';
import type { SignedMessage } from 'lib/types/siwe-types.js';
import { getMessageForException } from 'lib/utils/errors.js';
import { useFullBackupSupportEnabled } from 'lib/utils/services-utils.js';
@@ -66,13 +69,18 @@
const performV1Login = useV1Login();
const fullBackupSupport = useFullBackupSupportEnabled();
- const restoreHasStarted = useSelector(
- state => state.restoreBackupState.status !== 'no_backup',
- );
+ const restoreBackupState = useSelector(state => state.restoreBackupState);
+
+ const restoreHasStarted = restoreBackupState.status !== 'no_backup';
+ const restoreFailedToStart =
+ restoreBackupState.status === 'user_keys_backup_success' &&
+ restoreBackupState.payload?.source === 'auth';
// Only start restoration if we have the necessary data
const shouldStartRestore = !!primaryRestoreInfo;
+ const inProgress = React.useRef(false);
+
React.useEffect(() => {
const removeListener = props.navigation.addListener('beforeRemove', e => {
if (e.data.action.type !== logInActionType) {
@@ -87,6 +95,7 @@
return;
}
const { userIdentifier, credentials } = primaryRestoreInfo;
+ inProgress.current = true;
let step;
const setStep = (newStep: string) => {
@@ -165,6 +174,8 @@
returnNavAction,
},
});
+ } finally {
+ inProgress.current = false;
}
})();
return removeListener;
@@ -173,6 +184,47 @@
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [shouldStartRestore]);
+ const { userDataRestore, isRestoring } = useUserDataRestoreContext();
+ const client = React.useContext(IdentityClientContext);
+ invariant(client, 'Identity context should be set');
+ const getAuthMetadata = client.getAuthMetadata;
+
+ React.useEffect(() => {
+ if (inProgress.current) {
+ return;
+ }
+ void (async () => {
+ inProgress.current = true;
+ if (!restoreFailedToStart || isRestoring) {
+ inProgress.current = false;
+ return;
+ }
+
+ try {
+ const { userID, accessToken } = await getAuthMetadata();
+ if (!userID || !accessToken) {
+ inProgress.current = false;
+ return;
+ }
+ const backupData = await commCoreModule.getQRAuthBackupData();
+ await userDataRestore(true, userID, accessToken, backupData);
+ } catch (e) {
+ const messageForException = getMessageForException(e);
+ console.log(
+ `Backup restore restart error: ${messageForException ?? 'unknown error'}`,
+ );
+ } finally {
+ inProgress.current = false;
+ }
+ })();
+ }, [
+ fullBackupSupport,
+ getAuthMetadata,
+ isRestoring,
+ restoreFailedToStart,
+ userDataRestore,
+ ]);
+
return (
<AuthContainer>
<AuthContentContainer style={styles.scrollViewContentContainer}>

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 6, 12:19 PM (18 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5837379
Default Alt Text
D15507.1765023558.diff (3 KB)

Event Timeline