Merge branch 'release/0.9.7'

element-hq · Oct 7, 2019 · 35626cc · 35626cc
2 parents a313527 + 5a4ade4
commit 35626cc
Show file tree

Hide file tree

Showing 125 changed files with 4,922 additions and 788 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -9,10 +9,10 @@ steps:
     agents:
         # We use a medium sized instance instead of the normal small ones because
         # gradle build is long
-        queue: "medium"
+        queue: "xlarge"
     commands:
       - "./set_debug_env.sh"
-      - "./gradlew clean lintAppRelease assembleAppDebug --stacktrace"
+      - "./gradlew --no-daemon clean lintAppRelease assembleAppDebug --stacktrace"
     artifact_paths:
       - "vector/build/outputs/apk/app/debug/*.apk"
     branches: "develop feature/*"
@@ -24,10 +24,10 @@ steps:
     agents:
         # We use a medium sized instance instead of the normal small ones because
         # gradle build is long
-        queue: "medium"
+        queue: "xlarge"
     commands:
       - "./set_debug_env.sh"
-      - "./gradlew clean lintAppfdroidRelease assembleAppfdroidDebug --stacktrace"
+      - "./gradlew --no-daemon clean lintAppfdroidRelease assembleAppfdroidDebug --stacktrace"
     artifact_paths:
       - "vector/build/outputs/apk/appfdroid/debug/*.apk"
     branches: "develop feature/*"
@@ -39,9 +39,9 @@ steps:
     agents:
         # We use a medium sized instance instead of the normal small ones because
         # gradle build is long
-        queue: "medium"
+        queue: "xlarge"
     commands:
-      - "./gradlew clean assembleAppRelease --stacktrace"
+      - "./gradlew --no-daemon clean assembleAppRelease --stacktrace"
     artifact_paths:
       - "vector/build/outputs/apk/app/release/*.apk"
     branches: "master"
@@ -52,4 +52,5 @@ steps:
 # Code quality
 
   - label: "Code quality"
-    command: "./tools/check/check_code_quality.sh"
+    commands:
+      - "./tools/check/check_code_quality.sh"
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,33 @@
+Changes in Riot 0.9.7 (2019-10-07)
+===================================================
+
+MatrixSdk:
+ - Upgrade MatrixSdk to version 0.9.29.
+ - Changelog: https://github.com/matrix-org/matrix-android-sdk/releases/tag/v0.9.29
+
+Features:
+ - Privacy: Use the hashed v2 lookup API for 3PIDs (#3257)
+ - Privacy: Prompt to accept identity server policies before inviting them to a room (#3227)
+ - Privacy: Make clear that device names are publicly readable (#3265)
+ - Privacy: Email help text on registration should be updated without binding (#3278)
+ - Privacy: Use wellknown to discover the IS of a HS (#3283)
+ - Privacy: Remove the bind true flag from 3PID adds in settings (#3254)
+ - Privacy: Remove the ability to set an IS at login/registration (#3264)
+ - Privacy: Allow password reset when no IS (#3261)
+ - Privacy: Allow email registration when no IS (#3260)
+ - Privacy: Separate Add and Bind for 3PID (#3300)
+
+Improvements:
+ - Notification [Fdroid] Add a new mode for notification (#3122)
+
+Other changes:
+ - Widgets: Whitelist [MSC1961](https://github.com/matrix-org/matrix-doc/pull/1961) widget urls
+ - Privacy: Remove the bind true flag from 3PID calls on registration (#3252)
+
+Bugfix:
+ - Fix reset password broken UI (#3125)
+ - Execute 1 request instead of 2 for 3Pid lookup (#3344)
+
 Changes in Riot 0.9.6 (2019-09-13)
 ===================================================
 
@@ -1422,25 +1452,25 @@ Changes in Vector 0.2.0 (2016-04-14)
 Changes in Riot 0.9.XX (2019-XX-XX)
 ===================================================
 
-MatrixSdk:
+MatrixSdk 🚀:
  - Upgrade MatrixSdk to version 0.X.Y.
  - Changelog: https://github.com/matrix-org/matrix-android-sdk/releases/tag/v0.X.Y
 
-Features:
+Features ✨:
  -
 
-Improvements:
+Improvements 🙌:
  -
 
 Other changes:
  -
 
-Bugfix:
+Bug fixes 🐛:
  -
 
-Translations:
+Translations 🗣:
  -
 
-Build:
+Build 🧱:
  -
 
diff --git a/build.gradle b/build.gradle
@@ -23,8 +23,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 90600
-    versionNameProp = "0.9.6"
+    versionCodeProp = 90700
+    versionNameProp = "0.9.7-dev"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
+# org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
diff --git a/vector/build.gradle b/vector/build.gradle
@@ -95,6 +95,7 @@ android {
 
     buildTypes {
         debug {
+
             resValue "bool", "debug_mode", "true"
             resValue "string", "git_revision", "\"${gitRevision()}\""
             resValue "string", "git_revision_date", "\"${gitRevisionDate()}\""
@@ -215,6 +216,7 @@ dependencies {
 
     // Epoxy
     implementation 'com.airbnb.android:epoxy:3.7.0'
+    implementation 'com.airbnb.android:mvrx:1.0.1'
     kapt 'com.airbnb.android:epoxy-processor:3.7.0'
 
     // Network
@@ -243,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.27'
+    implementation 'com.github.matrix-org:matrix-android-sdk:v0.9.29'
     // use the matrix SDK as a sub project
     // you have to uncomment some lines in settings.gradle
     //implementation project(':matrix-sdk')
@@ -260,7 +262,7 @@ dependencies {
     /************* flavors management **************/
 
     // app flavor only
-    appImplementation('com.google.firebase:firebase-messaging:17.4.0') {
+    appImplementation('com.google.firebase:firebase-messaging:20.0.0') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'

diff --git a/vector/src/app/java/im/vector/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/app/java/im/vector/push/fcm/VectorFirebaseMessagingService.kt
@@ -59,11 +59,8 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
      *
      * @param message the message
      */
-    override fun onMessageReceived(message: RemoteMessage?) {
-        if (message == null || message.data == null) {
-            Log.e(LOG_TAG, "## onMessageReceived() : received a null message or message with no data")
-            return
-        }
+    override fun onMessageReceived(message: RemoteMessage) {
+
         if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
             Log.i(LOG_TAG, "## onMessageReceived()" + message.data.toString())
             Log.i(LOG_TAG, "## onMessageReceived() from FCM with priority " + message.priority)
@@ -86,7 +83,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
      * when the InstanceID token is initially generated, so this is where
      * you retrieve the token.
      */
-    override fun onNewToken(refreshedToken: String?) {
+    override fun onNewToken(refreshedToken: String) {
         Log.i(LOG_TAG, "onNewToken: FCM Token has been updated")
         FcmHelper.storeFcmToken(this, refreshedToken)
         Matrix.getInstance(this)?.pushManager?.resetFCMRegistration(refreshedToken)

diff --git a/...eceiver/OnApplicationUpgradeReceiver.java → .../receiver/OnApplicationUpgradeReceiver.kt b/...eceiver/OnApplicationUpgradeReceiver.java → .../receiver/OnApplicationUpgradeReceiver.kt
@@ -14,25 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.receiver;
+package im.vector.receiver
 
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import im.vector.services.EventStreamServiceX
+import org.matrix.androidsdk.core.Log
 
-import org.matrix.androidsdk.core.Log;
+class OnApplicationUpgradeReceiver : BroadcastReceiver() {
 
-import im.vector.services.EventStreamServiceX;
-
-public class OnApplicationUpgradeReceiver extends BroadcastReceiver {
-
-    private static final String LOG_TAG = OnApplicationUpgradeReceiver.class.getSimpleName();
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Log.d(LOG_TAG, "## onReceive() : Application has been upgraded, restart event stream service.");
+    override fun onReceive(context: Context, intent: Intent) {
+        Log.d(LOG_TAG, "## onReceive() : Application has been upgraded, restart event stream service.")
+        EventStreamServiceX.onApplicationUpgrade(context)
+    }
 
-        // Start Event stream
-        EventStreamServiceX.Companion.onApplicationUpgrade(context);
+    companion object {
+        private val LOG_TAG = OnApplicationUpgradeReceiver::class.java.simpleName
     }
 }
diff --git a/vector/src/main/java/im/vector/LoginHandler.java b/vector/src/main/java/im/vector/LoginHandler.java
@@ -214,19 +214,23 @@ public void submitEmailTokenValidation(final Context aCtx,
                                            final String aClientSecret,
                                            final String aSid,
                                            final ApiCallback<Boolean> aRespCallback) {
-        final ThreePid pid = new ThreePid(null, ThreePid.MEDIUM_EMAIL);
         ThirdPidRestClient restClient = new ThirdPidRestClient(aHomeServerConfig);
 
-        pid.submitValidationToken(restClient, aToken, aClientSecret, aSid, new UnrecognizedCertApiCallback<Boolean>(aHomeServerConfig, aRespCallback) {
-            @Override
-            public void onSuccess(Boolean info) {
-                aRespCallback.onSuccess(info);
-            }
-
-            @Override
-            public void onAcceptedCert() {
-                submitEmailTokenValidation(aCtx, aHomeServerConfig, aToken, aClientSecret, aSid, aRespCallback);
-            }
-        });
+        restClient.submitValidationToken(
+                ThreePid.MEDIUM_EMAIL,
+                aToken,
+                aClientSecret,
+                aSid,
+                new UnrecognizedCertApiCallback<Boolean>(aHomeServerConfig, aRespCallback) {
+                    @Override
+                    public void onSuccess(Boolean info) {
+                        aRespCallback.onSuccess(info);
+                    }
+
+                    @Override
+                    public void onAcceptedCert() {
+                        submitEmailTokenValidation(aCtx, aHomeServerConfig, aToken, aClientSecret, aSid, aRespCallback);
+                    }
+                });
     }
 }