Merge branch 'release/0.8.11'

Author: bmarty

.gitignore

@@ -11,3 +11,5 @@
 
 .gradle
 /local.properties
+
+/tmp

.travis.yml

@@ -43,4 +43,7 @@ before_script:
   - /bin/sh ./set_debug_env.sh
 
 # Just build the project for now
-script: ./gradlew clean lintAppRelease assembleAppRelease --stacktrace
+script:
+  - ./gradlew clean lintAppRelease assembleAppRelease --stacktrace
+  - ./tools/check/check_code_quality.sh
+  - ./tools/travis/check_pr.sh

AUTHORS.rst

@@ -39,3 +39,6 @@ Chris Tarazi <tarazichris at gmail.com>
 
 Safa AlFulaij <safa1996alfulaij at gmail.com>
  * PR #1934: Fix some plural messages.
+
+Isa Cichon <isa4 at posteo.net>
+ *  Add spacing to device keys

CHANGES.rst

@@ -1,3 +1,35 @@
+Changes in Riot 0.8.11 (2018-07-03)
+===================================================
+
+Features:
+ - Re-request keys manually for encrypted events (#2319)
+ - Add option to send voice message to a room, using a third application to record message.
+   To enable in the Labs settings (PR #1762)
+
+Improvements:
+ - Update matrix-sdk.aar lib (v0.9.6).
+ - New Floating Action Menu in Home screen (PR #2335)
+ - Add spacing to device keys (#2314)
+ - use apply() instead of commit() to save shared prefs (#2231)
+ - Do not ring if "Do Not Disturb" is active (#1072)
+ - Manage the "consent not given" error when declining a room invite
+
+Other changes:
+ - Remove "Matrix application" activation from the Lab section in the settings (#2341)
+
+Bugfix:
+ - Remove black borders on 18:9 phone (#2063)
+ - Auto dismiss the join/reject room notification when user select an action (#2354)
+ - Fix some crashes reported by the PlayStore (#2380, #2382, #2383, #2395)
+ - Fix issues in UrlPreviews (#2312)
+
+Translations:
+ - Galician thanks to Miguel Branco
+
+Build:
+ - Add script to check code quality
+ - Travis will now check if CHANGES.rst has been modified for each PR
+
 Changes in Riot 0.8.10 (2018-01-06)
 ===================================================
 

CONTRIBUTING.rst

@@ -30,8 +30,8 @@ use github's pull request workflow to review the contribution, and either ask
 you to make any refinements needed or merge it and make them ourselves. The
 changes will then land on master when we next do a release.
 
-We use Jenkins for continuous integration (http://matrix.org/jenkins), and
-typically all pull requests get automatically tested Jenkins: if your change breaks the build, Jenkins will yell about it in #matrix-dev:matrix.org so please lurk there and keep an eye open.
+All pull requests are built by TravisCI. Please fix any issue found by TravisCI
+on your PR
 
 Code style
 ~~~~~~~~~~
@@ -54,6 +54,12 @@ description of the area(s) you've worked on. Also, we sometimes have swag to
 give away to contributors - if you feel that Matrix-branded apparel is missing
 from your life, please mail us your shipping address to matrix at matrix.org and we'll try to fix it :)
 
+Changelog
+~~~~~~~~~
+
+Please add at least one line on the top of file CHANGES.rst (in the correct section)
+to describe what you've done on the code (bugfix, new feature, etc.)
+
 Sign off
 ~~~~~~~~
 

README.md

@@ -1,4 +1,4 @@
-Riot
+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 is an Android Matrix client.

build.gradle

@@ -19,8 +19,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 81000
-    versionNameProp = "0.8.10"
+    versionCodeProp = 81100
+    versionNameProp = "0.8.11"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }

build_matrix_sdk_lib.sh

@@ -7,7 +7,7 @@ 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 
+git clone -b master https://github.com/matrix-org/matrix-android-sdk
 
 cd matrix-android-sdk 
 

build_matrix_sdk_lib_develop.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+echo "Save current dir"
+currentDir=`pwd`
+
+echo "up dir"
+cd ..
+
+echo "remove sdk folder"
+rm -rf matrix-android-sdk
+
+echo "clone the matrix-android-sdk repository, and checkout develop branch"
+git clone -b develop https://github.com/matrix-org/matrix-android-sdk
+
+cd matrix-android-sdk
+
+echo "Build matrix sdk from source"
+./gradlew clean assembleRelease
+
+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