Merge branch 'release/0.8.16'

Author: bmarty

.travis.yml

@@ -44,6 +44,7 @@ before_script:
 
 # Just build the project for now
 script:
-  - ./gradlew clean lintAppRelease assembleAppRelease --stacktrace
+  - ./gradlew clean lintAppRelease assembleAppRelease assembleAppfdroidRelease --stacktrace
+  - ./gradlew testAppReleaseUnitTest --stacktrace
   - ./tools/check/check_code_quality.sh
   - ./tools/travis/check_pr.sh

CHANGES.rst

@@ -1,3 +1,28 @@
+Changes in Riot 0.8.16 (2018-10-08)
+===================================================
+
+MatrixSdk:
+ - Upgrade to version 0.9.10.
+
+Features:
+ - Manage blue banner case of server quota notices (#2547)
+
+Improvements:
+ - Minor changes to toolbar style and other UI elements (#2529)
+ - Improvements to dialogs, video messages, and the previewer activity (#2583)
+ - Add a way to enable local file encryption on the SDK (disabled by default)
+
+Other changes:
+ - Sonar analysis has been configured (#2203)
+
+Bugfix:
+ - Fix crash when opening file with external application (#2573)
+ - Fix issue on settings: unable to rename current device if it has no name (#2174)
+ - Allow anyone to add local alias and to try to delete local alias (#1033)
+ - Fix issue on "Resend all" action (#2569)
+ - Fix messages vanishing when resending them (#2508)
+ - Remove delay for / completion (#2576)
+
 Changes in Riot 0.8.15 (2018-08-30)
 ===================================================
 

README.md

@@ -1,4 +1,4 @@
-Riot-Android  [![Jenkins](https://img.shields.io/jenkins/s/https/matrix.org/jenkins/view/MatrixView/job/VectorAndroidDevelop.svg)](https://matrix.org/jenkins/view/MatrixView/job/VectorAndroidDevelop/) [![Weblate](https://translate.riot.im/widgets/riot-android/-/svg-badge.svg)](https://translate.riot.im/engage/riot-android/?utm_source=widget)
+Riot-Android [![Jenkins](https://img.shields.io/jenkins/s/https/matrix.org/jenkins/view/MatrixView/job/VectorAndroidDevelop.svg)](https://matrix.org/jenkins/view/MatrixView/job/VectorAndroidDevelop/) [![Weblate](https://translate.riot.im/widgets/riot-android/-/svg-badge.svg)](https://translate.riot.im/engage/riot-android/?utm_source=widget) [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riot&metric=alert_status)](https://sonarcloud.io/dashboard?id=vector.android.riot) [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riot&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=vector.android.riot) [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=vector.android.riot&metric=bugs)](https://sonarcloud.io/dashboard?id=vector.android.riot) 
 =======
 
  Riot is an Android Matrix client.

build.gradle

@@ -6,11 +6,15 @@ buildscript {
     repositories {
         jcenter()
         google()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.2'
         classpath 'com.google.gms:google-services:3.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,8 +23,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 81500
-    versionNameProp = "0.8.15"
+    versionCodeProp = 81600
+    versionNameProp = "0.8.16"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }
@@ -35,3 +39,39 @@ allprojects {
         google()
     }
 }
+
+apply plugin: 'org.sonarqube'
+
+sonarqube {
+    properties {
+        property "sonar.projectName", "Riot-Android"
+        property "sonar.projectKey", "vector.android.riot"
+        property "sonar.host.url", "https://sonarcloud.io"
+        property "sonar.projectVersion", project(":vector").android.defaultConfig.versionName
+        property "sonar.sourceEncoding", "UTF-8"
+        property "sonar.links.homepage", "https://github.com/vector-im/riot-android/"
+        property "sonar.links.ci", "https://matrix.org/jenkins/view/MatrixView/job/VectorAndroidDevelop/"
+        property "sonar.links.scm", "https://github.com/vector-im/riot-android/"
+        property "sonar.links.issue", "https://github.com/vector-im/riot-android/issues"
+        property "sonar.organization", "new_vector_ltd_organization"
+        property "sonar.login", project.hasProperty("SONAR_LOGIN") ? SONAR_LOGIN : "invalid"
+    }
+}
+
+project(":vector") {
+    sonarqube {
+        properties {
+            property "sonar.sources", project(":vector").android.sourceSets.main.java.srcDirs
+            // exclude source code from analyses separated by a colon (:)
+            // property "sonar.exclusions", "**/*.*"
+        }
+    }
+}
+
+if (findProject(':matrix-sdk') != null) {
+    project(":matrix-sdk") {
+        sonarqube {
+            skipProject = true
+        }
+    }
+}

build_fdroid_apk.sh

@@ -3,7 +3,7 @@ rm -rf vector/libs
 mkdir vector/libs
 
 sh build_jitsi_libs.sh
-sh build_matrix_sdk_lib.sh
+sh build_matrix_sdk_lib.sh master
 sh build_olm_lib.sh
 
 ./gradlew lintAppfdroidRelease assembleAppfdroidRelease

build_matrix_sdk_lib.sh

@@ -1,18 +1,60 @@
 #!/bin/bash
 
-echo updir
+#
+# Copyright 2018 New Vector Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# exit on any error
+set -e
+
+if [ "$#" -ne 1 ]; then
+  echo "Usage: $0 GIT_BRANCH" >&2
+  exit 1
+fi
+
+# which branch to build?
+branch=$1
+
+if [ -z "$branch" ]; then
+   echo "Please specify the branch to build as a parameter"
+   exit 1
+fi
+
+echo ${branch}
+
+echo "Save current dir"
+currentDir=`pwd`
+
+echo "up dir"
 cd ..
 
-echo remove sdk folder
+echo "remove sdk folder"
 rm -rf matrix-android-sdk
 
-echo clone the git folder
-git clone -b master https://github.com/matrix-org/matrix-android-sdk
+echo "clone the matrix-android-sdk repository, and checkout ${branch} branch"
+git clone -b ${branch} https://github.com/matrix-org/matrix-android-sdk
 
-cd matrix-android-sdk 
+cd matrix-android-sdk
 
+echo "Build matrix sdk from source"
 ./gradlew clean assembleRelease
 
-cd ../riot-android
-cp ../matrix-android-sdk/matrix-sdk/build/outputs/aar/matrix-sdk-release-*.aar vector/libs/matrix-sdk.aar 
+cd ${currentDir}
+
+echo "Copy freshly built matrix sdk to the libs folder"
+# Ensure the lib is updated by removing the previous one
+rm vector/libs/matrix-sdk.aar
 
+cp ../matrix-android-sdk/matrix-sdk/build/outputs/aar/matrix-sdk-release-*.aar vector/libs/matrix-sdk.aar

build_matrix_sdk_lib_develop.sh

@@ -28,3 +28,5 @@ org.gradle.configureondemand=false
 # RELEASE_KEY_ALIAS=alias
 # RELEASE_KEY_PASSWORD=password
 
+# To be able to analyse with sonar, put these variables in ~/.gradle/gradle.properties
+# SONAR_LOGIN=sonar_login

gradle.properties

@@ -144,3 +144,8 @@ trim \{ it \<\= \' \' \}
 
 ### Use AlertDialog form v7 compat lib
 android\.app\.AlertDialog
+
+### Put the operator at the beginning of next line
+&&$
+\|\|$
+ ==$

tools/check/forbidden_strings_in_code.txt

@@ -227,6 +227,9 @@ dependencies {
     appImplementation 'com.google.firebase:firebase-messaging:17.3.0'
 
     // fdroid flavor only
+
+    // Test
+    testImplementation 'junit:junit:4.12'
 }