Merge branch 'release/1.6.16' into main

.github/workflows/sync-from-external-sources.yml

@@ -58,27 +58,3 @@ jobs:
  - Update SAS Strings from matrix-doc.
  branch: sync-sas-strings
  base: develop
-
- sync-analytics-plan:
- runs-on: ubuntu-latest
- # Skip in forks
- if: github.repository == 'element-hq/element-android'
- # No concurrency required, runs every time on a schedule.
- steps:
- - uses: actions/checkout@v3
- - name: Run analytics import script
- run: ./tools/import_analytic_plan.sh
- - name: Create Pull Request for analytics plan
- uses: peter-evans/create-pull-request@v5
- with:
- commit-message: Sync analytics plan
- title: Sync analytics plan
- body: |
- ### Update analytics plan
- Reviewers:
- - [ ] Please remove usage of Event or Enum which may have been removed or updated
- - [ ] please ensure new Events or new Enums are used to send analytics by pushing new commit(s) to this PR.
-
- *Note*: Change are coming from [this project](https://github.com/matrix-org/matrix-analytics-events)
- branch: sync-analytics-plan
- base: develop

CHANGES.md

@@ -1,3 +1,18 @@
+Changes in Element v1.6.16 (2024-05-29)
+=======================================
+
+Bugfixes 🐛
+----------
+ - Fix crash when accessing a local file and permission is revoked. ([#3616](https://github.com/element-hq/element-android/issues/3616))
+ - Fixes Element on Android 12+ being ineligible for URL deeplinks ([#5748](https://github.com/element-hq/element-android/issues/5748))
+ - Restore formatting when restoring a draft. Also keep formatting when switching composer mode. ([#7466](https://github.com/element-hq/element-android/issues/7466))
+
+Other changes
+-------------
+ - Update posthog sdk to 3.2.0 ([#8820](https://github.com/element-hq/element-android/issues/8820))
+ - Update Rust crypto SDK to version 0.4.1 ([#8838](https://github.com/element-hq/element-android/issues/8838))
+
+
 Changes in Element v1.6.14 (2024-04-02)
 =======================================
 

dependencies_groups.gradle

@@ -9,6 +9,7 @@ ext.groups = [
  'com.github.hyuwah',
  'com.github.jetradarmobile',
  'com.github.MatrixFrog',
+ 'com.github.matrix-org',
  'com.github.tapadoo',
  'com.github.UnifiedPush',
  'com.github.yalantis',
@@ -120,7 +121,7 @@ ext.groups = [
  'com.parse.bolts',
  'com.pinterest',
  'com.pinterest.ktlint',
- 'com.posthog.android',
+ 'com.posthog',
  'com.squareup',
  'com.squareup.curtains',
  'com.squareup.duktape',

docs/analytics.md

@@ -17,7 +17,7 @@ We ask for the user to give consent before sending any analytics data.
 
 The analytics plan is shared between all Element clients. To add an Event, please open a PR to this project: https://github.com/matrix-org/matrix-analytics-events
 
-Then, once the PR has been merged, you can run the tool `import_analytic_plan.sh` to import the plan to Element, and then you can use the new Event. Note that this tool is run by Github action once a week.
+Then, once the PR has been merged, and the library is release, you can update the version of the library in the `build.gradle` file.
 
 ## Forks of Element
 

fastlane/metadata/android/en-US/changelogs/40106160.txt

@@ -0,0 +1,2 @@
+Main changes in this version: Bug fixes.
+Full changelog: https://github.com/element-hq/element-android/releases

library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt

@@ -31,7 +31,7 @@ class AudioPicker : Picker<MultiPickerAudioType>() {
  * Returns selected audio files or empty list if user did not select any files.
  */
  override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerAudioType> {
- return getSelectedUriList(data).mapNotNull { selectedUri ->
+ return getSelectedUriList(context, data).mapNotNull { selectedUri ->
  selectedUri.toMultiPickerAudioType(context)
  }
  }

library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt

@@ -41,7 +41,7 @@ class FilePicker : Picker<MultiPickerBaseType>() {
  * Returns selected files or empty list if user did not select any files.
  */
  override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerBaseType> {
- return getSelectedUriList(data).mapNotNull { selectedUri ->
+ return getSelectedUriList(context, data).mapNotNull { selectedUri ->
  val type = context.contentResolver.getType(selectedUri)
 
  when {

library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt

@@ -31,7 +31,7 @@ class ImagePicker : Picker<MultiPickerImageType>() {
  * Returns selected image files or empty list if user did not select any files.
  */
  override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerImageType> {
- return getSelectedUriList(data).mapNotNull { selectedUri ->
+ return getSelectedUriList(context, data).mapNotNull { selectedUri ->
  selectedUri.toMultiPickerImageType(context)
  }
  }

library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt

@@ -33,7 +33,7 @@ class MediaPicker : Picker<MultiPickerBaseMediaType>() {
  * Returns selected image/video files or empty list if user did not select any files.
  */
  override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerBaseMediaType> {
- return getSelectedUriList(data).mapNotNull { selectedUri ->
+ return getSelectedUriList(context, data).mapNotNull { selectedUri ->
  val mimeType = context.contentResolver.getType(selectedUri)
 
  if (mimeType.isMimeTypeVideo()) {

library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt

@@ -16,6 +16,7 @@
 
 package im.vector.lib.multipicker
 
+import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -58,7 +59,17 @@ abstract class Picker<T> {
  uriList.forEach {
  for (resolveInfo in resInfoList) {
  val packageName: String = resolveInfo.activityInfo.packageName
- context.grantUriPermission(packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+
+ // Replace implicit intent by an explicit to fix crash on some devices like Xiaomi.
+ // see https://juejin.cn/post/7031736325422186510
+ try {
+ context.grantUriPermission(packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+ } catch (e: Exception) {
+ continue
+ }
+ data.action = null
+ data.component = ComponentName(packageName, resolveInfo.activityInfo.name)
+ break
  }
  }
  return getSelectedFiles(context, data)
@@ -82,7 +93,7 @@ abstract class Picker<T> {
  activityResultLauncher.launch(createIntent().apply { addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) })
  }
 
- protected fun getSelectedUriList(data: Intent?): List<Uri> {
+ protected fun getSelectedUriList(context: Context, data: Intent?): List<Uri> {
  val selectedUriList = mutableListOf<Uri>()
  val dataUri = data?.data
  val clipData = data?.clipData
@@ -104,6 +115,6 @@ abstract class Picker<T> {
  }
  }
  }
- return selectedUriList
+ return selectedUriList.onEach { context.grantUriPermission(context.applicationContext.packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION) }
  }
 }

library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt

@@ -31,7 +31,7 @@ class VideoPicker : Picker<MultiPickerVideoType>() {
  * Returns selected video files or empty list if user did not select any files.
  */
  override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerVideoType> {
- return getSelectedUriList(data).mapNotNull { selectedUri ->
+ return getSelectedUriList(context, data).mapNotNull { selectedUri ->
  selectedUri.toMultiPickerVideoType(context)
  }
  }

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.6.14\""
+ buildConfigField "String", "SDK_VERSION", "\"1.6.16\""
 
  buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
  buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
@@ -215,7 +215,7 @@ dependencies {
 
  implementation libs.google.phonenumber
 
- implementation("org.matrix.rustcomponents:crypto-android:0.3.16")
+ implementation("org.matrix.rustcomponents:crypto-android:0.4.1")
 // api project(":library:rustCrypto")
 
  testImplementation libs.tests.junit

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

@@ -37,6 +37,10 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
 import org.matrix.android.sdk.api.util.MatrixJsonParser
 import timber.log.Timber
 
+// n.b MSC3886/MSC3903/MSC3906 that this is based on are now closed.
+// However, we want to keep this implementation around for some time.
+// TODO define an end-of-life date for this implementation.
+
 /**
  * Implementation of MSC3906 to sign in + E2EE set up using a QR code.
  */

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

@@ -31,8 +31,8 @@ import org.matrix.android.sdk.internal.crypto.verification.SasVerification
 import org.matrix.android.sdk.internal.crypto.verification.VerificationRequest
 import org.matrix.android.sdk.internal.crypto.verification.prepareMethods
 import org.matrix.rustcomponents.sdk.crypto.CryptoStoreException
-import org.matrix.rustcomponents.sdk.crypto.LocalTrust
 import org.matrix.rustcomponents.sdk.crypto.SignatureException
+import uniffi.matrix_sdk_crypto.LocalTrust
 import org.matrix.rustcomponents.sdk.crypto.Device as InnerDevice
 
 /** Class representing a device that supports E2EE in the Matrix world

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

@@ -75,7 +75,6 @@ import org.matrix.rustcomponents.sdk.crypto.DeviceLists
 import org.matrix.rustcomponents.sdk.crypto.EncryptionSettings
 import org.matrix.rustcomponents.sdk.crypto.KeyRequestPair
 import org.matrix.rustcomponents.sdk.crypto.KeysImportResult
-import org.matrix.rustcomponents.sdk.crypto.LocalTrust
 import org.matrix.rustcomponents.sdk.crypto.Logger
 import org.matrix.rustcomponents.sdk.crypto.MegolmV1BackupKey
 import org.matrix.rustcomponents.sdk.crypto.Request
@@ -86,6 +85,7 @@ import org.matrix.rustcomponents.sdk.crypto.ShieldState
 import org.matrix.rustcomponents.sdk.crypto.SignatureVerification
 import org.matrix.rustcomponents.sdk.crypto.setLogger
 import timber.log.Timber
+import uniffi.matrix_sdk_crypto.LocalTrust
 import java.io.File
 import java.nio.charset.Charset
 import javax.inject.Inject
@@ -828,8 +828,14 @@ internal class OlmMachine @Inject constructor(
  val requests = withContext(coroutineDispatchers.io) {
  inner.bootstrapCrossSigning()
  }
+ (requests.uploadKeysRequest)?.let {
+ when (it) {
+ is Request.KeysUpload -> requestSender.uploadKeys(it)
+ else -> {}
+ }
+ }
  requestSender.uploadCrossSigningKeys(requests.uploadSigningKeysRequest, uiaInterceptor)
- requestSender.sendSignatureUpload(requests.signatureRequest)
+ requestSender.sendSignatureUpload(requests.uploadSignatureRequest)
  }
 
  /**

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

@@ -68,9 +68,9 @@ import org.matrix.android.sdk.internal.util.JsonCanonicalizer
 import org.matrix.olm.OlmException
 import org.matrix.rustcomponents.sdk.crypto.Request
 import org.matrix.rustcomponents.sdk.crypto.RequestType
-import org.matrix.rustcomponents.sdk.crypto.SignatureState
 import org.matrix.rustcomponents.sdk.crypto.SignatureVerification
 import timber.log.Timber
+import uniffi.matrix_sdk_crypto.SignatureState
 import java.security.InvalidParameterException
 import javax.inject.Inject
 import kotlin.random.Random

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/rust/RealmToMigrate.kt

@@ -100,7 +100,7 @@ fun RealmToMigrate.getPickledAccount(pickleKey: ByteArray): MigrationData {
  )
  MigrationData(
  account = pickledAccount,
- pickleKey = pickleKey.map { it.toUByte() },
+ pickleKey = pickleKey,
  crossSigning = CrossSigningKeyExport(
  masterKey = masterKey,
  selfSigningKey = selfSignedKey,
@@ -153,7 +153,7 @@ fun RealmToMigrate.getPickledAccount(pickleKey: ByteArray): MigrationData {
 
  migrationData = MigrationData(
  account = pickledAccount,
- pickleKey = pickleKey.map { it.toUByte() },
+ pickleKey = pickleKey,
  crossSigning = CrossSigningKeyExport(
  masterKey = masterKey,
  selfSigningKey = selfSignedKey,
@@ -222,8 +222,10 @@ fun RealmToMigrate.pickledOlmSessions(pickleKey: ByteArray, chunkSize: Int, onCh
  pickle = pickle,
  senderKey = deviceKey,
  createdUsingFallbackKey = false,
- creationTime = lastReceivedMessageTs.toString(),
- lastUseTime = lastReceivedMessageTs.toString()
+ // / Unix timestamp (in seconds) when the session was created.
+ creationTime = (lastReceivedMessageTs / 1000).toULong(),
+ // / Unix timestamp (in seconds) when the session was last used.
+ lastUseTime = (lastReceivedMessageTs / 1000).toULong(),
  )
  // should we check the tracking status?
  pickledSessions.add(pickledSession)
@@ -323,8 +325,10 @@ private fun OlmSessionEntity.toPickledSession(pickleKey: ByteArray): PickledSess
  pickle = pickledOlmSession,
  senderKey = deviceKey,
  createdUsingFallbackKey = false,
- creationTime = lastReceivedMessageTs.toString(),
- lastUseTime = lastReceivedMessageTs.toString()
+ // Rust expect in seconds
+ creationTime = (lastReceivedMessageTs / 1000).toULong(),
+ // Rust expect in seconds
+ lastUseTime = (lastReceivedMessageTs / 1000).toULong(),
  )
 }
 

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt

@@ -17,8 +17,10 @@
 package org.matrix.android.sdk.internal.session.content
 
 import android.content.Context
+import android.content.Intent
 import android.graphics.BitmapFactory
 import android.media.MediaMetadataRetriever
+import android.os.Build
 import androidx.core.net.toUri
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
@@ -115,7 +117,15 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
  if (allCancelled) {
  // there is no point in uploading the image!
  return Result.success(inputData)
- .also { Timber.e("## Send: Work cancelled by user") }
+ .also {
+ Timber.e("## Send: Work cancelled by user")
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ context.revokeUriPermission(context.packageName, params.attachment.queryUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+ } else {
+ context.revokeUriPermission(params.attachment.queryUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+ }
+ }
  }
 
  val attachment = params.attachment
@@ -396,6 +406,12 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
  )
  return Result.success(WorkerParamsFactory.toData(sendParams)).also {
  Timber.v("## handleSuccess $attachmentUrl, work is stopped $isStopped")
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ context.revokeUriPermission(context.packageName, params.attachment.queryUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+ } else {
+ context.revokeUriPermission(params.attachment.queryUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+ }
  }
  }