From f6a1927a274c00f9ee219bdfd8c6656b6b0819c3 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 18 Jul 2018 12:20:18 -0400
Subject: [PATCH] Fix closing app with Android Back Button (#1933)

---
 .../sidebars/settings/settings_sidebar.js           | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/components/sidebars/settings/settings_sidebar.js b/app/components/sidebars/settings/settings_sidebar.js
index f3957bdfa..b48ff8246 100644
--- a/app/components/sidebars/settings/settings_sidebar.js
+++ b/app/components/sidebars/settings/settings_sidebar.js
@@ -71,7 +71,7 @@ export default class SettingsDrawer extends PureComponent {
     }
 
     handleAndroidBack = () => {
-        if (this.refs.drawer) {
+        if (this.refs.drawer && this.drawerOpened) {
             this.refs.drawer.closeDrawer();
             return true;
         }
@@ -82,18 +82,24 @@ export default class SettingsDrawer extends PureComponent {
     openSettingsSidebar = () => {
         this.props.blurPostTextBox();
 
-        if (this.refs.drawer) {
+        if (this.refs.drawer && !this.drawerOpened) {
             this.refs.drawer.openDrawer();
         }
     };
 
     closeSettingsSidebar = () => {
-        if (this.refs.drawer) {
+        if (this.refs.drawer && this.drawerOpened) {
             this.refs.drawer.closeDrawer();
         }
     };
 
+    handleDrawerClose = () => {
+        this.drawerOpened = false;
+        Keyboard.dismiss();
+    };
+
     handleDrawerOpen = () => {
+        this.drawerOpened = true;
         Keyboard.dismiss();
     };
 
@@ -347,6 +353,7 @@ export default class SettingsDrawer extends PureComponent {
             <DrawerLayout
                 ref='drawer'
                 renderNavigationView={this.renderNavigationView}
+                onDrawerClose={this.handleDrawerClose}
                 onDrawerOpen={this.handleDrawerOpen}
                 drawerPosition='right'
                 drawerWidth={deviceWidth - DRAWER_INITIAL_OFFSET}