From 0ea0dc2aadb1ea655d327baa1a8f470966f2c9d7 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Mon, 2 Sep 2019 13:59:41 -0300 Subject: [PATCH] [FIX] Prevent navigation if serverInfo is undefined (#1170) * Fix navigate when serverInfo is undefined * Fix logs --- app/sagas/selectServer.js | 15 ++++++++------- app/views/NewServerView.js | 10 +++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/sagas/selectServer.js b/app/sagas/selectServer.js index 04e851fa1..e42719c5a 100644 --- a/app/sagas/selectServer.js +++ b/app/sagas/selectServer.js @@ -86,14 +86,15 @@ const handleServerRequest = function* handleServerRequest({ server, certificate const serverInfo = yield getServerInfo({ server }); - const loginServicesLength = yield RocketChat.getLoginServices(server); - if (loginServicesLength === 0) { - Navigation.navigate('LoginView'); - } else { - Navigation.navigate('LoginSignupView'); + if (serverInfo) { + const loginServicesLength = yield RocketChat.getLoginServices(server); + if (loginServicesLength === 0) { + Navigation.navigate('LoginView'); + } else { + Navigation.navigate('LoginSignupView'); + } + yield put(selectServerRequest(server, serverInfo.version, false)); } - - yield put(selectServerRequest(server, serverInfo.version, false)); } catch (e) { yield put(serverFailure()); log(e); diff --git a/app/views/NewServerView.js b/app/views/NewServerView.js index 5d03cb0ed..c70500412 100644 --- a/app/views/NewServerView.js +++ b/app/views/NewServerView.js @@ -134,8 +134,8 @@ class NewServerView extends React.Component { const certificatePath = `${ FileSystem.documentDirectory }/${ certificate.name }`; try { await FileSystem.copyAsync({ from: certificate.path, to: certificatePath }); - } catch (error) { - log('err_save_certificate', error); + } catch (e) { + log(e); } cert = { path: this.uriToPath(certificatePath), // file:// isn't allowed by obj-C @@ -166,9 +166,9 @@ class NewServerView extends React.Component { ], 'secure-text', ); - } catch (error) { - if (!DocumentPicker.isCancel(error)) { - log('err_choose_certificate', error); + } catch (e) { + if (!DocumentPicker.isCancel(e)) { + log(e); } } }