Merge branch 'release/0.9.10'

Author: bmarty

CHANGES.rst

@@ -1,3 +1,13 @@
+Changes in RiotX 0.9.10 (2019-02-10)
+===================================================
+
+MatrixSdk 🚀:
+ - Upgrade to version 0.9.33
+ - Changelog: https://github.com/matrix-org/matrix-android-sdk/releases/tag/v0.9.33
+
+Improvements 🙌:
+ - Support SSO with Firefox accounts (#3337)
+
 Changes in Riot 0.9.9 (2019-11-25)
 ===================================================
 
@@ -1481,7 +1491,7 @@ Changes in Vector 0.2.0 (2016-04-14)
 =======================================================
 
 
-Changes in Riot 0.9.XX (2019-XX-XX)
+Changes in Riot 0.9.XX (2020-XX-XX)
 ===================================================
 
 MatrixSdk 🚀:

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'com.google.gms:google-services:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2'
@@ -23,8 +23,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 90900
-    versionNameProp = "0.9.9"
+    versionCodeProp = 90910
+    versionNameProp = "0.9.10"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }

vector/build.gradle

@@ -245,7 +245,7 @@ dependencies {
     /************* Matrix SDK management **************/
     // update settings.gradle
     // use the matrix SDK as external dependency
-    implementation 'com.github.matrix-org:matrix-android-sdk:v0.9.32'
+    implementation 'com.github.matrix-org:matrix-android-sdk:v0.9.33'
     // use the matrix SDK as a sub project
     // you have to uncomment some lines in settings.gradle
     //implementation project(':matrix-sdk')

vector/src/main/java/im/vector/activity/FallbackAuthenticationActivity.kt

@@ -65,6 +65,11 @@ class FallbackAuthenticationActivity : VectorAppCompatActivity() {
         mMode = intent.getIntExtra(EXTRA_IN_MODE, MODE_LOGIN)
 
         mWebView.settings.javaScriptEnabled = true
+
+        // Enable local storage to support SSO with Firefox accounts
+        mWebView.settings.domStorageEnabled = true
+        mWebView.settings.databaseEnabled = 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"

vector/src/main/java/im/vector/activity/VectorRoomActivity.java

@@ -3485,7 +3485,7 @@ public void onClick(View v) {
 
                         showWaitingView();
 
-                        room.joinWithThirdPartySigned(sRoomPreviewData.getRoomIdOrAlias(), signUrl, new ApiCallback<Void>() {
+                        room.joinWithThirdPartySigned(sRoomPreviewData.getSession(), sRoomPreviewData.getRoomIdOrAlias(), signUrl, new ApiCallback<Void>() {
                             @Override
                             public void onSuccess(Void info) {
                                 onJoined();

vector/src/main/res/layout/activity_vector_login.xml

@@ -438,8 +438,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
-                android:textSize="16sp"
                 android:padding="16dp"
+                android:textSize="16sp"
                 android:visibility="gone"
                 tools:text="A text here"
                 tools:visibility="visible" />

vector/src/main/res/layout/activity_vector_settings.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -29,8 +29,8 @@
         android:layout_height="match_parent"
         android:background="?attr/vctr_waiting_background_color"
         android:clickable="true"
-        tools:visibility="visible"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <ProgressBar
             android:id="@+id/vector_settings_spinner"

vector/src/main/res/layout/dialog_confirm_password.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"

vector/src/main/res/layout/fragment_set_identity_server.xml

@@ -41,11 +41,11 @@
             android:id="@+id/discovery_identity_server_loading"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/discovery_identity_server_enter_til"
-            app:layout_constraintStart_toStartOf="parent"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
-            tools:visibility="visible"
-            android:visibility="gone" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/discovery_identity_server_enter_til"
+            tools:visibility="visible" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

vector/src/main/res/values-az/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>