Page MenuHomePhorge
Files F32223330

D14431.1765208273.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D14431.1765208273.diff
View Options

diff --git a/native/account/qr-auth/primary-device-qr-auth-context-provider.js b/native/account/qr-auth/primary-device-qr-auth-context-provider.js
--- a/native/account/qr-auth/primary-device-qr-auth-context-provider.js
+++ b/native/account/qr-auth/primary-device-qr-auth-context-provider.js
@@ -29,6 +29,7 @@
} from 'lib/types/tunnelbroker/peer-to-peer-message-types.js';
import { qrCodeAuthMessageTypes } from 'lib/types/tunnelbroker/qr-code-auth-message-types.js';
import { getMessageForException } from 'lib/utils/errors.js';
+import { ignorePromiseRejections } from 'lib/utils/promises.js';
import { PrimaryDeviceQRAuthContext } from './primary-device-qr-auth-context.js';
import { commCoreModule } from '../../native-modules.js';
@@ -136,6 +137,7 @@
}, [addListener, removeListener, tunnelbrokerMessageListener]);
const processDeviceListUpdate = React.useCallback(async () => {
+ let deviceListHasBeenUpdated = false;
try {
const { deviceID: primaryDeviceID, userID } =
await identityContext.getAuthMetadata();
@@ -173,6 +175,7 @@
};
const handleReplaceDevice = async () => {
+ let keyserverHasBeenReplaced = false;
try {
if (!keyserverDeviceID) {
throw new Error('missing keyserver device ID');
@@ -182,6 +185,7 @@
deviceIDToRemove: keyserverDeviceID,
newDeviceID: targetDeviceID,
});
+ keyserverHasBeenReplaced = true;
await sendDeviceListUpdateSuccessMessage();
} catch (err) {
addLog(
@@ -189,6 +193,14 @@
` with ${targetDeviceID}: `,
getMessageForException(err) ?? 'unknown error',
);
+ if (keyserverHasBeenReplaced) {
+ ignorePromiseRejections(
+ runDeviceListUpdate({
+ type: 'remove',
+ deviceID: targetDeviceID,
+ }),
+ );
+ }
Alert.alert(
'Adding device failed',
@@ -208,6 +220,7 @@
type: 'add',
deviceID: targetDeviceID,
});
+ deviceListHasBeenUpdated = true;
await sendDeviceListUpdateSuccessMessage();
return;
}
@@ -236,6 +249,14 @@
`Error adding device ${targetDeviceID ?? ''}`,
getMessageForException(err) ?? 'unknown error',
);
+ if (targetDeviceID && deviceListHasBeenUpdated) {
+ ignorePromiseRejections(
+ runDeviceListUpdate({
+ type: 'remove',
+ deviceID: targetDeviceID,
+ }),
+ );
+ }
Alert.alert('Adding device failed', 'Failed to update the device list', [
{ text: 'OK' },

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 8, 3:37 PM (8 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5848903
Default Alt Text
D14431.1765208273.diff (2 KB)

Event Timeline