toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix loosing the server config when handleManagedConfig (#3125)

Browse source
This commit is contained in:
Elias Nahum 2019-08-15 11:25:46 -04:00 committed by Miguel Alatzar
parent 958df2e65f
commit d4bd7833ea
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/actions/views/select_server.js
View file

@ -16,6 +16,10 @@ export function handleServerUrlChanged(serverUrl) {
};
}
export function setServerUrl(serverUrl) {
return {type: ViewTypes.SERVER_URL_CHANGED, serverUrl};
}
export default {
handleServerUrlChanged,
};

6
app/init/emm_provider.js
View file

@ -4,7 +4,7 @@
import {Alert, Platform} from 'react-native';
import {handleLoginIdChanged} from 'app/actions/views/login';
import {handleServerUrlChanged} from 'app/actions/views/select_server';
import {setServerUrl} from 'app/actions/views/select_server';
import {getTranslations} from 'app/i18n';
import mattermostBucket from 'app/mattermost_bucket';
import mattermostManaged from 'app/mattermost_managed';
@ -93,7 +93,7 @@ class EMMProvider {
const {dispatch} = store;
if (LocalConfig.AutoSelectServerUrl) {
dispatch(handleServerUrlChanged(LocalConfig.DefaultServerUrl));
dispatch(setServerUrl(LocalConfig.DefaultServerUrl));
this.allowOtherServers = false;
}
@ -122,7 +122,7 @@ class EMMProvider {
}
if (this.emmServerUrl) {
dispatch(handleServerUrlChanged(this.emmServerUrl));
dispatch(setServerUrl(this.emmServerUrl));
}
if (this.emmUsername) {