toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

MM-18465 Add proper flags when opening settings (#3242)

Browse source 
* MM-18465 Add proper flags when opening settings

* Fix undefined setPerformingAuthentication Function in emm_provider.
This commit is contained in:
Harrison Healey 2019-09-11 23:57:07 -04:00 committed by CJ
parent 9ccde970fa
commit 4bb94195f1
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/java/com/mattermost/rnbeta/MattermostManagedModule.java
View file

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

2
app/init/emm_provider.js
View file

@ -81,7 +81,7 @@ class EMMProvider {
return false;
}
this.setPerformingAuthentication(false);
this.performingAuthentication = false;
return true;
};