MM-15643 Better close app when checking for pin code (mattermost#2846)

rameshrr · May 30, 2019 · 3503025 · 3503025
1 parent daa8152
commit 3503025
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/android/app/src/main/java/com/mattermost/rnbeta/MattermostManagedModule.java b/android/app/src/main/java/com/mattermost/rnbeta/MattermostManagedModule.java
@@ -68,7 +68,14 @@ public void getConfig(final Promise promise) {
     @ReactMethod
     // Close the current activity and open the security settings.
     public void goToSecuritySettings() {
-        getCurrentActivity().finish();
         getReactApplicationContext().startActivity(new Intent(android.provider.Settings.ACTION_SECURITY_SETTINGS));
+        getCurrentActivity().finish();
+        System.exit(0);
+    }
+
+    @ReactMethod
+    public void quitApp() {
+        getCurrentActivity().finish();
+        System.exit(0);
     }
 }
diff --git a/app/mattermost_managed/mattermost-managed.android.js b/app/mattermost_managed/mattermost-managed.android.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {BackHandler, NativeModules, DeviceEventEmitter} from 'react-native';
+import {NativeModules, DeviceEventEmitter} from 'react-native';
 import LocalAuth from 'react-native-local-auth';
 import JailMonkey from 'jail-monkey';
 
@@ -63,5 +63,5 @@ export default {
 
         return JailMonkey.trustFall();
     },
-    quitApp: BackHandler.exitApp,
+    quitApp: MattermostManaged.quitApp,
 };