Merge branch 'release/1.5.30'

CHANGES.md

@@ -1,5 +1,10 @@
 Please also refer to the Changelog of Element Android: https://github.com/vector-im/element-android/blob/main/CHANGES.md
 
+Changes in Matrix-SDK v1.5.30 (2023-04-11)
+=========================================
+
+Imported from Element 1.5.30. (https://github.com/vector-im/element-android/releases/tag/v1.5.30)
+
 Changes in Matrix-SDK v1.5.26 (2023-03-08)
 =========================================
 

dependencies.gradle

@@ -6,30 +6,28 @@ ext.versions = [
         'targetCompat'      : JavaVersion.VERSION_11,
 ]
 
-def gradle = "7.4.1"
+def gradle = "7.4.2"
 // Ref: https://kotlinlang.org/releases.html
 def kotlin = "1.8.10"
 def kotlinCoroutines = "1.6.4"
 def dagger = "2.45"
-def firebaseBom = "31.2.1"
-def appDistribution = "16.0.0-beta05"
+def firebaseBom = "31.4.0"
+def appDistribution = "16.0.0-beta06"
 def retrofit = "2.9.0"
 def markwon = "4.6.2"
 def moshi = "1.14.0"
 def lifecycle = "2.5.1"
 def flowBinding = "1.2.0"
-def flipper = "0.178.1"
+def flipper = "0.188.0"
 def epoxy = "5.0.0"
-def mavericks = "3.0.1"
-def glide = "4.14.2"
+def mavericks = "3.0.2"
+def glide = "4.15.1"
 def bigImageViewer = "1.8.1"
 def jjwt = "0.11.5"
-// Temporary version to unblock #6929. Once 0.16.0 is released we should use it, and revert
-// the whole commit which set version 0.16.0-SNAPSHOT
-def vanniktechEmoji = "0.16.0-SNAPSHOT"
-def sentry = "6.14.0"
+def vanniktechEmoji = "0.16.0"
+def sentry = "6.17.0"
 // Use 1.6.0 alpha to fix issue with test
-def fragment = "1.6.0-alpha04"
+def fragment = "1.6.0-alpha08"
 // Testing
 def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819
 def espresso = "3.5.1"
@@ -49,17 +47,17 @@ ext.libs = [
                 'coroutinesTest'          : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutines"
         ],
         androidx    : [
-                'activity'                : "androidx.activity:activity-ktx:1.6.1",
+                'activity'                : "androidx.activity:activity-ktx:1.7.0",
                 'appCompat'               : "androidx.appcompat:appcompat:1.6.1",
                 'biometric'               : "androidx.biometric:biometric:1.1.0",
                 'core'                    : "androidx.core:core-ktx:1.9.0",
-                'recyclerview'            : "androidx.recyclerview:recyclerview:1.2.1",
+                'recyclerview'            : "androidx.recyclerview:recyclerview:1.3.0",
                 'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.6",
                 'fragmentKtx'             : "androidx.fragment:fragment-ktx:$fragment",
                 'fragmentTesting'         : "androidx.fragment:fragment-testing:$fragment",
                 'fragmentTestingManifest' : "androidx.fragment:fragment-testing-manifest:$fragment",
                 'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.4",
-                'work'                    : "androidx.work:work-runtime-ktx:2.7.1",
+                'work'                    : "androidx.work:work-runtime-ktx:2.8.0",
                 'autoFill'                : "androidx.autofill:autofill:1.1.0",
                 'preferenceKtx'           : "androidx.preference:preference-ktx:1.2.0",
                 'junit'                   : "androidx.test.ext:junit:1.1.5",
@@ -70,7 +68,7 @@ ext.libs = [
                 'datastore'               : "androidx.datastore:datastore:1.0.0",
                 'datastorepreferences'    : "androidx.datastore:datastore-preferences:1.0.0",
                 'pagingRuntimeKtx'        : "androidx.paging:paging-runtime-ktx:2.1.2",
-                'coreTesting'             : "androidx.arch.core:core-testing:2.1.0",
+                'coreTesting'             : "androidx.arch.core:core-testing:2.2.0",
                 'testCore'                : "androidx.test:core:$androidxTest",
                 'orchestrator'            : "androidx.test:orchestrator:$androidxOrchestrator",
                 'testRunner'              : "androidx.test:runner:$androidxTest",
@@ -79,7 +77,7 @@ ext.libs = [
                 'espressoContrib'         : "androidx.test.espresso:espresso-contrib:$espresso",
                 'espressoIntents'         : "androidx.test.espresso:espresso-intents:$espresso",
                 'viewpager2'              : "androidx.viewpager2:viewpager2:1.0.0",
-                'transition'              : "androidx.transition:transition:1.2.0",
+                'transition'              : "androidx.transition:transition:1.4.1",
         ],
         google      : [
                 'material'                : "com.google.android.material:material:1.8.0",
@@ -88,7 +86,7 @@ ext.libs = [
                 'appdistributionApi'      : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
                 'appdistribution'         : "com.google.firebase:firebase-appdistribution:$appDistribution",
                 // Phone number https://github.com/google/libphonenumber
-                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.13.6"
+                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.13.8"
         ],
         dagger      : [
                 'dagger'                  : "com.google.dagger:dagger:$dagger",
@@ -103,7 +101,7 @@ ext.libs = [
         ],
         element     : [
                 'opusencoder'             : "io.element.android:opusencoder:1.1.0",
-                'wysiwyg'                 : "io.element.android:wysiwyg:1.0.0"
+                'wysiwyg'                 : "io.element.android:wysiwyg:1.2.2"
         ],
         squareup    : [
                 'moshi'                  : "com.squareup.moshi:moshi:$moshi",
@@ -134,7 +132,7 @@ ext.libs = [
                 'mavericksTesting'       : "com.airbnb.android:mavericks-testing:$mavericks"
         ],
         maplibre    : [
-                'androidSdk'             : "org.maplibre.gl:android-sdk:9.6.0",
+                'androidSdk'             : "org.maplibre.gl:android-sdk:10.0.2",
                 'pluginAnnotation'       : "org.maplibre.gl:android-plugin-annotation-v9:1.0.0"
         ],
         mockk      : [

dependencies_groups.gradle

@@ -42,7 +42,6 @@ ext.groups = [
                 regex: [
                 ],
                 group: [
-                        'com.vanniktech',
                 ]
         ],
         mavenCentral: [
@@ -128,7 +127,7 @@ ext.groups = [
                         'com.sun.xml.bind.mvn',
                         'com.sun.xml.fastinfoset',
                         'com.thoughtworks.qdox',
-                        // 'com.vanniktech',
+                        'com.vanniktech',
                         'commons-cli',
                         'commons-codec',
                         'commons-io',

gradle.properties

@@ -26,7 +26,7 @@ vector.httpLogLevel=NONE
 # Ref: https://github.com/vanniktech/gradle-maven-publish-plugin
 GROUP=org.matrix.android
 POM_ARTIFACT_ID=matrix-android-sdk2
-VERSION_NAME=1.5.26
+VERSION_NAME=1.5.30
 
 POM_PACKAGING=aar
 

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt

@@ -65,27 +65,14 @@ object MatrixPatterns {
     private const val APP_BASE_REGEX = "https://[A-Z0-9.-]+\\.[A-Z]{2,}/[A-Z]{3,}/#/room/"
     const val SEP_REGEX = "/"
 
-    private const val LINK_TO_ROOM_ID_REGEXP = PERMALINK_BASE_REGEX + MATRIX_ROOM_IDENTIFIER_REGEX + SEP_REGEX + MATRIX_EVENT_IDENTIFIER_REGEX
-    private val PATTERN_CONTAIN_MATRIX_TO_PERMALINK_ROOM_ID = LINK_TO_ROOM_ID_REGEXP.toRegex(RegexOption.IGNORE_CASE)
-
-    private const val LINK_TO_ROOM_ALIAS_REGEXP = PERMALINK_BASE_REGEX + MATRIX_ROOM_ALIAS_REGEX + SEP_REGEX + MATRIX_EVENT_IDENTIFIER_REGEX
-    private val PATTERN_CONTAIN_MATRIX_TO_PERMALINK_ROOM_ALIAS = LINK_TO_ROOM_ALIAS_REGEXP.toRegex(RegexOption.IGNORE_CASE)
-
-    private const val LINK_TO_APP_ROOM_ID_REGEXP = APP_BASE_REGEX + MATRIX_ROOM_IDENTIFIER_REGEX + SEP_REGEX + MATRIX_EVENT_IDENTIFIER_REGEX
-    private val PATTERN_CONTAIN_APP_LINK_PERMALINK_ROOM_ID = LINK_TO_APP_ROOM_ID_REGEXP.toRegex(RegexOption.IGNORE_CASE)
-
-    private const val LINK_TO_APP_ROOM_ALIAS_REGEXP = APP_BASE_REGEX + MATRIX_ROOM_ALIAS_REGEX + SEP_REGEX + MATRIX_EVENT_IDENTIFIER_REGEX
-    private val PATTERN_CONTAIN_APP_LINK_PERMALINK_ROOM_ALIAS = LINK_TO_APP_ROOM_ALIAS_REGEXP.toRegex(RegexOption.IGNORE_CASE)
+    private val PATTERN_CONTAIN_MATRIX_TO_PERMALINK = PERMALINK_BASE_REGEX.toRegex(RegexOption.IGNORE_CASE)
+    private val PATTERN_CONTAIN_APP_PERMALINK = APP_BASE_REGEX.toRegex(RegexOption.IGNORE_CASE)
 
     // ascii characters in the range \x20 (space) to \x7E (~)
     val ORDER_STRING_REGEX = "[ -~]+".toRegex()
 
     // list of patterns to find some matrix item.
     val MATRIX_PATTERNS = listOf(
-            PATTERN_CONTAIN_MATRIX_TO_PERMALINK_ROOM_ID,
-            PATTERN_CONTAIN_MATRIX_TO_PERMALINK_ROOM_ALIAS,
-            PATTERN_CONTAIN_APP_LINK_PERMALINK_ROOM_ID,
-            PATTERN_CONTAIN_APP_LINK_PERMALINK_ROOM_ALIAS,
             PATTERN_CONTAIN_MATRIX_USER_IDENTIFIER,
             PATTERN_CONTAIN_MATRIX_ALIAS,
             PATTERN_CONTAIN_MATRIX_ROOM_IDENTIFIER,
@@ -146,6 +133,12 @@ object MatrixPatterns {
         return str != null && str matches PATTERN_CONTAIN_MATRIX_GROUP_IDENTIFIER
     }
 
+    fun isPermalink(str: String?): Boolean {
+        return str != null &&
+                (PATTERN_CONTAIN_MATRIX_TO_PERMALINK.containsMatchIn(str) ||
+                        PATTERN_CONTAIN_APP_PERMALINK.containsMatchIn(str))
+    }
+
     /**
      * Extract server name from a matrix id.
      *

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/CryptoDeviceInfo.kt

@@ -34,6 +34,9 @@ data class CryptoDeviceInfo(
     val isVerified: Boolean
         get() = trustLevel?.isVerified() == true
 
+    val isCrossSigningVerified: Boolean
+        get() = trustLevel?.isCrossSigningVerified() == true
+
     val isUnknown: Boolean
         get() = trustLevel == null
 

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt

@@ -488,7 +488,7 @@ fun Event.getPollContent(): MessagePollContent? {
 }
 
 fun Event.supportsNotification() =
-        this.getClearType() in EventType.MESSAGE + EventType.POLL_START.values + EventType.STATE_ROOM_BEACON_INFO.values
+        this.getClearType() in EventType.MESSAGE + EventType.POLL_START.values + EventType.POLL_END.values + EventType.STATE_ROOM_BEACON_INFO.values
 
 fun Event.isContentReportable() =
         this.getClearType() in EventType.MESSAGE + EventType.STATE_ROOM_BEACON_INFO.values

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt

@@ -17,6 +17,7 @@
 package org.matrix.android.sdk.api.session.permalinks
 
 import android.text.Spannable
+import android.util.Patterns
 import org.matrix.android.sdk.api.MatrixPatterns
 
 /**
@@ -44,22 +45,26 @@ object MatrixLinkify {
         }
         val text = spannable.toString()
         var hasMatch = false
-        for (pattern in MatrixPatterns.MATRIX_PATTERNS) {
+        for (pattern in listOf(Patterns.WEB_URL.toRegex()).plus(MatrixPatterns.MATRIX_PATTERNS)) {
             for (match in pattern.findAll(spannable)) {
                 hasMatch = true
                 val startPos = match.range.first
                 if (startPos == 0 || text[startPos - 1] != '/') {
                     val endPos = match.range.last + 1
                     var url = text.substring(match.range)
-                    if (MatrixPatterns.isUserId(url) ||
+                    val isPermalink = MatrixPatterns.isPermalink(url)
+                    if (isPermalink ||
+                            MatrixPatterns.isUserId(url) ||
                             MatrixPatterns.isRoomAlias(url) ||
                             MatrixPatterns.isRoomId(url) ||
                             MatrixPatterns.isGroupId(url) ||
                             MatrixPatterns.isEventId(url)) {
-                        url = PermalinkService.MATRIX_TO_URL_BASE + url
+                        if (!isPermalink) {
+                            url = PermalinkService.MATRIX_TO_URL_BASE + url
+                        }
+                        val span = MatrixPermalinkSpan(url, callback)
+                        spannable.setSpan(span, startPos, endPos, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
                     }
-                    val span = MatrixPermalinkSpan(url, callback)
-                    spannable.setSpan(span, startPos, endPos, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
                 }
             }
         }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/EventMatchCondition.kt

@@ -39,8 +39,17 @@ class EventMatchCondition(
     override fun technicalDescription() = "'$key' matches '$pattern'"
 
     fun isSatisfied(event: Event): Boolean {
-        // TODO encrypted events?
-        val rawJson = MoshiProvider.providesMoshi().adapter(Event::class.java).toJsonValue(event) as? Map<*, *>
+        val rawJson: Map<*, *> = (MoshiProvider.providesMoshi().adapter(Event::class.java).toJsonValue(event) as? Map<*, *>)
+                ?.let { rawJson ->
+                    val decryptedRawJson = event.mxDecryptionResult?.payload
+                    if (decryptedRawJson != null) {
+                        rawJson
+                                .toMutableMap()
+                                .apply { putAll(decryptedRawJson) }
+                    } else {
+                        rawJson
+                    }
+                }
                 ?: return false
         val value = extractField(rawJson, key) ?: return false
 

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/RoomMemberQueryParams.kt

@@ -30,7 +30,8 @@ data class RoomMemberQueryParams(
         val displayName: QueryStringValue,
         val memberships: List<Membership>,
         val userId: QueryStringValue,
-        val excludeSelf: Boolean
+        val excludeSelf: Boolean,
+        val displayNameOrUserId: QueryStringValue,
 ) {
 
     class Builder {
@@ -39,12 +40,14 @@ data class RoomMemberQueryParams(
         var displayName: QueryStringValue = QueryStringValue.IsNotEmpty
         var memberships: List<Membership> = Membership.all()
         var excludeSelf: Boolean = false
+        var displayNameOrUserId: QueryStringValue = QueryStringValue.NoCondition
 
         fun build() = RoomMemberQueryParams(
                 displayName = displayName,
                 memberships = memberships,
                 userId = userId,
-                excludeSelf = excludeSelf
+                excludeSelf = excludeSelf,
+                displayNameOrUserId = displayNameOrUserId
         )
     }
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt

@@ -76,7 +76,8 @@ sealed class MatrixItem(
     data class RoomItem(
             override val id: String,
             override val displayName: String? = null,
-            override val avatarUrl: String? = null
+            override val avatarUrl: String? = null,
+            val roomDisplayName: String? = null
     ) :
             MatrixItem(id, displayName, avatarUrl) {
         init {
@@ -102,7 +103,8 @@ sealed class MatrixItem(
     data class RoomAliasItem(
             override val id: String,
             override val displayName: String? = null,
-            override val avatarUrl: String? = null
+            override val avatarUrl: String? = null,
+            val roomDisplayName: String? = null
     ) :
             MatrixItem(id, displayName, avatarUrl) {
         init {
@@ -136,6 +138,8 @@ sealed class MatrixItem(
         val displayName = when (this) {
             // use the room display name for the notify everyone item
             is EveryoneInRoomItem -> roomDisplayName
+            is RoomItem -> roomDisplayName ?: displayName
+            is RoomAliasItem -> roomDisplayName ?: displayName
             else -> displayName
         }
         return (displayName?.takeIf { it.isNotBlank() } ?: id)

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt

@@ -94,7 +94,10 @@ internal class EventDecryptor @Inject constructor(
      * @param timeline the id of the timeline where the event is decrypted. It is used to prevent replay attack.
      */
     suspend fun decryptEventAndSaveResult(event: Event, timeline: String) {
-        tryOrNull(message = "Unable to decrypt the event") {
+        // event is not encrypted or already decrypted
+        if (event.getClearType() != EventType.ENCRYPTED) return
+
+        tryOrNull(message = "decryptEventAndSaveResult | Unable to decrypt the event") {
             decryptEvent(event, timeline)
         }
                 ?.let { result ->

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt

@@ -297,7 +297,7 @@ internal fun updateThreadNotifications(roomId: String, realm: Realm, currentUser
     val readReceipt = findMyReadReceipt(realm, roomId, currentUserId, threadId = rootThreadEventId) ?: return
 
     val readReceiptChunk = ChunkEntity
-            .findIncludingEvent(realm, readReceipt) ?: return
+            .findIncludingEvent(realm, roomId, readReceipt) ?: return
 
     val readReceiptChunkThreadEvents = readReceiptChunk
             .timelineEvents

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt

@@ -72,15 +72,16 @@ internal fun ChunkEntity.Companion.findEventInThreadChunk(realm: Realm, roomId:
             .findFirst()
 }
 
-internal fun ChunkEntity.Companion.findAllIncludingEvents(realm: Realm, eventIds: List<String>): RealmResults<ChunkEntity> {
+internal fun ChunkEntity.Companion.findAllIncludingEvents(realm: Realm, roomId: String, eventIds: List<String>): RealmResults<ChunkEntity> {
     return realm.where<ChunkEntity>()
+            .equalTo(ChunkEntityFields.ROOM.ROOM_ID, roomId)
             .`in`(ChunkEntityFields.TIMELINE_EVENTS.EVENT_ID, eventIds.toTypedArray())
             .isNull(ChunkEntityFields.ROOT_THREAD_EVENT_ID)
             .findAll()
 }
 
-internal fun ChunkEntity.Companion.findIncludingEvent(realm: Realm, eventId: String): ChunkEntity? {
-    return findAllIncludingEvents(realm, listOf(eventId)).firstOrNull()
+internal fun ChunkEntity.Companion.findIncludingEvent(realm: Realm, roomId: String, eventId: String): ChunkEntity? {
+    return findAllIncludingEvents(realm, roomId, listOf(eventId)).firstOrNull()
 }
 
 internal fun ChunkEntity.Companion.create(

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt

@@ -76,11 +76,11 @@ private fun hasReadMissingEvent(realm: Realm,
                                 userId: String,
                                 eventId: String,
                                 threadId: String? = ReadService.THREAD_ID_MAIN): Boolean {
-    return realm.doesEventExistInChunkHistory(eventId) && realm.hasReadReceiptInLatestChunk(latestChunkEntity, roomId, userId, threadId)
+    return realm.doesEventExistInChunkHistory(roomId, eventId) && realm.hasReadReceiptInLatestChunk(latestChunkEntity, roomId, userId, threadId)
 }
 
-private fun Realm.doesEventExistInChunkHistory(eventId: String): Boolean {
-    return ChunkEntity.findIncludingEvent(this, eventId) != null
+private fun Realm.doesEventExistInChunkHistory(roomId: String, eventId: String): Boolean {
+    return ChunkEntity.findIncludingEvent(this, roomId, eventId) != null
 }
 
 private fun Realm.hasReadReceiptInLatestChunk(latestChunkEntity: ChunkEntity, roomId: String, userId: String, threadId: String?): Boolean {

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt

@@ -41,7 +41,7 @@ internal class WorkManagerProvider @Inject constructor(
         private val coroutineDispatchers: MatrixCoroutineDispatchers,
         private val sessionScope: CoroutineScope
 ) {
-    private val tag = MATRIX_SDK_TAG_PREFIX + sessionId
+    val tag = MATRIX_SDK_TAG_PREFIX + sessionId
 
     val workManager = WorkManager.getInstance(context)