From 3503025e53d235a35acbdaeef54007c8cc78f26d Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 30 May 2019 14:46:35 -0400 Subject: [PATCH] MM-15643 Better close app when checking for pin code (#2846) --- .../com/mattermost/rnbeta/MattermostManagedModule.java | 9 ++++++++- app/mattermost_managed/mattermost-managed.android.js | 4 ++-- 2 files changed, 10 insertions(+), 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 index 1e72ad295..affdb1fc5 100644 --- 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 class MattermostManagedModule extends ReactContextBaseJavaModule { @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 index 026959989..da192cb58 100644 --- 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, };