Merge branch 'release/0.8.21'

Author: bmarty

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### Pull Request Checklist
 
-<!-- Please read CONTRIBUTING.rst before submitting your pull request -->
+<!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/riot-android/CONTRIBUTING.md) before submitting your pull request -->
 
 * [ ] Pull request is based on the develop branch
 * [ ] Pull request updates [CHANGES.rst](https://github.com/vector-im/riot-android/blob/develop/CHANGES.rst)

.gitignore

@@ -13,3 +13,5 @@
 /local.properties
 
 /tmp
+
+captures/

AUTHORS.rst

@@ -45,3 +45,10 @@ Isa Cichon <isa4 at posteo.net>
 
 Nathan van Beelen <nathan at vanbeelen.org>
  * PR #1742: Add a media previewer
+
+Blue <blue at bluecode.fr>
+ * Propagate error messages from 3PID and display them during signup
+
+Ville Ranki <ville.ranki at iki.fi>
+ * Fix avatar icon characters being offset
+

CHANGES.rst

@@ -1,3 +1,31 @@
+Changes in Riot 0.8.21 (2018-01-02)
+===================================================
+
+MatrixSdk:
+ - Upgrade MatrixSdk to version 0.9.15.
+
+Improvements:
+ - Show userId below display name in member detail screen (#2756)
+ - Clicking on a user and a room avatar opens a new screen with animation to view the avatar in full screen, with zoom capabilities (#2455)
+ - Added Troubleshoot Notification settings page
+ - Add badge to indicate number of group invitations on the Home Screen (#1923)
+
+Other changes:
+ - Update README.md and CONTRIBUTING.md (#2795)
+
+Bugfix:
+ - Defensive code for notifications issues + check play services as per FCM recommendation (#2266)
+ - No notification on f-droid when device enters sleep mode (#2789)
+ - Added ShortcutBadger missing permissions for some devices
+ - Fix many little UI/UX issues (#2769)
+ - Fix crash opening the setting screen (#2793)
+ - Allow popup on IntegrationManagerActivity's WebView because it's require to add Slack integration (#2768)
+ - Fix crash on Android ViewPager (#2786)
+ - Fix avatar icon characters being a little bit offset to right.
+ - Fix Stopping Loading View after Upload of User Avatar (#2801)
+ - Fix no display of image without `info` (#2666)
+ - Fix permission request failure. It was actually not necessary to request overlay permission (#2680)
+
 Changes in Riot 0.8.20 (2018-12-13)
 ===================================================
 
@@ -1104,7 +1132,7 @@ Changes in Riot 0.8.XX (2018-XX-XX)
 ===================================================
 
 MatrixSdk:
- - Upgrade to version 0.X.Y.
+ - Upgrade MatrixSdk to version 0.X.Y.
 
 Features:
  -
@@ -1116,7 +1144,7 @@ Other changes:
  -
 
 Bugfix:
- -
+ - Correct issue during signup when a 3PID error would let the signup flow spin forever
 
 Translations:
  -

CONTRIBUTING.md

@@ -0,0 +1,69 @@
+# Contributing code to Matrix
+
+Please read https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst
+
+Android support can be found in this [![Android Matrix room](https://img.shields.io/matrix/riot-android:matrix.org.svg)](https://riot.im/app/#/room/#riot-android:matrix.org)
+
+# Specific rules for Matrix Android projects
+
+## Compilation
+
+Riot Android uses by default the Matrix Android SDK library (file `matrix-sdk.aar`).
+At each release, this library is updated.
+Between two releases, the Riot code may not compile due to evolution of the library API.
+To compile against the source of the Matrix Android library, please clone the project [AndroidMatrixSdk](https://github.com/matrix-org/matrix-android-sdk)
+ and run the following command:
+ 
+> ./compile_with_sdk_project.sh
+
+## I want to help translating Riot
+
+If you want to fix an issue with an English string, please submit a PR.
+If you want to fix an issue in other languages, or add a missing translation, or even add a new language, please use [Weblate](https://translate.riot.im/projects/riot-android/).
+
+## I want to submit a PR to fix an issue
+
+Please check if a corresponding issue exists. If yes, please let us know in a comment that you're working on it.
+If an issue does not exist yet, it may be relevant to open a new issue and let us know that you're implementing it.
+
+### Kotlin
+
+Please write every new classes in Kotlin. You can also convert existing Java classes (limited to classes impacted by the PR) to Kotlin (Android Studio has a tool to do this), but if you do so, please do atomic commit of the conversion, to ensure there is no other change, it will facilitate code review.
+Also please check that everything works fine after Kotlin conversion, especially regarding nullity check.
+
+### CHANGES.rst
+
+Please add a line in the file `CHANGES.rst` describing your change.
+
+### Code quality
+
+Make sure the following commands execute without any error:
+
+> ./tools/check/check_code_quality.sh
+> ./gradlew lintAppRelease
+
+### Unit tests
+
+Make sure the following commands execute without any error:
+
+> ./gradlew testAppReleaseUnitTest
+
+### Internationalisation
+
+When adding new string resources, please only add new entries in file `value/strings.xml`. Translations will be added later by the community of translators with a specific tool named [Weblate](https://translate.riot.im/projects/riot-android/).
+Do not hesitate to use plurals when appropriate.
+
+### Layout
+
+When adding or editing layouts, make sure the layout will render correctly if device uses a RTL (Right To Left) language.
+You can check this in the layout editor preview by selecting any RTL language (ex: Arabic).
+
+Also please check that the colors are ok for all the current themes of Riot. Please use `?attr` instead of `@color` to reference colors in the layout. You can check this in the layout editor preview by selecting all the main themes (`AppTheme.Status`, `AppTheme.Dark`, etc.).
+
+### Authors
+
+Feel free to add an entry in file AUTHORS.rst
+
+## Thanks
+
+Thanks for contributing to Matrix projects!

CONTRIBUTING.rst

@@ -1,5 +1,5 @@
-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-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) [![Android Matrix room](https://img.shields.io/matrix/riot-android:matrix.org.svg)](https://riot.im/app/#/room/#riot-android:matrix.org) [![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.
 
@@ -8,6 +8,11 @@ Riot-Android [![Jenkins](https://img.shields.io/jenkins/s/https/matrix.org/jenki
  [<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.alpha)
 
 
+Contributing
+============
+
+Please refer to [CONTRIBUTING.md](https://github.com/vector-im/riot-android/blob/develop/CONTRIBUTING.md) if you want to contribute the Matrix on Android projects!
+
 Build instructions
 ==================
 
@@ -72,7 +77,7 @@ for example, with FCM, it would give
     }
 ```
 
-- if you use FCM, duplicate appCompile at the end of this file and replace appCompile by appmyriotCompile.
+- if you use FCM, duplicate appImplementation at the end of this file and replace appImplementation by appmyriotImplementation.
 - if you don't, update the "if (!getGradle().getStartParameter().getTaskRequests().toString().contains("fdroid"))" to include your flavor.
 
 Create your flavour directory
@@ -86,8 +91,7 @@ Customise your flavour
 ----------------------
 
 - Open riot-android/vector/src/appmyriot/AndroidManifest.xml
-- Comment the provider section.
-- Change the application name to myRiot with "android:label="myRiot""
+- Change the application name to myRiot with "android:label="myRiot"" and "tools:replace="label"" in the application tag.
 - Any other field can be customised by adding the resources in this directory classpath.
 - Open Android studio, select your flavour.
 - Build and run the app : you made your first Riot app.

README.md

@@ -23,8 +23,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 82000
-    versionNameProp = "0.8.20"
+    versionCodeProp = 82100
+    versionNameProp = "0.8.21"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }