From 4bb94195f11520f595cfe5452987436fee4e84e4 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Wed, 11 Sep 2019 23:57:07 -0400
Subject: [PATCH] MM-18465 Add proper flags when opening settings (#3242)

* MM-18465 Add proper flags when opening settings

* Fix undefined setPerformingAuthentication Function in emm_provider.
---
 .../java/com/mattermost/rnbeta/MattermostManagedModule.java | 6 +++++-
 app/init/emm_provider.js                                    | 2 +-
 2 files changed, 6 insertions(+), 2 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 68ecbec2a..f267dd95b 100644
--- a/android/app/src/main/java/com/mattermost/rnbeta/MattermostManagedModule.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MattermostManagedModule.java
@@ -5,6 +5,7 @@ import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.provider.Settings;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.NativeModule;
@@ -69,7 +70,10 @@ public class MattermostManagedModule extends ReactContextBaseJavaModule {
     @ReactMethod
     // Close the current activity and open the security settings.
     public void goToSecuritySettings() {
-        getReactApplicationContext().startActivity(new Intent(android.provider.Settings.ACTION_SECURITY_SETTINGS));
+        Intent intent = new Intent(Settings.ACTION_SECURITY_SETTINGS);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getReactApplicationContext().startActivity(intent);
+
         getCurrentActivity().finish();
         System.exit(0);
     }
diff --git a/app/init/emm_provider.js b/app/init/emm_provider.js
index 6974e46bb..975c494a6 100644
--- a/app/init/emm_provider.js
+++ b/app/init/emm_provider.js
@@ -81,7 +81,7 @@ class EMMProvider {
             return false;
         }
 
-        this.setPerformingAuthentication(false);
+        this.performingAuthentication = false;
         return true;
     };