Fix failed to load PDF error color and translation #13409
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,11 +5,13 @@ import KeyboardAvoidingView from '../KeyboardAvoidingView'; | |
| import styles from '../../styles/styles'; | ||
| import * as StyleUtils from '../../styles/StyleUtils'; | ||
| import FullScreenLoadingIndicator from '../FullscreenLoadingIndicator'; | ||
| import Text from '../Text'; | ||
| import PDFPasswordForm from './PDFPasswordForm'; | ||
| import * as pdfViewPropTypes from './pdfViewPropTypes'; | ||
| import compose from '../../libs/compose'; | ||
| import withWindowDimensions from '../withWindowDimensions'; | ||
| import withKeyboardState from '../withKeyboardState'; | ||
| import withLocalize from '../withLocalize'; | ||
|
|
||
| /** | ||
| * On the native layer, we use react-native-pdf/PDF to display PDFs. If a PDF is | ||
|
|
@@ -30,41 +32,49 @@ class PDFView extends Component { | |
| super(props); | ||
| this.state = { | ||
| shouldRequestPassword: false, | ||
| shouldAttemptPDFLoad: true, | ||
| shouldShowLoadingIndicator: true, | ||
| isPasswordInvalid: false, | ||
| failedToLoadPDF: false, | ||
| password: '', | ||
| }; | ||
| this.initiatePasswordChallenge = this.initiatePasswordChallenge.bind(this); | ||
| this.attemptPDFLoadWithPassword = this.attemptPDFLoadWithPassword.bind(this); | ||
| this.finishPDFLoad = this.finishPDFLoad.bind(this); | ||
| this.handleFailureToLoadPDF = this.handleFailureToLoadPDF.bind(this); | ||
| } | ||
|
|
||
| componentDidUpdate() { | ||
| this.props.onToggleKeyboard(this.props.isShown); | ||
| } | ||
|
|
||
| handleFailureToLoadPDF(error) { | ||
| if (error.message.match(/password/i)) { | ||
| this.initiatePasswordChallenge(); | ||
|
Contributor
There was a problem hiding this comment. Curious, what is this check doing?
Contributor
Author
There was a problem hiding this comment. This was from the previous code to handle password protected PDFs. I didn't test it, but I'm guessing that if the PDF is password protected the error message will contain the word password. |
||
| return; | ||
| } | ||
|
|
||
| this.setState({ | ||
| failedToLoadPDF: true, | ||
| shouldAttemptPDFLoad: false, | ||
|
Member
There was a problem hiding this comment. Beep boop 🤖 🐧 We should have also set the following states when handling a failed PDF. shouldRequestPassword: false,
shouldShowLoadingIndicator: false |
||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Initiate password challenge if message received from react-native-pdf/PDF | ||
| * indicates that a password is required or invalid. | ||
| * | ||
| * For a password challenge the message is "Password required or incorrect password." | ||
| * Note that the message doesn't specify whether the password is simply empty or | ||
| * invalid. | ||
| */ | ||
| initiatePasswordChallenge() { | ||
| this.setState({shouldShowLoadingIndicator: false}); | ||
|
|
||
| // Render password form, and don't render PDF and loading indicator. | ||
| this.setState({ | ||
| shouldRequestPassword: true, | ||
| shouldAttemptPDFLoad: false, | ||
| }); | ||
|
|
||
| // The message provided by react-native-pdf doesn't indicate whether this | ||
|
|
@@ -82,13 +92,13 @@ class PDFView extends Component { | |
| * | ||
| * @param {String} password Password submitted via PDFPasswordForm | ||
| */ | ||
| attemptPDFLoadWithPassword(password) { | ||
| // Render react-native-pdf/PDF so that it can validate the password. | ||
| // Note that at this point in the password challenge, shouldRequestPassword is true. | ||
| // Thus react-native-pdf/PDF will be rendered - but not visible. | ||
| this.setState({ | ||
| password, | ||
| shouldAttemptPDFLoad: true, | ||
| shouldShowLoadingIndicator: true, | ||
| }); | ||
| } | ||
|
|
@@ -97,7 +107,7 @@ class PDFView extends Component { | |
| * After the PDF is successfully loaded hide PDFPasswordForm and the loading | ||
| * indicator. | ||
| */ | ||
| finishPDFLoad() { | ||
| this.setState({ | ||
| shouldRequestPassword: false, | ||
| shouldShowLoadingIndicator: false, | ||
|
|
@@ -129,23 +139,30 @@ class PDFView extends Component { | |
|
|
||
| return ( | ||
| <View style={containerStyles}> | ||
| {this.state.failedToLoadPDF && ( | ||
| <View style={[styles.flex1, styles.justifyContentCenter]}> | ||
| <Text style={[styles.textLabel, styles.textLarge]}> | ||
| {this.props.translate('attachmentView.failedToLoadPDF')} | ||
| </Text> | ||
| </View> | ||
| )} | ||
| {this.state.shouldAttemptPDFLoad && ( | ||
| <TouchableWithoutFeedback style={touchableStyles}> | ||
| trustAllCerts={false} | ||
| renderActivityIndicator={() => <FullScreenLoadingIndicator />} | ||
| source={{uri: this.props.sourceURL}} | ||
| style={pdfStyles} | ||
| onError={this.handleFailureToLoadPDF} | ||
| password={this.state.password} | ||
| onLoadComplete={this.finishPDFLoad} | ||
| /> | ||
| </TouchableWithoutFeedback> | ||
| )} | ||
| {this.state.shouldRequestPassword && ( | ||
| <KeyboardAvoidingView style={styles.flex1}> | ||
| <PDFPasswordForm | ||
| onSubmit={this.attemptPDFLoadWithPassword} | ||
| onPasswordUpdated={() => this.setState({isPasswordInvalid: false})} | ||
| isPasswordInvalid={this.state.isPasswordInvalid} | ||
| shouldShowLoadingIndicator={this.state.shouldShowLoadingIndicator} | ||
|
|
@@ -163,4 +180,5 @@ PDFView.defaultProps = pdfViewPropTypes.defaultProps; | |
| export default compose( | ||
| withWindowDimensions, | ||
| withKeyboardState, | ||
| withLocalize, | ||
| )(PDFView); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NAB (because unrelated to PR): There is a console error related to PDFs.
Action performed: Upload a pdf two times.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would say this is unrelated, I haven't changed anything related to rendering components in a map with the wrong keys. Maybe you are getting this from the repeated comments bug that we can see in your video.