Fixes the error on app exiting on via the device back button

2020-04-25 19:47:05 +02:00
parent 1291fe70bc
commit 1413525e91
2 changed files with 17 additions and 11 deletions
@@ -14,7 +14,7 @@ import { isSymptomView, isSettingsView } from './pages'

 import { headerTitles } from '../i18n/en/labels'
 import setupNotifications from '../lib/notifications'
-import { getCycleDay } from '../db'
+import { getCycleDay, closeDb } from '../db'

 class App extends Component {

@@ -30,12 +30,25 @@ class App extends Component {

    this.backHandler = BackHandler.addEventListener(
      'hardwareBackPress',
-      props.goBack
+      this.goBack
    )

    setupNotifications(this.props.navigate)
  }

+  goBack = () => {
+    const { currentPage } = this.props.navigation
+
+    if (currentPage === 'Home') {
+      closeDb()
+      BackHandler.exitApp()
+    } else {
+      this.props.goBack()
+    }
+
+    return true
+  }
+
  componentWillUnmount() {
    this.backHandler.remove()
  }