@@ -34,6 +34,8 @@ const val INTENT_OAUTH_CREDENTIAL_SECRET = "credential_secret"
classOauthWebViewActivity:AppCompatActivity(){
privatelateinitvarwebPageUrl:String
privatelateinitvarstate:String
privatevarisWebViewSetUp:Boolean=false
overridefunonCreate(savedInstanceState:Bundle?){
super.onCreate(savedInstanceState)
...
...
@@ -50,7 +52,10 @@ class OauthWebViewActivity : AppCompatActivity() {
overridefunonResume(){
super.onResume()
setupWebView()
if(!isWebViewSetUp){
setupWebView()
isWebViewSetUp=true
}
}
overridefunonBackPressed(){
...
...
@@ -69,7 +74,10 @@ class OauthWebViewActivity : AppCompatActivity() {
@SuppressLint("SetJavaScriptEnabled")
privatefunsetupWebView(){
web_view.settings.javaScriptEnabled=true
valsettings=web_view.settings
settings.javaScriptEnabled=true
// TODO This is required to make Google OAuth work, but we shoud use Custom Tabs instead. See https://github.com/RocketChat/Rocket.Chat.Android/issues/968
settings.userAgentString="Mozilla/5.0 (Linux; Android 4.1.1; Galaxy Nexus Build/JRO03C) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19"