diff --git a/lib/gui/app/components/settings/settings.tsx b/lib/gui/app/components/settings/settings.tsx index 5feec15e..6ade247b 100644 --- a/lib/gui/app/components/settings/settings.tsx +++ b/lib/gui/app/components/settings/settings.tsx @@ -54,10 +54,6 @@ async function getSettingsList(): Promise { */ label: `${platform === 'win32' ? 'Eject' : 'Auto-unmount'} on success`, }, - { - name: 'validateWriteOnSuccess', - label: 'Validate write on success', - }, { name: 'updatesEnabled', label: 'Auto-updates enabled', diff --git a/lib/gui/app/models/settings.ts b/lib/gui/app/models/settings.ts index 219a3e08..5c7b5ee9 100644 --- a/lib/gui/app/models/settings.ts +++ b/lib/gui/app/models/settings.ts @@ -78,7 +78,6 @@ export async function writeConfigFile( const DEFAULT_SETTINGS: _.Dictionary = { errorReporting: true, unmountOnSuccess: true, - validateWriteOnSuccess: true, updatesEnabled: !_.includes(['rpm', 'deb'], packageJSON.packageType), desktopNotifications: true, autoBlockmapping: true, diff --git a/lib/gui/app/modules/image-writer.ts b/lib/gui/app/modules/image-writer.ts index 6a11b918..c8034267 100644 --- a/lib/gui/app/modules/image-writer.ts +++ b/lib/gui/app/modules/image-writer.ts @@ -145,7 +145,6 @@ async function performWrite( ipc.serve(); const { unmountOnSuccess, - validateWriteOnSuccess, autoBlockmapping, decompressFirst, } = await settings.getAll(); @@ -168,7 +167,6 @@ async function performWrite( uuid: flashState.getFlashUuid(), flashInstanceUuid: flashState.getFlashUuid(), unmountOnSuccess, - validateWriteOnSuccess, }; ipc.server.on('fail', ({ device, error }) => { @@ -202,7 +200,6 @@ async function performWrite( image, destinations: drives, SourceType: image.SourceType.name, - validateWriteOnSuccess, autoBlockmapping, unmountOnSuccess, decompressFirst, @@ -284,7 +281,6 @@ export async function flash( status: 'started', flashInstanceUuid: flashState.getFlashUuid(), unmountOnSuccess: await settings.get('unmountOnSuccess'), - validateWriteOnSuccess: await settings.get('validateWriteOnSuccess'), }; analytics.logEvent('Flash', analyticsData); @@ -340,7 +336,6 @@ export async function cancel(type: string) { uuid: flashState.getFlashUuid(), flashInstanceUuid: flashState.getFlashUuid(), unmountOnSuccess: await settings.get('unmountOnSuccess'), - validateWriteOnSuccess: await settings.get('validateWriteOnSuccess'), status, }; analytics.logEvent('Cancel', analyticsData); diff --git a/lib/gui/modules/child-writer.ts b/lib/gui/modules/child-writer.ts index 7f6b0d47..d3939683 100644 --- a/lib/gui/modules/child-writer.ts +++ b/lib/gui/modules/child-writer.ts @@ -161,7 +161,6 @@ interface WriteOptions { image: SourceMetadata; destinations: DrivelistDrive[]; unmountOnSuccess: boolean; - validateWriteOnSuccess: boolean; autoBlockmapping: boolean; decompressFirst: boolean; SourceType: string; @@ -255,7 +254,6 @@ ipc.connectTo(IPC_SERVER_ID, () => { log(`Image: ${imagePath}`); log(`Devices: ${destinations.join(', ')}`); log(`Umount on success: ${options.unmountOnSuccess}`); - log(`Validate on success: ${options.validateWriteOnSuccess}`); log(`Auto blockmapping: ${options.autoBlockmapping}`); log(`Decompress first: ${options.decompressFirst}`); const dests = options.destinations.map((destination) => { @@ -286,7 +284,7 @@ ipc.connectTo(IPC_SERVER_ID, () => { const results = await writeAndValidate({ source, destinations: dests, - verify: options.validateWriteOnSuccess, + verify: true, autoBlockmapping: options.autoBlockmapping, decompressFirst: options.decompressFirst, onProgress, diff --git a/tests/gui/modules/progress-status.spec.ts b/tests/gui/modules/progress-status.spec.ts index c337d82c..b892904b 100644 --- a/tests/gui/modules/progress-status.spec.ts +++ b/tests/gui/modules/progress-status.spec.ts @@ -32,7 +32,6 @@ describe('Browser: progressStatus', function () { }; settings.set('unmountOnSuccess', true); - settings.set('validateWriteOnSuccess', true); }); it('should report 0% if percentage == 0 but speed != 0', function () { @@ -105,25 +104,16 @@ describe('Browser: progressStatus', function () { ); }); - it('should handle percentage == 100, flashing, unmountOnSuccess, validateWriteOnSuccess', function () { + it('should handle percentage == 100, flashing, unmountOnSuccess', function () { this.state.percentage = 100; expect(progressStatus.titleFromFlashState(this.state)).to.equal( 'Finishing...', ); }); - it('should handle percentage == 100, flashing, unmountOnSuccess, !validateWriteOnSuccess', function () { - this.state.percentage = 100; - settings.set('validateWriteOnSuccess', false); - expect(progressStatus.titleFromFlashState(this.state)).to.equal( - 'Finishing...', - ); - }); - - it('should handle percentage == 100, flashing, !unmountOnSuccess, !validateWriteOnSuccess', function () { + it('should handle percentage == 100, flashing, !unmountOnSuccess', function () { this.state.percentage = 100; settings.set('unmountOnSuccess', false); - settings.set('validateWriteOnSuccess', false); expect(progressStatus.titleFromFlashState(this.state)).to.equal( 'Finishing...', );