Authenticate onUnmount, 3.0.2 build 2

android/app/build.gradle

@@ -102,7 +102,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 
-        versionCode 3000020
+        versionCode 3000021
         versionName "3.0.2"
 
         multiDexEnabled  true

ios/StandardNotes/Info.plist

@@ -71,7 +71,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

package.json

@@ -29,7 +29,7 @@
     "react-navigation-header-buttons": "^2.1.1",
     "regenerator": "^0.13.3",
     "sn-models": "0.1.13",
-    "standard-file-js": "0.3.40"
+    "standard-file-js": "0.3.41"
   },
   "devDependencies": {
     "babel-jest": "^23.6.0",

src/screens/Authentication/Authenticate.js

@@ -63,6 +63,15 @@ export default class Authenticate extends Abstract {
   }
 
   componentWillUnmount() {
+
+    // Typically there should be no way to exit this window if it doesn't have a cancel option.
+    // However, on Android, you can press the hardware back button to dismiss it. We want to notify
+    // caller that this screen has unmounted
+    let onUnmount = this.getProp("onUnmount");
+    if(onUnmount) {
+      onUnmount();
+    }
+
     super.componentWillUnmount();
     ApplicationState.get().removeStateObserver(this.stateObserver);
   }

src/screens/Root.js

@@ -217,10 +217,12 @@ export default class Root extends Abstract {
       onSuccess: () => {
         authProps.onAuthenticate();
         this.authenticationInProgress = false;
-
         if(this.dataLoaded) {
           Sync.get().sync();
         }
+      },
+      onUnmount: () => {
+        this.authenticationInProgress = false;
       }
     });
   }