forge-joniko/ldc-com-app
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix network state

Browse source
This commit is contained in:
Vincent BRIDIER 2023-01-04 10:31:56 +01:00
parent bd1d2be557
commit 9633d8c5cb
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
4 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ComApp/src/App/Controllers/SyncController.js
View file

@ -30,10 +30,7 @@ class SyncController {
}
async checkConnection() {
NetInfo.fetch().then(state => {
return state.isConnected;
});
return false;
return NetInfo.fetch();
}
async getVersion() {

9
ComApp/src/App/Views/InstallScreen.js
View file

@ -87,7 +87,14 @@ class InstallScreen extends React.Component {
async install() {
let url = this.state.url;
Setting.upsert({ key: 'bo_url', value: url });
if (!SyncController.checkConnection()) {
const isConnected = await SyncController.checkConnection().then(state => {
//console.log(state.isConnected)
return state.isConnected
}).catch(error => {
//console.log(error);
return false;
});
if (!isConnected) {
Alert.alert(
i18n.t('global.warning'),
i18n.t('error.must_be_connected_internet_sync')

13
ComApp/src/App/Views/LoginScreen.js
View file

@ -81,7 +81,7 @@ class LoginScreen extends React.Component {
);
}
login(login, password) {
async login(login, password) {
if (login === '' || password === '') {
Alert.alert(i18n.t("global.warning"), i18n.t('error.must_fill_login_fields'));
return;
@ -102,11 +102,18 @@ class LoginScreen extends React.Component {
Alert.alert(i18n.t('error.error'), i18n.t('error.incorrect_credentials'));
return;
}
const isConnected = await SyncController.checkConnection().then(state => {
//console.log(state.isConnected)
return state.isConnected
}).catch(error => {
//console.log(error);
return false;
});
const lastUser = Setting.get('lastUser');
// Si on est sur une installation
if (lastUser === false || lastUser == undefined) {
// Si la tablette est connectée à internet pour forcer la synchro
if (!SyncController.checkConnection()) {
if (!isConnected) {
Alert.alert(i18n.t('error.error'), i18n.t('error.tablet_not_connected_internet'));
return;
}
@ -124,7 +131,7 @@ class LoginScreen extends React.Component {
return;
}
// Si la tablette est connectée à internet pour forcer la synchro
if (!SyncController.checkConnection()) {
if (!isConnected) {
Alert.alert(i18n.t('error.error'), i18n.t('error.tablet_not_connected_internet'));
return;
}

9
ComApp/src/App/Views/SyncScreen.js
View file

@ -91,7 +91,14 @@ class SyncScreen extends React.Component {
}
async sync() {
if (!SyncController.checkConnection()) {
const isConnected = await SyncController.checkConnection().then(state => {
//console.log(state.isConnected)
return state.isConnected
}).catch(error => {
//console.log(error);
return false;
});
if (!isConnected) {
Alert.alert(
i18n.t('global.warning'),
i18n.t('error.must_be_connected_internet_sync')