diff --git a/web/input/input-state-container.react.js b/web/input/input-state-container.react.js --- a/web/input/input-state-container.react.js +++ b/web/input/input-state-container.react.js @@ -1,6 +1,5 @@ // @flow -import { detect as detectBrowser } from 'detect-browser'; import invariant from 'invariant'; import _groupBy from 'lodash/fp/groupBy.js'; import _keyBy from 'lodash/fp/keyBy.js'; @@ -115,10 +114,6 @@ import { useSelector } from '../redux/redux-utils.js'; import { nonThreadCalendarQuery } from '../selectors/nav-selectors.js'; -const browser = detectBrowser(); -const exifRotate = - !browser || (browser.name !== 'safari' && browser.name !== 'chrome'); - type BaseProps = { +children: React.Node, }; @@ -746,7 +741,7 @@ let response; const validationStart = Date.now(); try { - response = await validateFile(file, exifRotate); + response = await validateFile(file); } catch (e) { return { steps, diff --git a/web/media/media-utils.js b/web/media/media-utils.js --- a/web/media/media-utils.js +++ b/web/media/media-utils.js @@ -1,5 +1,6 @@ // @flow +import { detect as detectBrowser } from 'detect-browser'; import * as React from 'react'; import { thumbHashToDataURL } from 'thumbhash'; @@ -96,10 +97,12 @@ uri: string, dimensions: ?Dimensions, }; -async function processFile( - file: File, - exifRotate: boolean, -): Promise<{ + +const browser = detectBrowser(); +const exifRotate = + !browser || (browser.name !== 'safari' && browser.name !== 'chrome'); + +async function processFile(file: File): Promise<{ steps: $ReadOnlyArray, result: MediaMissionFailure | ProcessFileSuccess, }> { @@ -201,16 +204,13 @@ uri: string, dimensions: ?Dimensions, }; -async function validateFile( - file: File, - exifRotate: boolean, -): Promise<{ +async function validateFile(file: File): Promise<{ steps: $ReadOnlyArray, result: MediaMissionFailure | FileValidationSuccess, }> { const [probeResponse, processResponse] = await Promise.all([ probeFile(file), - processFile(file, exifRotate), + processFile(file), ]); const { steps: probeSteps, result: probeResult } = probeResponse; const { steps: processSteps, result: processResult } = processResponse;