Merge branch 'release/0.9.6'

element-hq · Sep 13, 2019 · a313527 · a313527
2 parents f04ca01 + 81e3b53
commit a313527
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+Changes in Riot 0.9.6 (2019-09-13)
+===================================================
+
+Other changes:
+ - Get around Google limitation of SSO through WebView by modifying the WebView user agent
+
 Changes in Riot 0.9.5 (2019-09-10)
 ===================================================
 

diff --git a/build.gradle b/build.gradle
@@ -23,8 +23,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 90500
-    versionNameProp = "0.9.5"
+    versionCodeProp = 90600
+    versionNameProp = "0.9.6"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }

diff --git a/vector/src/main/java/im/vector/activity/FallbackAuthenticationActivity.kt b/vector/src/main/java/im/vector/activity/FallbackAuthenticationActivity.kt
@@ -65,6 +65,9 @@ class FallbackAuthenticationActivity : VectorAppCompatActivity() {
         mMode = intent.getIntExtra(EXTRA_IN_MODE, MODE_LOGIN)
 
         mWebView.settings.javaScriptEnabled = true
+        // Due to https://developers.googleblog.com/2016/08/modernizing-oauth-interactions-in-native-apps.html, we hack
+        // the user agent to bypass the limitation of Google, as a quick fix (a proper solution will be to use the SSO SDK)
+        mWebView.settings.userAgentString = "Mozilla/5.0 Google"
 
         mHomeServerUrl = getString(R.string.default_hs_server_url)