Merge branch 'release/0.9.17'

matrix-org · Feb 21, 2019 · e1cd00e · e1cd00e
2 parents 6417d3f + 4b3d651
commit e1cd00e
Show file tree

Hide file tree

Showing 50 changed files with 1,617 additions and 301 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,4 +1,26 @@
-Changes to Matrix Android SDK in 0.9.16 (2018-02-01)
+Changes to Matrix Android SDK in 0.9.17 (2019-02-21)
+=======================================================
+
+Features:
+ - Ensure Room V3 eventId format is supported.
+
+Improvements:
+ - Crypto: Cancel share request on restore/import (vector-im/riot-android#2928).
+ - CreateRoomParams: add `powerLevelContentOverride` param to override the default power level event.
+ - KeysBackup: Declare backup trust using new `PUT /room_keys/version/{version}` API (vector-im/riot-android#2921).
+
+Bugfix:
+ - Fix DataSaveMode issue in filter
+ - CreateRoomParams - setHistoryVisibility: remove existing value if any.
+ - Fix issue in Japanese translation (#423)
+
+Others:
+ - Create a RealmCryptoStoreModule to allow clients of the Matrix SDK to use Realm
+
+Build:
+ - Enforce lint rules check
+
+Changes to Matrix Android SDK in 0.9.16 beta (2019-02-01)
 =======================================================
 
 Improvements:
@@ -1413,7 +1435,7 @@ Features:
 =======================================================
 
 
-Changes to Matrix Android SDK in 0.9.X (2018-XX-XX)
+Changes to Matrix Android SDK in 0.9.X (2019-XX-XX)
 =======================================================
 
 Features:

diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle
@@ -27,8 +27,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 916
-        versionName "0.9.16"
+        versionCode 917
+        versionName "0.9.17"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -98,18 +98,34 @@ android {
 
 
     lintOptions {
-        disable 'InvalidPackage'
-        disable 'MissingTranslation'
-        disable 'RestrictedApi'
+        warning 'MissingTranslation'
 
         // Treat some warnings as errors
+        // Resources
+        error 'TypographyEllipsis'
+        warning 'ImpliedQuantity'
+
+        // UX
+        error 'ButtonOrder'
+
+        // Layout
         error 'StringFormatCount'
         error 'HardcodedText'
         error 'SpUsage'
+        error 'ObsoleteLayoutParam'
+        error 'InefficientWeight'
+        error 'DisableBaselineAlignment'
+        error 'ScrollViewSize'
 
         // RTL
         error 'RtlEnabled'
         error 'RtlHardcoded'
+        error 'RtlSymmetry'
+
+        // Code
+        error 'SetTextI18n'
+        error 'ViewConstructor'
+        error 'UseValueOf'
     }
 
     repositories {

diff --git a/matrix-sdk/src/androidTest/java/org/matrix/androidsdk/crypto/CryptoStoreHelper.kt b/matrix-sdk/src/androidTest/java/org/matrix/androidsdk/crypto/CryptoStoreHelper.kt
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:Suppress("DEPRECATION")
+
 package org.matrix.androidsdk.crypto
 
 import android.support.test.InstrumentationRegistry

diff --git a/matrix-sdk/src/androidTest/java/org/matrix/androidsdk/crypto/CryptoStoreImportationTest.kt b/matrix-sdk/src/androidTest/java/org/matrix/androidsdk/crypto/CryptoStoreImportationTest.kt
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:Suppress("DEPRECATION")
+
 package org.matrix.androidsdk.crypto
 
 import android.support.test.InstrumentationRegistry
@@ -129,8 +131,11 @@ class CryptoStoreImportationTest {
     fun test_importationOutgoingRoomKeyRequest() {
         val request = OutgoingRoomKeyRequest(
                 // Request body
-                HashMap<String, String>().apply {
-                    put("key", "value")
+                RoomKeyRequestBody().apply {
+                    algorithm = "algorithm"
+                    roomId = "roomId"
+                    senderKey = "senderKey"
+                    sessionId = "sessionId"
                 },
                 // Recipients
                 ArrayList<Map<String, String>>().apply {
@@ -153,7 +158,10 @@ class CryptoStoreImportationTest {
 
                     assertNotNull(requestFromRealm)
 
-                    assertEquals("value", requestFromRealm!!.mRequestBody["key"])
+                    assertEquals("algorithm", requestFromRealm!!.mRequestBody.algorithm)
+                    assertEquals("roomId", requestFromRealm.mRequestBody.roomId)
+                    assertEquals("senderKey", requestFromRealm.mRequestBody.senderKey)
+                    assertEquals("sessionId", requestFromRealm.mRequestBody.sessionId)
                     assertEquals("recipientsValue", requestFromRealm.mRecipients[0]["recipient"])
                     assertEquals("RequestId", requestFromRealm.mRequestId)
                     assertEquals(OutgoingRoomKeyRequest.RequestState.CANCELLATION_PENDING_AND_WILL_RESEND, requestFromRealm.mState)
@@ -169,9 +177,9 @@ class CryptoStoreImportationTest {
             mRequestId = "RequestId"
             mRequestBody = RoomKeyRequestBody().apply {
                 algorithm = "Algo"
-                room_id = "RoomId"
-                sender_key = "SenderKey"
-                session_id = "SessionId"
+                roomId = "RoomId"
+                senderKey = "SenderKey"
+                sessionId = "SessionId"
             }
         }
 
@@ -188,9 +196,9 @@ class CryptoStoreImportationTest {
                     assertEquals("DeviceId", requestFromRealm.mDeviceId)
                     assertEquals("RequestId", requestFromRealm.mRequestId)
                     assertEquals("Algo", requestFromRealm.mRequestBody.algorithm)
-                    assertEquals("RoomId", requestFromRealm.mRequestBody.room_id)
-                    assertEquals("SenderKey", requestFromRealm.mRequestBody.sender_key)
-                    assertEquals("SessionId", requestFromRealm.mRequestBody.session_id)
+                    assertEquals("RoomId", requestFromRealm.mRequestBody.roomId)
+                    assertEquals("SenderKey", requestFromRealm.mRequestBody.senderKey)
+                    assertEquals("SessionId", requestFromRealm.mRequestBody.sessionId)
                 })
     }