Merge branch 'release/0.9.10'

CHANGES.rst

@@ -1,3 +1,31 @@
+Changes to Matrix Android SDK in 0.9.10 (2018-10-08)
+=======================================================
+
+Features:
+ - Handle m.room.pinned_events state event and ServerNoticeUsageLimitContent
+ - Manage server_notices tag and server quota notices (vector-im/riot-android#2440)
+ - Add handling of filters (#345)
+
+Improvements:
+ - Encrypt local data (PR #305)
+ - Add GET /versions request to the LoginRestClient
+
+Bugfix:
+ - Fix excessive whitespace on quoted messages (#348)
+ - Scroll to bottom no longer keeps inertia after position change (#354)
+
+API Change:
+ - A Builder has been added to create HomeServerConnectionConfig instances.
+ - SentState.UNDELIVERABLE has been renamed to SentState.UNDELIVERED
+ - Extract patterns and corresponding methods from MXSession to a dedicated MXPatterns class.
+ - MatrixMessageListFragment is now abstract and take an Adapter type as class parameter
+ - Parameter guestAccess removed from MxSession.createRoom(). It had no effect.
+ - EventTimeline is now exposed as an interface. Use EventTimelineFactory to instantiate it. 
+
+Others:
+ - Boolean deserialization is more permissive: "1" or 1 will be handle as a true value (#358)
+ - MXSession.setUseDataSaveMode(boolean) is now deprecated. Handle filter-id lookup in your app and use MXSession.setSyncFilterOrFilterId(String)
+
 Changes to Matrix Android SDK in 0.9.9 (2018-08-30)
 =======================================================
 

README.md

@@ -1,3 +1,5 @@
+[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=matrix.android.sdk&metric=alert_status)](https://sonarcloud.io/dashboard?id=matrix.android.sdk) [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=matrix.android.sdk&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=matrix.android.sdk) [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=matrix.android.sdk&metric=bugs)](https://sonarcloud.io/dashboard?id=matrix.android.sdk) 
+
 matrix-android-sdk
 ==================
 The [Matrix] SDK for Android wraps the Matrix REST API calls in asynchronous Java methods and provides basic structures for storing and handling data.

build.gradle

@@ -4,10 +4,14 @@ buildscript {
  repositories {
  jcenter()
  google()
+ maven {
+ url "https://plugins.gradle.org/m2/"
+ }
  }
  dependencies {
  classpath 'com.android.tools.build:gradle:3.1.2'
 
+ 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,3 +23,31 @@ allprojects {
  google()
  }
 }
+
+apply plugin: 'org.sonarqube'
+
+sonarqube {
+ properties {
+ property "sonar.projectName", "Matrix Android SDK"
+ property "sonar.projectKey", "matrix.android.sdk"
+ property "sonar.host.url", "https://sonarcloud.io"
+ property "sonar.projectVersion", project(":matrix-sdk").android.defaultConfig.versionName
+ property "sonar.sourceEncoding", "UTF-8"
+ property "sonar.links.homepage", "https://github.com/matrix-org/matrix-android-sdk/"
+ property "sonar.links.ci", "https://matrix.org/jenkins/view/MatrixView/job/MatrixAndroidSDKDevelop/"
+ property "sonar.links.scm", "https://github.com/matrix-org/matrix-android-sdk/"
+ property "sonar.links.issue", "https://github.com/matrix-org/matrix-android-sdk/issues"
+ property "sonar.organization", "new_vector_ltd_organization"
+ property "sonar.login", project.hasProperty("SONAR_LOGIN") ? SONAR_LOGIN : "invalid"
+ }
+}
+
+project(":matrix-sdk") {
+ sonarqube {
+ properties {
+ property "sonar.sources", project(":matrix-sdk").android.sourceSets.main.java.srcDirs
+ // exclude source code from analyses separated by a colon (:)
+ // property "sonar.exclusions", "**/*.*"
+ }
+ }
+}

gradle.properties

@@ -17,11 +17,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-
-# To do a signed release APK, put these variables in ~/.gradle/gradle.properties
-# RELEASE_STORE_FILE=/path/to/keystore
-# RELEASE_STORE_PASSWORD=password
-# 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
 
 org.gradle.configureondemand=false

matrix-sdk/build.gradle

@@ -14,8 +14,8 @@ android {
  defaultConfig {
  minSdkVersion 16
  targetSdkVersion 26
- versionCode 909
- versionName "0.9.9"
+ versionCode 910
+ versionName "0.9.10"
  resValue "string", "flavor_description", "SDKApp"
  testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
  }
@@ -26,15 +26,6 @@ android {
  include "**/*Test.class" // whatever Ant pattern matches your test class files
  }
 
- signingConfigs {
- release {
- storeFile file(project.hasProperty("RELEASE_STORE_FILE") ? RELEASE_STORE_FILE : "/dummy/path")
- storePassword project.hasProperty("RELEASE_STORE_PASSWORD") ? RELEASE_STORE_PASSWORD : "dummy password"
- keyAlias project.hasProperty("RELEASE_KEY_ALIAS") ? RELEASE_KEY_ALIAS : "dummy alias"
- keyPassword project.hasProperty("RELEASE_KEY_PASSWORD") ? RELEASE_KEY_PASSWORD : "dummy password"
- }
- }
-
  android.libraryVariants.all { variant ->
  task("${variant.name}Docs", type: Javadoc) {
  source = variant.javaCompiler.source
@@ -145,11 +136,9 @@ dependencies {
  testImplementation 'junit:junit:4.12'
  testImplementation 'org.hamcrest:hamcrest-library:1.3'
  testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3' // fixes issue on linux/mac
-
- // Robolectric
  testImplementation "org.robolectric:robolectric:3.8"
 
- testImplementation 'junit:junit:4.12'
+ // Robolectric
  androidTestImplementation 'junit:junit:4.12'
  androidTestImplementation 'com.android.support:support-annotations:27.1.1'
  androidTestImplementation 'com.android.support.test:runner:1.0.2'