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

MM-20682 Android back button to dismiss status modal first (#3628)

Browse source
This commit is contained in:
Elias Nahum 2019-12-04 15:17:59 -03:00 committed by GitHub
parent a088edfffd
commit 4c4e1907cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/components/sidebars/settings/settings_sidebar.js
View file

@ -105,7 +105,10 @@ export default class SettingsDrawer extends PureComponent {
};
handleAndroidBack = () => {
if (this.drawerRef && this.drawerOpened) {
if (this.statusModal) {
this.statusModal = false;
return false;
} else if (this.drawerRef && this.drawerOpened) {
this.drawerRef.closeDrawer();
return true;
}
@ -163,6 +166,7 @@ export default class SettingsDrawer extends PureComponent {
},
}];
this.statusModal = true;
showModalOverCurrentContext('OptionsModal', {items});
});