Merge branch 'release/1.5.32' into main

element-hq · Apr 19, 2023 · 8dcb5f7 · 8dcb5f7
2 parents 0b09a51 + ca849e4
commit 8dcb5f7
Show file tree

Hide file tree

Showing 33 changed files with 223 additions and 104 deletions.
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -11,7 +11,7 @@ jobs:
       - run: |
           npm install --save-dev @babel/plugin-transform-flow-strip-types
       - name: Danger
-        uses: danger/danger-js@11.2.4
+        uses: danger/danger-js@11.2.6
         with:
           args: "--dangerfile ./tools/danger/dangerfile.js"
         env:

diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -66,7 +66,7 @@ jobs:
           yarn add danger-plugin-lint-report --dev
       - name: Danger lint
         if: always()
-        uses: danger/danger-js@11.2.4
+        uses: danger/danger-js@11.2.6
         with:
           args: "--dangerfile ./tools/danger/dangerfile-lint.js"
         env:

diff --git a/.github/workflows/sync-from-external-sources.yml b/.github/workflows/sync-from-external-sources.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Run Emoji script
         run: ./tools/import_emojis.py
       - name: Create Pull Request for Emojis
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: Sync Emojis
           title: Sync Emojis
@@ -49,7 +49,7 @@ jobs:
       - name: Run SAS String script
         run: ./tools/import_sas_strings.py
       - name: Create Pull Request for SAS Strings
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: Sync SAS Strings
           title: Sync SAS Strings
@@ -68,7 +68,7 @@ jobs:
       - name: Run analytics import script
         run: ./tools/import_analytic_plan.sh
       - name: Create Pull Request for analytics plan
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: Sync analytics plan
           title: Sync analytics plan

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,13 @@
+Changes in Element v1.5.32 (2023-04-19)
+=======================================
+
+Bugfixes 🐛
+----------
+ - Fix multiple read receipts for the same user in timeline. ([#7882](https://github.com/vector-im/element-android/issues/7882))
+ - The new permalink rendering is not applied on permalink created with the potential clientPermalinkBaseUrl ([#8307](https://github.com/vector-im/element-android/issues/8307))
+ - Keep screen on while recording voicebroadcast ([#8313](https://github.com/vector-im/element-android/issues/8313))
+
+
 Changes in Element v1.5.30 (2023-04-05)
 =======================================
 

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -18,7 +18,7 @@ def markwon = "4.6.2"
 def moshi = "1.14.0"
 def lifecycle = "2.5.1"
 def flowBinding = "1.2.0"
-def flipper = "0.188.0"
+def flipper = "0.189.0"
 def epoxy = "5.0.0"
 def mavericks = "3.0.2"
 def glide = "4.15.1"
@@ -27,7 +27,7 @@ def jjwt = "0.11.5"
 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-alpha08"
+def fragment = "1.6.0-alpha09"
 // 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"
@@ -50,14 +50,14 @@ ext.libs = [
                 '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",
+                'core'                    : "androidx.core:core-ktx:1.10.0",
                 '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.8.0",
+                'work'                    : "androidx.work:work-runtime-ktx:2.8.1",
                 'autoFill'                : "androidx.autofill:autofill:1.1.0",
                 'preferenceKtx'           : "androidx.preference:preference-ktx:1.2.0",
                 'junit'                   : "androidx.test.ext:junit:1.1.5",
@@ -86,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.8"
+                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.13.10"
         ],
         dagger      : [
                 'dagger'                  : "com.google.dagger:dagger:$dagger",

diff --git a/fastlane/metadata/android/en-US/changelogs/40105320.txt b/fastlane/metadata/android/en-US/changelogs/40105320.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Mainly bugfixing.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
@@ -62,7 +62,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.5.30\""
+        buildConfigField "String", "SDK_VERSION", "\"1.5.32\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""

diff --git a/...ndroidTest/java/org/matrix/android/sdk/internal/session/room/send/TestPermalinkService.kt b/...ndroidTest/java/org/matrix/android/sdk/internal/session/room/send/TestPermalinkService.kt
@@ -48,4 +48,8 @@ class TestPermalinkService : PermalinkService {
             MARKDOWN -> "[%2\$s](https://matrix.to/#/%1\$s)"
         }
     }
+
+    override fun isPermalinkSupported(supportedHosts: Array<String>, url: String): Boolean {
+        return false
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt
@@ -62,7 +62,7 @@ object MatrixPatterns {
     // regex pattern to find permalink with message id.
     // Android does not support in URL so extract it.
     private const val PERMALINK_BASE_REGEX = "https://matrix\\.to/#/"
-    private const val APP_BASE_REGEX = "https://[A-Z0-9.-]+\\.[A-Z]{2,}/[A-Z]{3,}/#/room/"
+    private const val APP_BASE_REGEX = "https://[A-Z0-9.-]+\\.[A-Z]{2,}/#/(room|user)/"
     const val SEP_REGEX = "/"
 
     private val PATTERN_CONTAIN_MATRIX_TO_PERMALINK = PERMALINK_BASE_REGEX.toRegex(RegexOption.IGNORE_CASE)

diff --git a/...k-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt b/...k-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt
@@ -97,4 +97,15 @@ interface PermalinkService {
      * @return the created template
      */
     fun createMentionSpanTemplate(type: SpanTemplateType, forceMatrixTo: Boolean = false): String
+
+    /**
+     * Check if the url is a permalink. It must be a matrix.to link
+     * or a link with host provided by the string-array `permalink_supported_hosts` in the config file
+     *
+     * @param supportedHosts the list of hosts supported for permalinks
+     * @param url the link to check, Ex: "https://matrix.to/#/@benoit:matrix.org"
+     *
+     * @return true when url is a permalink
+     */
+    fun isPermalinkSupported(supportedHosts: Array<String>, url: String): Boolean
 }
diff --git a/...ndroid/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt b/...ndroid/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
@@ -21,6 +21,7 @@ import io.realm.kotlin.createObject
 import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.read.ReadService
 import org.matrix.android.sdk.internal.crypto.model.SessionInfo
 import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
@@ -76,7 +77,7 @@ internal fun ChunkEntity.addTimelineEvent(
     val senderId = eventEntity.sender ?: ""
 
     // Update RR for the sender of a new message with a dummy one
-    val readReceiptsSummaryEntity = if (!ownedByThreadChunk) handleReadReceipts(realm, roomId, eventEntity, senderId) else null
+    val readReceiptsSummaryEntity = handleReadReceiptsOfSender(realm, roomId, eventEntity, senderId)
     val timelineEventEntity = realm.createObject<TimelineEventEntity>().apply {
         this.localId = localId
         this.root = eventEntity
@@ -124,15 +125,20 @@ internal fun computeIsUnique(
     }
 }
 
-private fun handleReadReceipts(realm: Realm, roomId: String, eventEntity: EventEntity, senderId: String): ReadReceiptsSummaryEntity {
+private fun handleReadReceiptsOfSender(realm: Realm, roomId: String, eventEntity: EventEntity, senderId: String): ReadReceiptsSummaryEntity {
     val readReceiptsSummaryEntity = ReadReceiptsSummaryEntity.where(realm, eventEntity.eventId).findFirst()
             ?: realm.createObject<ReadReceiptsSummaryEntity>(eventEntity.eventId).apply {
                 this.roomId = roomId
             }
     val originServerTs = eventEntity.originServerTs
     if (originServerTs != null) {
         val timestampOfEvent = originServerTs.toDouble()
-        val readReceiptOfSender = ReadReceiptEntity.getOrCreate(realm, roomId = roomId, userId = senderId, threadId = eventEntity.rootThreadEventId)
+        val readReceiptOfSender = ReadReceiptEntity.getOrCreate(
+                realm = realm,
+                roomId = roomId,
+                userId = senderId,
+                threadId = eventEntity.rootThreadEventId ?: ReadService.THREAD_ID_MAIN
+        )
         // If the synced RR is older, update
         if (timestampOfEvent > readReceiptOfSender.originServerTs) {
             val previousReceiptsSummary = ReadReceiptsSummaryEntity.where(realm, eventId = readReceiptOfSender.eventId).findFirst()

diff --git a/...c/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt b/...c/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.permalinks
 
+import androidx.core.net.toUri
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService
 import javax.inject.Inject
@@ -47,4 +48,9 @@ internal class DefaultPermalinkService @Inject constructor(
     override fun createMentionSpanTemplate(type: PermalinkService.SpanTemplateType, forceMatrixTo: Boolean): String {
         return permalinkFactory.createMentionSpanTemplate(type, forceMatrixTo)
     }
+
+    override fun isPermalinkSupported(supportedHosts: Array<String>, url: String): Boolean {
+        return url.startsWith(PermalinkService.MATRIX_TO_URL_BASE) ||
+                supportedHosts.any { url.toUri().host == it }
+    }
 }