verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] Prevent navigation if serverInfo is undefined (#1170) 

* Fix navigate when serverInfo is undefined

* Fix logs
This commit is contained in:
Djorkaeff Alexandre 2019-09-02 13:59:41 -03:00 committed by Diego Mello
parent 2515295fc6
commit 0ea0dc2aad
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/sagas/selectServer.js
View File

@ -86,14 +86,15 @@ const handleServerRequest = function* handleServerRequest({ server, certificate
const serverInfo = yield getServerInfo({ server }); const serverInfo = yield getServerInfo({ server });
const loginServicesLength = yield RocketChat.getLoginServices(server); if (serverInfo) {
if (loginServicesLength === 0) { const loginServicesLength = yield RocketChat.getLoginServices(server);
Navigation.navigate('LoginView'); if (loginServicesLength === 0) {
} else { Navigation.navigate('LoginView');
Navigation.navigate('LoginSignupView'); } else {
Navigation.navigate('LoginSignupView');
}
yield put(selectServerRequest(server, serverInfo.version, false));
} }
yield put(selectServerRequest(server, serverInfo.version, false));
} catch (e) { } catch (e) {
yield put(serverFailure()); yield put(serverFailure());
log(e); log(e);

10
app/views/NewServerView.js
View File

@ -134,8 +134,8 @@ class NewServerView extends React.Component {
const certificatePath = `${ FileSystem.documentDirectory }/${ certificate.name }`; const certificatePath = `${ FileSystem.documentDirectory }/${ certificate.name }`;
try { try {
await FileSystem.copyAsync({ from: certificate.path, to: certificatePath }); await FileSystem.copyAsync({ from: certificate.path, to: certificatePath });
} catch (error) { } catch (e) {
log('err_save_certificate', error); log(e);
} }
cert = { cert = {
path: this.uriToPath(certificatePath), // file:// isn't allowed by obj-C path: this.uriToPath(certificatePath), // file:// isn't allowed by obj-C
@ -166,9 +166,9 @@ class NewServerView extends React.Component {
], ],
'secure-text', 'secure-text',
); );
} catch (error) { } catch (e) {
if (!DocumentPicker.isCancel(error)) { if (!DocumentPicker.isCancel(e)) {
log('err_choose_certificate', error); log(e);
} }
} }
} }