Skip to content

[FIX] Backhandler onBoarding #2077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 2 commits into from
Apr 30, 2020
Merged

[FIX] Backhandler onBoarding #2077

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10fc3c4
[FIX] Backhandler onBoarding
djorkaeffalexandre Apr 29, 2020
28ebc7d
Merge branch 'develop' into fix.back-handler
diegolmello Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion app/views/NewServerView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import {
Text, Keyboard, StyleSheet, TouchableOpacity, View, Alert
Text, Keyboard, StyleSheet, TouchableOpacity, View, Alert, BackHandler
} from 'react-native';
import { connect } from 'react-redux';
import * as FileSystem from 'expo-file-system';
Expand Down Expand Up @@ -105,6 +105,7 @@ class NewServerView extends React.Component {
certificate: null
};
EventEmitter.addEventListener('NewServer', this.handleNewServerEvent);
BackHandler.addEventListener('hardwareBackPress', this.handleBackPress);
}

componentDidMount() {
Expand All @@ -116,6 +117,16 @@ class NewServerView extends React.Component {

componentWillUnmount() {
EventEmitter.removeListener('NewServer', this.handleNewServerEvent);
BackHandler.removeEventListener('hardwareBackPress', this.handleBackPress);
}

handleBackPress = () => {
const { navigation } = this.props;
if (navigation.isFocused() && this.previousServer) {
this.close();
return true;
}
return false;
}

onChangeText = (text) => {
Expand Down