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

Fix android error handler (#347)

Browse source
This commit is contained in:
enahum 2017-03-14 00:09:23 -03:00 committed by GitHub
parent 53b0ee0f10
commit d852587268
2 changed files with 42 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
app/actions/storage/index.js
View file

@ -12,47 +12,56 @@ export function loadStorage() {
try {
const data = JSON.parse(await AsyncStorage.getItem('storage'));
const {token, url, serverVersion, currentTeamId, ...otherStorage} = data;
const credentials = {token, url};
if (data) {
const {token, url, serverVersion, currentTeamId, ...otherStorage} = data;
const credentials = {token, url};
const currentChannelId = otherStorage[currentTeamId] ? otherStorage[currentTeamId].currentChannelId : '';
const currentChannelId = otherStorage[currentTeamId] ? otherStorage[currentTeamId].currentChannelId : '';
const actions = [
{type: GeneralTypes.RECEIVED_APP_CREDENTIALS, data: credentials},
{type: GeneralTypes.RECEIVED_SERVER_VERSION, data: serverVersion}
];
const actions = [];
if (currentTeamId) {
actions.push({type: TeamsTypes.SELECT_TEAM, data: currentTeamId});
}
if (credentials) {
actions.push({type: GeneralTypes.RECEIVED_APP_CREDENTIALS, data: credentials});
}
if (currentChannelId) {
actions.push({type: ChannelTypes.SELECT_CHANNEL, data: currentChannelId});
}
if (serverVersion) {
actions.push({type: GeneralTypes.RECEIVED_SERVER_VERSION, data: serverVersion});
}
// Load post drafts if there are any
if (otherStorage.postDrafts) {
Object.keys(otherStorage.postDrafts).forEach((d) => {
actions.push({
type: ViewTypes.POST_DRAFT_CHANGED,
channelId: d,
postDraft: otherStorage.postDrafts[d]
if (currentTeamId) {
actions.push({type: TeamsTypes.SELECT_TEAM, data: currentTeamId});
}
if (currentChannelId) {
actions.push({type: ChannelTypes.SELECT_CHANNEL, data: currentChannelId});
}
// Load post drafts if there are any
if (otherStorage.postDrafts) {
Object.keys(otherStorage.postDrafts).forEach((d) => {
actions.push({
type: ViewTypes.POST_DRAFT_CHANGED,
channelId: d,
postDraft: otherStorage.postDrafts[d]
});
});
});
}
}
// Load thread drafts if there are any
if (otherStorage.threadDrafts) {
Object.keys(otherStorage.threadDrafts).forEach((d) => {
actions.push({
type: ViewTypes.COMMENT_DRAFT_CHANGED,
rootId: d,
draft: otherStorage.threadDrafts[d]
// Load thread drafts if there are any
if (otherStorage.threadDrafts) {
Object.keys(otherStorage.threadDrafts).forEach((d) => {
actions.push({
type: ViewTypes.COMMENT_DRAFT_CHANGED,
rootId: d,
draft: otherStorage.threadDrafts[d]
});
});
});
}
}
dispatch(batchActions(actions), getState);
if (actions.length) {
dispatch(batchActions(actions), getState);
}
}
} catch (error) {
// Error loading data
dispatch(batchActions([

2
app/navigation/router.js
View file

@ -128,8 +128,8 @@ class Router extends React.Component {
return (
<View style={{flex: 1, flexDirection: 'column-reverse'}}>
<View style={{flex: 1}}>
<ErrorList/>
{renderedScenes}
<ErrorList/>
</View>
{navBar}
</View>