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; };