Merge tag 'v1.6.20' into sc

Change-Id: Ibf61668b312b1f4b1867ccc6ba4d3174e37550a5 Conflicts: library/attachment-viewer/build.gradle library/ui-styles/build.gradle matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/core/glide/ImageContentRendererDataLoader.kt vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt vector/src/main/java/im/vector/app/core/ui/views/JoinConferenceView.kt vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt vector/src/main/java/im/vector/app/features/crypto/verification/user/VerificationEpoxyExt.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFooterController.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt vector/src/main/java/im/vector/app/features/home/room/threads/list/model/ThreadListItem.kt vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt vector/src/main/java/im/vector/app/features/login/LoginFragment.kt vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
2024-11-21 17:05:39 +03:00 · 2024-07-30 20:56:50 +02:00 · 2024-07-30 20:56:50 +02:00 · 3291517b8b
commit 3291517b8b
parent 9a381b557e fca16b6774
757 changed files with 5447 additions and 4482 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -24,12 +24,17 @@ jobs:
      group: ${{ github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}-{1}', matrix.target, github.sha) || format('build-debug-{0}-{1}', matrix.target, github.ref)  }}
      cancel-in-progress: true
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          # https://github.com/actions/checkout/issues/881
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      - name: Use JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
      - name: Configure gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
        with:
          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
      - name: Assemble ${{ matrix.target }} debug apk
@ -48,12 +53,17 @@ jobs:
      group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('build-release-apk-develop-{0}', github.sha) || format('build-debug-{0}', github.ref)  }}
      cancel-in-progress: ${{ github.ref != 'refs/head/main' }}
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          # https://github.com/actions/checkout/issues/881
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
+      - name: Use JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
      - name: Configure gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
        with:
          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
      - name: Assemble GPlay unsigned apk
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@ -7,7 +7,7 @@ jobs:
    runs-on: ubuntu-latest
    name: Danger
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - run: |
          npm install --save-dev @babel/plugin-transform-flow-strip-types
      - name: Danger
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Build docs
        run: ./gradlew dokkaHtml
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@ -10,5 +10,5 @@ jobs:
    runs-on: ubuntu-latest
    # No concurrency required, this is a prerequisite to other actions and should run every time.
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - uses: gradle/wrapper-validation-action@v1
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@ -7,7 +7,7 @@ on:
    - cron: "0 4 * * *"

 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1g" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx6g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1g" -Dkotlin.incremental=false -XX:+UseG1GC
  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon

 jobs:
@ -15,13 +15,18 @@ jobs:
    name: Build and publish nightly Gplay APK to Firebase
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Set up Python 3.8
        uses: actions/setup-python@v4
        with:
          python-version: 3.8
+      - name: Use JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
      - name: Configure gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
        with:
          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
      - name: Install towncrier
--- a/.github/workflows/post-pr.yml
+++ b/.github/workflows/post-pr.yml
@ -39,17 +39,18 @@ jobs:
        api-level: [ 28 ]
    # No concurrency required, runs every time on a schedule.
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Set up Python 3.8
        uses: actions/setup-python@v4
        with:
          python-version: 3.8
-      - uses: actions/setup-java@v3
+      - name: Use JDK 17
+        uses: actions/setup-java@v4
        with:
-          distribution: 'adopt'
-          java-version: '11'
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
      - name: Configure gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
        with:
          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
      - name: Start synapse server
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@ -7,7 +7,7 @@ on:

 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -XX:MaxPermSize=512m -Dkotlin.daemon.jvm.options="-Xmx2g" -Dkotlin.incremental=false
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1g" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon

 jobs:
@ -15,7 +15,7 @@ jobs:
    name: Project Check Suite
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Run code quality check suite
        run: ./tools/check/check_code_quality.sh

@ -24,7 +24,16 @@ jobs:
    name: Knit
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Use JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
+      - name: Configure gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
      - name: Run knit
        run: |
          ./gradlew knitCheck $CI_GRADLE_ARG_PROPERTIES
@ -38,7 +47,16 @@ jobs:
      group: ${{ github.ref == 'refs/heads/main' && format('lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('lint-develop-{0}', github.sha) || format('lint-{0}', github.ref) }}
      cancel-in-progress: true
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Use JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
+      - name: Configure gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
      - name: Run ktlint
        run: |
          ./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES --continue
@ -83,7 +101,16 @@ jobs:
      group: ${{ github.ref == 'refs/heads/main' && format('dep-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('dep-develop-{0}', github.sha) || format('dep-{0}', github.ref) }}
      cancel-in-progress: true
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Use JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
+      - name: Configure gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
      - name: Dependency analysis
        run: ./gradlew dependencyCheckAnalyze $CI_GRADLE_ARG_PROPERTIES
      - name: Upload dependency analysis
--- a/.github/workflows/sync-from-external-sources.yml
+++ b/.github/workflows/sync-from-external-sources.yml
@ -12,7 +12,7 @@ jobs:
    if: github.repository == 'element-hq/element-android'
    # No concurrency required, runs every time on a schedule.
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Set up Python 3.8
        uses: actions/setup-python@v4
        with:
@ -39,7 +39,7 @@ jobs:
    if: github.repository == 'element-hq/element-android'
    # No concurrency required, runs every time on a schedule.
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Set up Python 3.8
        uses: actions/setup-python@v4
        with:
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -25,15 +25,17 @@ jobs:
      group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('unit-tests-{0}', github.ref) }}
      cancel-in-progress: true
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          lfs: true
          fetch-depth: 0
-      - uses: actions/setup-java@v3
+      - name: Use JDK 17
+        uses: actions/setup-java@v4
        with:
-          distribution: 'adopt'
+          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '17'
-      - uses: gradle/gradle-build-action@v2
+      - name: Configure gradle
+        uses: gradle/actions/setup-gradle@v3
        with:
          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
          gradle-home-cache-cleanup: ${{ github.ref == 'refs/heads/develop' }}
@ -136,13 +138,14 @@ jobs:
 #      group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('build-android-tests-{0}', github.ref) }}
 #      cancel-in-progress: true
 #    steps:
-#      - uses: actions/checkout@v3
-#      - uses: actions/setup-java@v3
+#      - uses: actions/checkout@v4
+#      - name: Use JDK 17
+#        uses: actions/setup-java@v4
 #        with:
-#          distribution: 'adopt'
-#          java-version: 11
+#          distribution: 'temurin' # See 'Supported distributions' for available options
+#          java-version: '17'
 #      - name: Configure gradle
-#        uses: gradle/gradle-build-action@v2
+#        uses: gradle/actions/setup-gradle@v3
 #        with:
 #          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
 #      - name: Build Android Tests
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      - name: Update Gradle Wrapper
        uses: gradle-update/update-gradle-wrapper-action@v1
--- a/.github/workflows/validate-lfs.yml
+++ b/.github/workflows/validate-lfs.yml
@ -7,7 +7,7 @@ jobs:
    runs-on: ubuntu-latest
    name: Validate
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          lfs: 'true'

--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,11 @@
+Changes in Element v1.6.20 (2024-07-25)
+=======================================
+
+Other changes
+-------------
+- Bump compile and target SDK to 34 ([#8860](https://github.com/element-hq/element-android/pull/8860)
+- Supports Authenticated media apis ([#8868](https://github.com/element-hq/element-android/pull/8868)
+
 Changes in Element v1.6.18 (2024-06-25)
 =======================================

--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,29 +1,32 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
      rexml
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    artifactory (3.0.15)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    artifactory (3.0.17)
    atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.619.0)
-    aws-sdk-core (3.132.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.947.0)
+    aws-sdk-core (3.199.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.87.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.154.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
+    base64 (0.2.0)
    claide (1.1.0)
    claide-plugins (0.9.2)
      cork
@ -49,14 +52,14 @@ GEM
      octokit (~> 4.7)
      terminal-table (>= 1, < 4)
    declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
      rake (>= 12.0.0, < 14.0.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
    dotenv (2.8.1)
    emoji_regex (3.2.3)
-    excon (0.92.4)
-    faraday (1.10.1)
+    excon (0.109.0)
+    faraday (1.10.3)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@ -74,7 +77,7 @@ GEM
    faraday-em_http (1.0.0)
    faraday-em_synchrony (1.0.0)
    faraday-excon (1.1.0)
-    faraday-http-cache (2.4.1)
+    faraday-http-cache (2.5.1)
      faraday (>= 0.8)
    faraday-httpclient (1.0.1)
    faraday-multipart (1.0.4)
@ -86,15 +89,15 @@ GEM
    faraday-retry (1.0.3)
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.209.0)
+    fastimage (2.3.1)
+    fastlane (2.221.1)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
      aws-sdk-s3 (~> 1.0)
      babosa (>= 1.0.3, < 2.0.0)
      bundler (>= 1.12.0, < 3.0.0)
-      colored
+      colored (~> 1.2)
      commander (~> 4.6)
      dotenv (>= 2.1.1, < 3.0.0)
      emoji_regex (>= 0.1, < 4.0)
@ -106,33 +109,35 @@ GEM
      gh_inspector (>= 1.1.2, < 2.0.0)
      google-apis-androidpublisher_v3 (~> 0.3)
      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
      google-cloud-storage (~> 1.31)
      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
      json (< 3.0.0)
      jwt (>= 2.1.0, < 3)
      mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
      naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1, < 1.0.0)
      plist (>= 3.1.0, < 4.0.0)
      rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
      simctl (~> 1.6.3)
      terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
      tty-screen (>= 0.6.3, < 1.0.0)
      tty-spinner (>= 0.8.0, < 1.0.0)
      word_wrap (~> 1.0.0)
      xcodeproj (>= 1.13.0, < 2.0.0)
      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
    gh_inspector (1.1.3)
-    git (1.13.0)
+    git (1.19.1)
      addressable (~> 2.8)
      rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.25.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-core (0.7.0)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
      httpclient (>= 2.8.1, < 3.a)
@ -140,101 +145,101 @@ GEM
      representable (~> 3.0)
      retriable (>= 2.0, < 4.a)
      rexml
-      webrick
-    google-apis-iamcredentials_v1 (0.13.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-playcustomapp_v1 (0.10.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-storage_v1 (0.17.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.38.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.45.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.17.0)
+      google-apis-storage_v1 (~> 0.29.0)
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.2.0)
+    googleauth (1.8.1)
      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
    highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    jmespath (1.6.1)
-    json (2.6.2)
-    jwt (2.4.1)
+    jmespath (1.6.2)
+    json (2.7.2)
+    jwt (2.8.2)
+      base64
    kramdown (2.4.0)
      rexml
    kramdown-parser-gfm (1.1.0)
      kramdown (~> 2.0)
-    memoist (0.16.2)
-    mini_magick (4.11.0)
-    mini_mime (1.1.2)
+    mini_magick (4.13.1)
+    mini_mime (1.1.5)
    multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.4.1)
    nanaimo (0.3.0)
    nap (1.1.0)
    naturally (2.2.1)
+    nkf (0.2.0)
    no_proxy_fix (0.1.2)
    octokit (4.25.1)
      faraday (>= 1, < 3)
      sawyer (~> 0.9)
    open4 (1.3.4)
-    optparse (0.1.1)
+    optparse (0.5.0)
    os (1.1.4)
-    plist (3.6.0)
-    public_suffix (4.0.7)
-    rake (13.0.6)
+    plist (3.7.1)
+    public_suffix (5.1.1)
+    rake (13.2.1)
    rchardet (1.8.0)
    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.9)
+      strscan
    rouge (2.0.7)
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
    sawyer (0.9.2)
      addressable (>= 2.3.5)
      faraday (>= 0.17.3, < 3)
-    security (0.1.3)
-    signet (0.17.0)
+    security (0.1.5)
+    signet (0.18.0)
      addressable (~> 2.8)
      faraday (>= 0.17.5, < 3.a)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
      CFPropertyList
      naturally
+    strscan (3.1.0)
    terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
    trailblazer-option (0.1.2)
    tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
    tty-spinner (0.9.3)
      tty-cursor (~> 0.7)
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    unf_ext (0.0.9.1)
+    unicode-display_width (2.5.0)
    word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.24.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
@ -248,6 +253,7 @@ GEM

 PLATFORMS
  universal-darwin-21
+  universal-darwin-23
  x86_64-darwin-20
  x86_64-linux

--- a/build.gradle
+++ b/build.gradle
@ -28,7 +28,7 @@ buildscript {
        classpath 'com.google.gms:google-services:4.3.15'
        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929'
        classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6'
-        classpath "com.likethesalad.android:stem-plugin:2.4.1"
+        classpath "com.likethesalad.android:stem-plugin:2.9.0"
        classpath 'org.owasp:dependency-check-gradle:8.2.1'
        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.8.10"
        classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
@ -45,7 +45,7 @@ plugins {
    // Detekt
    id "io.gitlab.arturbosch.detekt" version "1.22.0"
    // Ksp
-    id "com.google.devtools.ksp" version "1.8.10-1.0.9"
+    id "com.google.devtools.ksp" version "1.9.24-1.0.20"

    // Dependency Analysis
    id 'com.autonomousapps.dependency-analysis' version "1.20.0"
--- a/coverage.gradle
+++ b/coverage.gradle
@ -33,9 +33,9 @@ def initializeReport(report, projects, classExcludes) {
        )
    }
    report.reports {
-        xml.enabled true
-        html.enabled true
-        csv.enabled false
+        xml.required = true
+        html.required = true
+        csv.required = false
    }

    gradle.projectsEvaluated {
--- a/dependencies.gradle
+++ b/dependencies.gradle
@ -1,39 +1,39 @@
 ext.versions = [
        'minSdk'            : 21,
-        'compileSdk'        : 33,
-        'targetSdk'         : 33,
-        'sourceCompat'      : JavaVersion.VERSION_11,
-        'targetCompat'      : JavaVersion.VERSION_11,
+        'compileSdk'        : 34,
+        'targetSdk'         : 34,
+        'sourceCompat'      : JavaVersion.VERSION_17,
+        'targetCompat'      : JavaVersion.VERSION_17,
+        'jvmTarget'         : "17",
 ]

-def gradle = "7.4.2"
+def gradle = "8.4.2"
 // Ref: https://kotlinlang.org/releases.html
-def kotlin = "1.8.10"
-def kotlinCoroutines = "1.6.4"
-def dagger = "2.45"
-def firebaseBom = "32.0.0"
+def kotlin = "1.9.24"
+def kotlinCoroutines = "1.8.1"
+def dagger = "2.51.1"
+def firebaseBom = "33.1.1"
 def appDistribution = "16.0.0-beta08"
-def retrofit = "2.9.0"
+def retrofit = "2.11.0"
 def markwon = "4.6.2"
-def moshi = "1.14.0"
-def lifecycle = "2.5.1"
+def moshi = "1.15.1"
+def lifecycle = "2.8.3"
 def flowBinding = "1.2.0"
-def flipper = "0.190.0"
+def flipper = "0.259.0"
 def epoxy = "5.0.0"
-def mavericks = "3.0.7"
-def glide = "4.15.1"
+def mavericks = "3.0.9"
+def glide = "4.16.0"
 def bigImageViewer = "1.8.1"
 def jjwt = "0.11.5"
 def vanniktechEmoji = "0.16.0"
 def sentry = "6.18.1"
-// Use 1.6.0 alpha to fix issue with test
-def fragment = "1.6.0-beta01"
+def fragment = "1.8.1"
 // 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"
-def androidxTest = "1.5.0"
-def androidxOrchestrator = "1.4.2"
-def paparazzi = "1.2.0"
+def mockk = "1.13.11"
+def espresso = "3.6.1"
+def androidxTest = "1.6.1"
+def androidxOrchestrator = "1.5.0"
+def paparazzi = "1.3.4"

 ext.libs = [
        gradle      : [
@ -48,8 +48,8 @@ ext.libs = [
                'coroutinesTest'          : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutines"
        ],
        androidx    : [
-                'activity'                : "androidx.activity:activity-ktx:1.7.2",
-                'appCompat'               : "androidx.appcompat:appcompat:1.6.1",
+                'activity'                : "androidx.activity:activity-ktx:1.9.0",
+                'appCompat'               : "androidx.appcompat:appcompat:1.7.0",
                'biometric'               : "androidx.biometric:biometric:1.1.0",
                'core'                    : "androidx.core:core-ktx:1.10.1",
                'recyclerview'            : "androidx.recyclerview:recyclerview:1.3.0",
@ -77,11 +77,11 @@ ext.libs = [
                'espressoCore'            : "androidx.test.espresso:espresso-core:$espresso",
                '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.4.1",
+                'viewpager2'              : "androidx.viewpager2:viewpager2:1.1.0",
+                'transition'              : "androidx.transition:transition:1.5.0",
        ],
        google      : [
-                'material'                : "com.google.android.material:material:1.9.0",
+                'material'                : "com.google.android.material:material:1.12.0",
                'firebaseBom'             : "com.google.firebase:firebase-bom:$firebaseBom",
                'messaging'               : "com.google.firebase:firebase-messaging",
                //'appdistributionApi'      : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
@ -102,7 +102,7 @@ ext.libs = [
        ],
        element     : [
                'opusencoder'             : "io.element.android:opusencoder:1.1.0",
-                'wysiwyg'                 : "io.element.android:wysiwyg:2.37.3"
+                'wysiwyg'                 : "io.element.android:wysiwyg:2.37.4"
        ],
        squareup    : [
                'moshi'                  : "com.squareup.moshi:moshi:$moshi",
@ -173,7 +173,7 @@ ext.libs = [
                'kluent'                 : "org.amshove.kluent:kluent-android:1.73",
                'timberJunitRule'        : "net.lachlanmckee:timber-junit-rule:1.0.1",
                'junit'                  : "junit:junit:4.13.2",
-                'robolectric'            : "org.robolectric:robolectric:4.9",
+                'robolectric'            : "org.robolectric:robolectric:4.13",
        ]
 ]

--- a/dependencies_groups.gradle
+++ b/dependencies_groups.gradle
@ -97,6 +97,7 @@ ext.groups = [
                        'com.google.auto.value',
                        'com.google.code.findbugs',
                        'com.google.code.gson',
+                        'com.google.crypto.tink',
                        'com.google.dagger',
                        'com.google.devtools.ksp',
                        'com.google.errorprone',
@ -142,6 +143,7 @@ ext.groups = [
                        'commons-codec',
                        'commons-io',
                        'commons-logging',
+                        'dev.drewhamilton.poko',
                        'info.picocli',
                        'io.element.android',
                        'io.github.davidburstrom.contester',
--- a/docs/screenshot_testing.md
+++ b/docs/screenshot_testing.md
@ -62,7 +62,7 @@ class PaparazziExampleScreenshotTest {
        val view = paparazzi.inflate<ConstraintLayout>(R.layout.item_radio)

        // Bind data to the view
-        view.findViewById<TextView>(R.id.actionTitle).text = paparazzi.resources.getString(R.string.room_settings_all_messages)
+        view.findViewById<TextView>(R.id.actionTitle).text = paparazzi.resources.getString(CommonStrings.room_settings_all_messages)
        view.findViewById<ImageView>(R.id.radioIcon).setImageResource(R.drawable.ic_radio_on)

        // Record the bound view
--- a/docs/ui-tests.md
+++ b/docs/ui-tests.md
@ -179,7 +179,7 @@ class SettingsRobot {
    }

    fun advancedSettings(block: SettingsAdvancedRobot.() -> Unit) {
-        clickOn(R.string.settings_advanced_settings)
+        clickOn(CommonStrings.settings_advanced_settings)
        block(SettingsAdvancedRobot())
        pressBack()
    }
@ -187,7 +187,7 @@ class SettingsRobot {

 class SettingsAdvancedRobot {
    fun toggleDeveloperMode() {
-        clickOn(R.string.settings_developer_mode_summary)
+        clickOn(CommonStrings.settings_developer_mode_summary)
    }
 }
 ```
--- a/fastlane/metadata/android/en-US/changelogs/40106200.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40106200.txt
@ -0,0 +1,2 @@
+Main changes in this version: support authenticated media.
+Full changelog: https://github.com/element-hq/element-android/releases
--- a/gradle.properties
+++ b/gradle.properties
@ -46,4 +46,4 @@ signing.element.nightly.keyPassword=Secret

 # Customise the Lint version to use a more recent version than the one bundled with AGP
 # https://googlesamples.github.io/android-custom-lint-rules/usage/newer-lint.md.html
-android.experimental.lint.version=8.3.0-alpha12
+android.experimental.lint.version=8.6.0-alpha08
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/library/attachment-viewer/build.gradle
+++ b/library/attachment-viewer/build.gradle
@ -38,7 +38,7 @@ android {
        targetCompatibility versions.targetCompat
    }
    kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = versions.jvmTarget
    }

    buildFeatures {
--- a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
+++ b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
@ -31,7 +31,6 @@ import android.view.WindowManager
 import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import androidx.core.view.GestureDetectorCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
@ -39,6 +38,7 @@ import androidx.core.view.updatePadding
 import androidx.transition.TransitionManager
 import androidx.viewpager2.widget.ViewPager2
 import im.vector.lib.attachmentviewer.databinding.ActivityAttachmentViewerBinding
+import im.vector.lib.ui.styles.R
 import java.lang.ref.WeakReference
 import kotlin.math.abs

@ -71,7 +71,7 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
    private lateinit var swipeDismissHandler: SwipeToDismissHandler
    private lateinit var directionDetector: SwipeDirectionDetector
    private lateinit var scaleDetector: ScaleGestureDetector
-    private lateinit var gestureDetector: GestureDetectorCompat
+    private lateinit var gestureDetector: GestureDetector

    var currentPosition = 0
        private set
@ -309,7 +309,7 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
            ScaleGestureDetector(this, ScaleGestureDetector.SimpleOnScaleGestureListener())

    private fun createGestureDetector() =
-            GestureDetectorCompat(this, object : GestureDetector.SimpleOnGestureListener() {
+            GestureDetector(this, object : GestureDetector.SimpleOnGestureListener() {
                override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
                    if (isImagePagerIdle) {
                        handleSingleTap(e, isOverlayWasClicked)
--- a/library/core-utils/build.gradle
+++ b/library/core-utils/build.gradle
@ -28,7 +28,6 @@ android {
        targetSdk versions.targetSdk

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
    }

    buildTypes {
@ -44,7 +43,7 @@ android {
    }

    kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = versions.jvmTarget
        freeCompilerArgs += [
                "-opt-in=kotlin.RequiresOptIn"
        ]
--- a/library/external/autocomplete/build.gradle
+++ b/library/external/autocomplete/build.gradle
@ -17,7 +17,7 @@ android {
    }

    kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = versions.jvmTarget
    }
 }

--- a/library/external/autocomplete/src/main/java/com/otaliastudios/autocomplete/Autocomplete.java
+++ b/library/external/autocomplete/src/main/java/com/otaliastudios/autocomplete/Autocomplete.java
@ -13,7 +13,6 @@ import android.text.TextWatcher;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
-import android.view.Window;
 import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.PopupWindow;
--- a/library/external/dialpad/build.gradle
+++ b/library/external/dialpad/build.gradle
@ -17,7 +17,7 @@ android {
    }

    kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = versions.jvmTarget
    }
 }

--- a/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadView.java
+++ b/library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadView.java
@ -20,7 +20,6 @@ import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.Spannable;
 import android.text.TextUtils;
--- a/library/external/dialpad/src/main/java/com/android/dialer/widget/ResizingTextEditText.java
+++ b/library/external/dialpad/src/main/java/com/android/dialer/widget/ResizingTextEditText.java
@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.widget.EditText;
+
 import com.android.dialer.dialpadview.R;
 import com.android.dialer.util.ViewUtil;

--- a/library/external/jsonviewer/build.gradle
+++ b/library/external/jsonviewer/build.gradle
@ -42,7 +42,7 @@ android {
    }

    kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = versions.jvmTarget
    }
 }

--- a/library/external/realmfieldnameshelper/build.gradle
+++ b/library/external/realmfieldnameshelper/build.gradle
@ -10,11 +10,11 @@ dependencies {

 task javadocJar(type: Jar, dependsOn: 'javadoc') {
    from javadoc.destinationDir
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 task sourcesJar(type: Jar, dependsOn: 'classes') {
    from sourceSets.main.allSource
-    classifier = 'sources'
+    archiveClassifier = 'sources'
 }

 sourceSets {
--- a/library/external/span/build.gradle
+++ b/library/external/span/build.gradle
@ -13,6 +13,15 @@ android {
    sourceSets {
        main.java.srcDirs += 'src/main/kotlin'
    }
+
+    compileOptions {
+        sourceCompatibility versions.sourceCompat
+        targetCompatibility versions.targetCompat
+    }
+
+    kotlinOptions {
+        jvmTarget = versions.jvmTarget
+    }
 }

 dependencies {
--- a/library/external/textdrawable/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java
+++ b/library/external/textdrawable/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java
@ -1,6 +1,13 @@
 package com.amulyakhare.textdrawable;

-import android.graphics.*;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.Typeface;
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.OvalShape;
 import android.graphics.drawable.shapes.RectShape;
@ -313,4 +320,4 @@ public class TextDrawable extends ShapeDrawable {

        public TextDrawable buildRound(String text, int color);
    }
-}
+}
--- a/library/multipicker/build.gradle
+++ b/library/multipicker/build.gradle
@ -43,7 +43,7 @@ android {
    }

    kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = versions.jvmTarget
    }
 }

--- a/library/ui-strings/build.gradle
+++ b/library/ui-strings/build.gradle
@ -19,7 +19,7 @@ android {
    }

    kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = versions.jvmTarget
    }
 }

--- a/library/ui-strings/src/main/java/im/vector/lib/strings/CommonStrings.kt
+++ b/library/ui-strings/src/main/java/im/vector/lib/strings/CommonStrings.kt
@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.strings
+
+typealias CommonStrings = R.string
+typealias CommonPlurals = R.plurals
--- a/library/ui-strings/src/main/res/values-fa/strings.xml
+++ b/library/ui-strings/src/main/res/values-fa/strings.xml
@ -2966,4 +2966,4 @@
 \n%s</string>
    <string name="create_room_unknown_users_dialog_submit">آغاز گپ به هر حال</string>
    <string name="invite_unknown_users_dialog_submit">دعوت به هر حال</string>
-</resources>
+</resources>
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@ -2865,4 +2865,4 @@
    <string name="room_polls_wait_for_display">显示投票</string>
    <string name="rich_text_editor_quote">切换引用</string>
    <string name="rich_text_editor_numbered_list">切换有序列表</string>
-</resources>
+</resources>
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@ -29,7 +29,6 @@ android {
        targetSdk versions.targetSdk

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
    }

    buildTypes {
@ -43,7 +42,7 @@ android {
        targetCompatibility versions.targetCompat
    }
    kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = versions.jvmTarget
    }
    buildFeatures {
        viewBinding true
--- a/matrix-sdk-android-flow/build.gradle
+++ b/matrix-sdk-android-flow/build.gradle
@ -28,7 +28,7 @@ android {
        targetCompatibility versions.targetCompat
    }
    kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = versions.jvmTarget
    }

 //    publishNonDefault true
--- a/matrix-sdk-android-flow/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android-flow/src/main/AndroidManifest.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
+<manifest />
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@ -17,7 +17,7 @@ buildscript {
        }
    }
    dependencies {
-        classpath "io.realm:realm-gradle-plugin:10.16.0"
+        classpath "io.realm:realm-gradle-plugin:10.18.0"
    }
 }

@ -62,7 +62,7 @@ android {
        // that the app's state is completely cleared between tests.
        testInstrumentationRunnerArguments clearPackageData: 'true'

-        buildConfigField "String", "SDK_VERSION", "\"1.6.18\""
+        buildConfigField "String", "SDK_VERSION", "\"1.6.20\""

        buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
        buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
@ -81,7 +81,7 @@ android {
    buildTypes {
        debug {
            if (project.hasProperty("coverage")) {
-                testCoverageEnabled = coverage == "true"
+                testCoverageEnabled = project.properties["coverage"] == "true"
            }
            // Set to true to log privacy or sensible data, such as token
            buildConfigField "boolean", "LOG_PRIVATE_DATA", project.property("vector.debugPrivateData")
@ -106,7 +106,7 @@ android {
    }

    kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = versions.jvmTarget
        freeCompilerArgs += [
                // Disabled for now, there are too many errors. Could be handled in another dedicated PR
                // '-Xexplicit-api=strict', // or warning
@ -125,6 +125,15 @@ android {
        }
    }

+    buildFeatures {
+        buildConfig true
+    }
+
+    packaging {
+        pickFirsts.add("META-INF/LICENSE.md")
+        pickFirsts.add("META-INF/LICENSE-notice.md")
+        pickFirsts.add("MANIFEST.MF")
+    }
 }

 static def gitRevision() {
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@ -23,7 +23,6 @@ import androidx.test.internal.runner.junit4.statement.UiThreadStatement
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
@ -58,6 +57,7 @@ import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
+import kotlin.time.Duration.Companion.milliseconds

 /**
 * This class exposes methods to be used in common cases
@ -67,10 +67,9 @@ class CommonTestHelper internal constructor(context: Context, val cryptoConfig:

    companion object {

-        @OptIn(ExperimentalCoroutinesApi::class)
        internal fun runSessionTest(context: Context, cryptoConfig: MXCryptoConfig? = null, autoSignoutOnClose: Boolean = true, block: suspend CoroutineScope.(CommonTestHelper) -> Unit) {
            val testHelper = CommonTestHelper(context, cryptoConfig)
-            return runTest(dispatchTimeoutMs = TestConstants.timeOutMillis) {
+            return runTest(timeout = TestConstants.timeOutMillis.milliseconds) {
                try {
                    withContext(Dispatchers.Default) {
                        block(testHelper)
@ -83,11 +82,10 @@ class CommonTestHelper internal constructor(context: Context, val cryptoConfig:
            }
        }

-        @OptIn(ExperimentalCoroutinesApi::class)
        internal fun runCryptoTest(context: Context, cryptoConfig: MXCryptoConfig? = null, autoSignoutOnClose: Boolean = true, block: suspend CoroutineScope.(CryptoTestHelper, CommonTestHelper) -> Unit) {
            val testHelper = CommonTestHelper(context, cryptoConfig)
            val cryptoTestHelper = CryptoTestHelper(testHelper)
-            return runTest(dispatchTimeoutMs = TestConstants.timeOutMillis) {
+            return runTest(timeout = TestConstants.timeOutMillis.milliseconds) {
                try {
                    withContext(Dispatchers.Default) {
                        block(cryptoTestHelper, testHelper)
@ -100,11 +98,10 @@ class CommonTestHelper internal constructor(context: Context, val cryptoConfig:
            }
        }

-        @OptIn(ExperimentalCoroutinesApi::class)
        internal fun runLongCryptoTest(context: Context, cryptoConfig: MXCryptoConfig? = null, autoSignoutOnClose: Boolean = true, block: suspend CoroutineScope.(CryptoTestHelper, CommonTestHelper) -> Unit) {
            val testHelper = CommonTestHelper(context, cryptoConfig)
            val cryptoTestHelper = CryptoTestHelper(testHelper)
-            return runTest(dispatchTimeoutMs = TestConstants.timeOutMillis * 4) {
+            return runTest(timeout = (TestConstants.timeOutMillis * 4).milliseconds) {
                try {
                    withContext(Dispatchers.Default) {
                        block(cryptoTestHelper, testHelper)
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestExtensions.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestExtensions.kt
@ -37,10 +37,10 @@ suspend fun <T> LiveData<T>.first(timeout: Long = TestConstants.timeOutMillis, p
        withContext(Dispatchers.Main) {
            suspendCancellableCoroutine { continuation ->
                val observer = object : Observer<T> {
-                    override fun onChanged(data: T) {
-                        if (predicate(data)) {
+                    override fun onChanged(value: T) {
+                        if (predicate(value)) {
                            removeObserver(this)
-                            continuation.resume(data)
+                            continuation.resume(value)
                        }
                    }
                }
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeConfigTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeConfigTest.kt
@ -26,7 +26,6 @@ import org.junit.runners.JUnit4
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
-import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.common.CommonTestHelper.Companion.runCryptoTest

--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@ -21,7 +21,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertNotNull
-import junit.framework.TestCase.assertTrue
 import org.amshove.kluent.shouldBeEqualTo
 import org.junit.Assert
 import org.junit.Assert.assertNull
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration43Test.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration43Test.kt
@ -56,7 +56,7 @@ class RealmSessionStoreMigration43Test {
    }

    @Test
-    fun migrationShouldBeNeeed() {
+    fun migrationShouldBeNeeded() {
        val realmName = "session_42.realm"
        val realmConfiguration = configurationFactory.createConfiguration(
                realmName,
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/TestRealmConfigurationFactory.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/TestRealmConfigurationFactory.kt
@ -27,11 +27,9 @@ import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.io.InputStream
-import java.lang.IllegalStateException
 import java.util.Collections
 import java.util.Locale
 import java.util.concurrent.ConcurrentHashMap
-import kotlin.Throws

 /**
 * Based on https://github.com/realm/realm-java/blob/master/realm/realm-library/src/testUtils/java/io/realm/TestRealmConfigurationFactory.java
--- a/matrix-sdk-android/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android/src/main/AndroidManifest.xml
@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@ -296,6 +296,11 @@ interface Session {
     */
    fun getOkHttpClient(): OkHttpClient

+    /**
+     * Same as [getOkHttpClient] but will add the access token to the request.
+     */
+    fun getAuthenticatedOkHttpClient(): OkHttpClient
+
    /**
     * A global session listener to get notified for some events.
     */
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUrlResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUrlResolver.kt
@ -61,6 +61,8 @@ interface ContentUrlResolver {
     */
    fun resolveThumbnail(contentUrl: String?, width: Int, height: Int, method: ThumbnailMethod): String?

+    fun requiresAuthentication(resolvedUrl: String): Boolean
+
    sealed class ResolvedMethod {
        data class GET(val url: String) : ResolvedMethod()
        data class POST(val url: String, val jsonBody: String) : ResolvedMethod()
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
@ -95,6 +95,10 @@ data class HomeServerCapabilities(
         * If set to true, the SDK will not use the network constraint when configuring Worker for the WorkManager, provided in Wellknown.
         */
        val disableNetworkConstraint: Boolean? = null,
+        /**
+         * True if the home server supports authenticated media.
+         */
+        val canUseAuthenticatedMedia: Boolean = false,
 ) {

    enum class RoomCapabilitySupport {
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
@ -35,6 +35,7 @@ import org.matrix.android.sdk.internal.auth.registration.RegisterAddThreePidTask
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.content.DefaultContentUrlResolver
 import org.matrix.android.sdk.internal.session.contentscanner.DisabledContentScannerService
+import org.matrix.android.sdk.internal.session.media.IsAuthenticatedMediaSupported

 internal class DefaultLoginWizard(
        private val authAPI: AuthAPI,
@ -45,8 +46,14 @@ internal class DefaultLoginWizard(
    private var pendingSessionData: PendingSessionData = pendingSessionStore.getPendingSessionData() ?: error("Pending session data should exist here")

    private val getProfileTask: GetProfileTask = DefaultGetProfileTask(
-            authAPI,
-            DefaultContentUrlResolver(pendingSessionData.homeServerConnectionConfig, DisabledContentScannerService())
+            authAPI = authAPI,
+            contentUrlResolver = DefaultContentUrlResolver(
+                    homeServerConnectionConfig = pendingSessionData.homeServerConnectionConfig,
+                    scannerService = DisabledContentScannerService(),
+                    isAuthenticatedMediaSupported = object : IsAuthenticatedMediaSupported {
+                        override fun invoke() = false
+                    }
+            )
    )

    override suspend fun getProfileInfo(matrixId: String): LoginProfileInfo {
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
@ -61,5 +61,6 @@ internal data class HomeServerVersion(
        val r0_6_1 = HomeServerVersion(major = 0, minor = 6, patch = 1)
        val v1_3_0 = HomeServerVersion(major = 1, minor = 3, patch = 0)
        val v1_4_0 = HomeServerVersion(major = 1, minor = 4, patch = 0)
+        val v1_11_0 = HomeServerVersion(major = 1, minor = 11, patch = 0)
    }
 }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
@ -54,6 +54,7 @@ private const val FEATURE_ID_ACCESS_TOKEN = "m.id_access_token"
 private const val FEATURE_SEPARATE_ADD_AND_BIND = "m.separate_add_and_bind"
 private const val FEATURE_THREADS_MSC3440 = "org.matrix.msc3440"
 private const val FEATURE_THREADS_MSC3440_STABLE = "org.matrix.msc3440.stable"
+
@Deprecated("The availability of stable get_login_token is now exposed as a capability and part of login flow")
 private const val FEATURE_QR_CODE_LOGIN = "org.matrix.msc3882"
 private const val FEATURE_THREADS_MSC3771 = "org.matrix.msc3771"
@ -142,6 +143,15 @@ internal fun Versions.doesServerSupportLogoutDevices(): Boolean {
    return getMaxVersion() >= HomeServerVersion.r0_6_1
 }

+/**
+ * Indicate if the server supports MSC3916 : https://github.com/matrix-org/matrix-spec-proposals/pull/3916
+ *
+ * @return true if authenticated media is supported
+ */
+internal fun Versions.doesServerSupportAuthenticatedMedia(): Boolean {
+    return getMaxVersion() >= HomeServerVersion.v1_11_0
+}
+
 private fun Versions.getMaxVersion(): HomeServerVersion {
    return supportedVersions
            ?.mapNotNull { HomeServerVersion.parse(it) }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/RustCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/RustCryptoStore.kt
@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.crypto.store

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import io.realm.RealmConfiguration
@ -280,7 +280,7 @@ internal class RustCryptoStore @Inject constructor(
                { entity -> myDeviceLastSeenInfoEntityMapper.map(entity) }
        )

-        return Transformations.map(liveData) {
+        return liveData.map {
            it.firstOrNull().toOptional()
        }
    }
@ -351,7 +351,7 @@ internal class RustCryptoStore @Inject constructor(
                    )
                }
        )
-        return Transformations.map(liveData) {
+        return liveData.map {
            it.firstOrNull() ?: GlobalCryptoConfig(false, false, false)
        }
    }
@ -372,7 +372,7 @@ internal class RustCryptoStore @Inject constructor(
                    it.blacklistUnverifiedDevices
                }
        )
-        return Transformations.map(liveData) {
+        return liveData.map {
            it.firstOrNull() ?: false
        }
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
@ -39,6 +39,7 @@ import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo
 import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo020
 import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo021
 import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo022
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo023
 import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
 import org.matrix.android.sdk.internal.util.time.Clock
 import javax.inject.Inject
@ -54,7 +55,7 @@ internal class RealmCryptoStoreMigration @Inject constructor(
        private val rustMigrationInfoProvider: RustMigrationInfoProvider,
 ) : MatrixRealmMigration(
        dbName = "Crypto",
-        schemaVersion = 22L,
+        schemaVersion = 23L,
 ) {
    /**
     * Forces all RealmCryptoStoreMigration instances to be equal.
@ -91,5 +92,6 @@ internal class RealmCryptoStoreMigration @Inject constructor(
                rustMigrationInfoProvider.rustEncryptionConfiguration,
                rustMigrationInfoProvider.migrateMegolmGroupSessions
        ).perform()
+        if (oldVersion < 23) MigrateCryptoTo023(realm).perform()
    }
 }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo023.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo023.kt
@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto.store.db.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.crypto.store.db.model.OutgoingKeyRequestEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+// Some fields are now required due to upgrade of Kotlin version.
+// See https://github.com/realm/realm-java/issues/7810 for more details.
+internal class MigrateCryptoTo023(realm: DynamicRealm) : RealmMigrator(realm, 23) {
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("OutgoingKeyRequestEntity")
+                ?.setRequired(OutgoingKeyRequestEntityFields.REQUEST_STATE_STR, true)
+    }
+}
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@ -78,6 +78,8 @@ import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo051
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo052
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo053
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo054
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo055
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo056
 import org.matrix.android.sdk.internal.util.Normalizer
 import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
 import timber.log.Timber
@ -101,7 +103,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
        private val scSchemaVersion = 7L
        private val scSchemaVersionOffset = (1L shl 12)

-        val schemaVersion = 54L +
+        val schemaVersion = 56L +
                scSchemaVersion * scSchemaVersionOffset
    }

@ -172,6 +174,8 @@ internal class RealmSessionStoreMigration @Inject constructor(
        if (oldVersion < 52) MigrateSessionTo052(realm).perform()
        if (oldVersion < 53) MigrateSessionTo053(realm).perform()
        if (oldVersion < 54) MigrateSessionTo054(realm).perform()
+        if (oldVersion < 55) MigrateSessionTo055(realm).perform()
+        if (oldVersion < 56) MigrateSessionTo056(realm).perform()

        if (oldScVersion <= 0) MigrateScSessionTo001(realm).perform()
        if (oldScVersion <= 1) MigrateScSessionTo002(realm).perform()
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
@ -51,6 +51,7 @@ internal object HomeServerCapabilitiesMapper {
                externalAccountManagementUrl = entity.externalAccountManagementUrl,
                authenticationIssuer = entity.authenticationIssuer,
                disableNetworkConstraint = entity.disableNetworkConstraint,
+                canUseAuthenticatedMedia = entity.canUseAuthenticatedMedia,
        )
    }

--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo055.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo055.kt
@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2024 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.model.EventInsertEntityFields
+import org.matrix.android.sdk.internal.database.model.LocalRoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.PushRulesEntityFields
+import org.matrix.android.sdk.internal.database.model.PusherEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.presence.UserPresenceEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+// Some fields are now required due to upgrade of Kotlin version.
+// See https://github.com/realm/realm-java/issues/7810 for more details.
+internal class MigrateSessionTo055(realm: DynamicRealm) : RealmMigrator(realm, 55) {
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("EventEntity")
+                ?.setRequired(EventEntityFields.SEND_STATE_STR, true)
+                ?.setRequired(EventEntityFields.THREAD_NOTIFICATION_STATE_STR, true)
+        realm.schema.get("EventInsertEntity")
+                ?.setRequired(EventInsertEntityFields.INSERT_TYPE_STR, true)
+        realm.schema.get("LocalRoomSummaryEntity")
+                ?.setRequired(LocalRoomSummaryEntityFields.STATE_STR, true)
+        realm.schema.get("PushRulesEntity")
+                ?.setRequired(PushRulesEntityFields.KIND_STR, true)
+        realm.schema.get("PusherEntity")
+                ?.setRequired(PusherEntityFields.STATE_STR, true)
+        realm.schema.get("RoomEntity")
+                ?.setRequired(RoomEntityFields.MEMBERSHIP_STR, true)
+                ?.setRequired(RoomEntityFields.MEMBERS_LOAD_STATUS_STR, true)
+        realm.schema.get("RoomMemberSummaryEntity")
+                ?.setRequired(RoomMemberSummaryEntityFields.MEMBERSHIP_STR, true)
+        realm.schema.get("RoomSummaryEntity")
+                ?.setRequired(RoomSummaryEntityFields.MEMBERSHIP_STR, true)
+                ?.setRequired(RoomSummaryEntityFields.VERSIONING_STATE_STR, true)
+        realm.schema.get("UserPresenceEntity")
+                ?.setRequired(UserPresenceEntityFields.PRESENCE_STR, true)
+    }
+}
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo056.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo056.kt
@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2024 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
+import org.matrix.android.sdk.internal.extensions.forceRefreshOfHomeServerCapabilities
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo056(realm: DynamicRealm) : RealmMigrator(realm, 56) {
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField(HomeServerCapabilitiesEntityFields.CAN_USE_AUTHENTICATED_MEDIA, Boolean::class.java)
+                ?.forceRefreshOfHomeServerCapabilities()
+    }
+}
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
@ -38,6 +38,7 @@ internal open class HomeServerCapabilitiesEntity(
        var externalAccountManagementUrl: String? = null,
        var authenticationIssuer: String? = null,
        var disableNetworkConstraint: Boolean? = null,
+        var canUseAuthenticatedMedia: Boolean = false,
 ) : RealmObject() {

    companion object
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
@ -84,10 +84,10 @@ internal class WorkManagerProvider @Inject constructor(
            workManager.enqueue(checkWorkerRequest)
            val checkWorkerLiveState = workManager.getWorkInfoByIdLiveData(checkWorkerRequest.id)
            val observer = object : Observer<WorkInfo> {
-                override fun onChanged(workInfo: WorkInfo?) {
-                    if (workInfo?.state?.isFinished == true) {
+                override fun onChanged(value: WorkInfo) {
+                    if (value.state.isFinished) {
                        checkWorkerLiveState.removeObserver(this)
-                        if (workInfo.state == WorkInfo.State.FAILED) {
+                        if (value.state == WorkInfo.State.FAILED) {
                            throw RuntimeException(
                                    "MatrixWorkerFactory is not being set on your worker configuration.\n" +
                                            "Makes sure to add it to a DelegatingWorkerFactory if you have your own factory or use it directly.\n" +
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/AccessTokenInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/AccessTokenInterceptor.kt
@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.network

 import okhttp3.Interceptor
 import okhttp3.Response
+import org.matrix.android.sdk.internal.network.httpclient.addAuthenticationHeader
 import org.matrix.android.sdk.internal.network.token.AccessTokenProvider

 internal class AccessTokenInterceptor(private val accessTokenProvider: AccessTokenProvider) : Interceptor {
@ -28,7 +29,7 @@ internal class AccessTokenInterceptor(private val accessTokenProvider: AccessTok
        // Add the access token to all requests if it is set
        accessTokenProvider.getToken()?.let { token ->
            val newRequestBuilder = request.newBuilder()
-            newRequestBuilder.header(HttpHeaders.Authorization, "Bearer $token")
+            newRequestBuilder.addAuthenticationHeader(token)
            request = newRequestBuilder.build()
        }

--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt
@ -22,6 +22,7 @@ import android.content.IntentFilter
 import android.net.ConnectivityManager
 import android.net.Network
 import android.os.Build
+import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
 import timber.log.Timber
 import javax.inject.Inject
@ -43,7 +44,12 @@ internal class FallbackNetworkCallbackStrategy @Inject constructor(
        networkInfoReceiver.isConnectedCallback = {
            hasChanged()
        }
-        context.registerReceiver(networkInfoReceiver, filter)
+        ContextCompat.registerReceiver(
+                context,
+                networkInfoReceiver,
+                filter,
+                ContextCompat.RECEIVER_NOT_EXPORTED,
+        )
    }

    override fun unregister() {
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/httpclient/OkHttpClientUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/httpclient/OkHttpClientUtil.kt
@ -17,9 +17,11 @@
 package org.matrix.android.sdk.internal.network.httpclient

 import okhttp3.OkHttpClient
+import okhttp3.Request
 import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.internal.network.AccessTokenInterceptor
+import org.matrix.android.sdk.internal.network.HttpHeaders
 import org.matrix.android.sdk.internal.network.interceptors.CurlLoggingInterceptor
 import org.matrix.android.sdk.internal.network.ssl.CertUtil
 import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
@ -66,3 +68,10 @@ internal fun OkHttpClient.Builder.applyMatrixConfiguration(matrixConfiguration:

    return this
 }
+
+fun Request.Builder.addAuthenticationHeader(accessToken: String?): Request.Builder {
+    if (accessToken != null) {
+        header(HttpHeaders.Authorization, "Bearer $accessToken")
+    }
+    return this
+}
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
@ -34,8 +34,11 @@ import org.matrix.android.sdk.api.session.crypto.attachments.ElementToDecrypt
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.util.md5
 import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
+import org.matrix.android.sdk.internal.di.Authenticated
 import org.matrix.android.sdk.internal.di.SessionDownloadsDirectory
 import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificateWithProgress
+import org.matrix.android.sdk.internal.network.httpclient.addAuthenticationHeader
+import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
 import org.matrix.android.sdk.internal.session.download.DownloadProgressInterceptor.Companion.DOWNLOAD_PROGRESS_INTERCEPTOR_HEADER
 import org.matrix.android.sdk.internal.util.file.AtomicFileCreator
 import org.matrix.android.sdk.internal.util.time.Clock
@ -54,6 +57,7 @@ internal class DefaultFileService @Inject constructor(
        private val okHttpClient: OkHttpClient,
        private val coroutineDispatchers: MatrixCoroutineDispatchers,
        private val clock: Clock,
+        @Authenticated private val accessTokenProvider: AccessTokenProvider,
 ) : FileService {

    // Legacy folder, will be deleted
@ -124,21 +128,26 @@ internal class DefaultFileService @Inject constructor(
                val cachedFiles = getFiles(url, fileName, mimeType, elementToDecrypt != null)

                if (!cachedFiles.file.exists()) {
-                    val resolvedUrl = contentUrlResolver.resolveForDownload(url, elementToDecrypt) ?: throw IllegalArgumentException("url is null")
+                    val resolvedMethod = contentUrlResolver.resolveForDownload(url, elementToDecrypt) ?: throw IllegalArgumentException("url is null")

-                    val request = when (resolvedUrl) {
+                    val request = when (resolvedMethod) {
                        is ContentUrlResolver.ResolvedMethod.GET -> {
-                            Request.Builder()
-                                    .url(resolvedUrl.url)
+                            val requestBuilder = Request.Builder()
+                                    .url(resolvedMethod.url)
                                    .header(DOWNLOAD_PROGRESS_INTERCEPTOR_HEADER, url)
-                                    .build()
+
+                            if (contentUrlResolver.requiresAuthentication(resolvedMethod.url)) {
+                                val accessToken = accessTokenProvider.getToken()
+                                requestBuilder.addAuthenticationHeader(accessToken)
+                            }
+                            requestBuilder.build()
                        }

                        is ContentUrlResolver.ResolvedMethod.POST -> {
                            Request.Builder()
-                                    .url(resolvedUrl.url)
+                                    .url(resolvedMethod.url)
                                    .header(DOWNLOAD_PROGRESS_INTERCEPTOR_HEADER, url)
-                                    .post(resolvedUrl.jsonBody.toRequestBody("application/json".toMediaType()))
+                                    .post(resolvedMethod.jsonBody.toRequestBody("application/json".toMediaType()))
                                    .build()
                        }
                    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@ -67,6 +67,7 @@ import org.matrix.android.sdk.api.util.appendParamToUrl
 import org.matrix.android.sdk.internal.auth.SSO_UIA_FALLBACK_PATH
 import org.matrix.android.sdk.internal.auth.SessionParamsStore
 import org.matrix.android.sdk.internal.database.tools.RealmDebugTools
+import org.matrix.android.sdk.internal.di.Authenticated
 import org.matrix.android.sdk.internal.di.ContentScannerDatabase
 import org.matrix.android.sdk.internal.di.CryptoDatabase
 import org.matrix.android.sdk.internal.di.IdentityDatabase
@ -131,6 +132,8 @@ internal class DefaultSession @Inject constructor(
        private val eventStreamService: Lazy<EventStreamService>,
        @UnauthenticatedWithCertificate
        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>,
+        @Authenticated
+        private val authenticatedOkHttpClient: Lazy<OkHttpClient>,
        private val sessionState: SessionState,
 ) : Session,
        GlobalErrorHandler.Listener {
@ -234,6 +237,10 @@ internal class DefaultSession @Inject constructor(
        return unauthenticatedWithCertificateOkHttpClient.get()
    }

+    override fun getAuthenticatedOkHttpClient(): OkHttpClient {
+        return authenticatedOkHttpClient.get()
+    }
+
    override fun addListener(listener: Session.Listener) {
        sessionListeners.addListener(listener)
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@ -83,6 +83,7 @@ import org.matrix.android.sdk.internal.session.events.DefaultEventService
 import org.matrix.android.sdk.internal.session.homeserver.DefaultHomeServerCapabilitiesService
 import org.matrix.android.sdk.internal.session.identity.DefaultIdentityService
 import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationManager
+import org.matrix.android.sdk.internal.session.media.DefaultIsAuthenticatedMediaSupported
 import org.matrix.android.sdk.internal.session.openid.DefaultOpenIdService
 import org.matrix.android.sdk.internal.session.permalinks.DefaultPermalinkService
 import org.matrix.android.sdk.internal.session.room.EventRelationsAggregationProcessor
@ -365,6 +366,10 @@ internal abstract class SessionModule {
    @IntoSet
    abstract fun bindEventInsertObserver(observer: EventInsertLiveObserver): SessionLifecycleObserver

+    @Binds
+    @IntoSet
+    abstract fun bindIsMediaAuthenticated(observer: DefaultIsAuthenticatedMediaSupported): SessionLifecycleObserver
+
    @Binds
    @IntoSet
    abstract fun bindIntegrationManager(manager: IntegrationManager): SessionLifecycleObserver
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
@ -25,16 +25,18 @@ import org.matrix.android.sdk.api.session.crypto.attachments.ElementToDecrypt
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.session.contentscanner.ScanEncryptorUtils
 import org.matrix.android.sdk.internal.session.contentscanner.model.toJson
+import org.matrix.android.sdk.internal.session.media.IsAuthenticatedMediaSupported
 import org.matrix.android.sdk.internal.util.ensureTrailingSlash
 import javax.inject.Inject

 internal class DefaultContentUrlResolver @Inject constructor(
        homeServerConnectionConfig: HomeServerConnectionConfig,
-        private val scannerService: ContentScannerService
+        private val scannerService: ContentScannerService,
+        private val isAuthenticatedMediaSupported: IsAuthenticatedMediaSupported,
 ) : ContentUrlResolver {

    private val baseUrl = homeServerConnectionConfig.homeServerUriBase.toString().ensureTrailingSlash()
-
+    private val authenticatedMediaApiPath = baseUrl + NetworkConstants.URI_API_PREFIX_PATH_V1 + "media/"
    override val uploadUrl = baseUrl + NetworkConstants.URI_API_MEDIA_PREFIX_PATH_R0 + "upload"

    override fun resolveForDownload(contentUrl: String?, elementToDecrypt: ElementToDecrypt?): ContentUrlResolver.ResolvedMethod? {
@ -80,15 +82,20 @@ internal class DefaultContentUrlResolver @Inject constructor(
                }
    }

+    override fun requiresAuthentication(resolvedUrl: String): Boolean {
+        return resolvedUrl.startsWith(authenticatedMediaApiPath)
+    }
+
    private fun resolve(
            contentUrl: String,
            toThumbnail: Boolean,
            params: String = ""
    ): String {
        var serverAndMediaId = contentUrl.removeMxcPrefix()
-
        val apiPath = if (scannerService.isScannerEnabled()) {
            NetworkConstants.URI_API_PREFIX_PATH_MEDIA_PROXY_UNSTABLE
+        } else if (isAuthenticatedMediaSupported()) {
+            NetworkConstants.URI_API_PREFIX_PATH_V1 + "media/"
        } else {
            NetworkConstants.URI_API_MEDIA_PREFIX_PATH_R0
        }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/RealmContentScannerStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/RealmContentScannerStore.kt
@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.contentscanner.db

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import io.realm.RealmConfiguration
@ -138,7 +138,7 @@ internal class RealmContentScannerStore @Inject constructor(
                    entity.toModel()
                }
        )
-        return Transformations.map(liveData) {
+        return liveData.map {
            it.firstOrNull().toOptional()
        }
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@ -20,9 +20,11 @@ import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.MatrixPatterns.getServerName
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.orTrue
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.internal.auth.version.Versions
+import org.matrix.android.sdk.internal.auth.version.doesServerSupportAuthenticatedMedia
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportLogoutDevices
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportQrCodeLogin
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportRedactionOfRelatedEvents
@ -38,8 +40,9 @@ import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationManagerConfigExtractor
+import org.matrix.android.sdk.internal.session.media.AuthenticatedMediaAPI
 import org.matrix.android.sdk.internal.session.media.GetMediaConfigResult
-import org.matrix.android.sdk.internal.session.media.MediaAPI
+import org.matrix.android.sdk.internal.session.media.UnauthenticatedMediaAPI
 import org.matrix.android.sdk.internal.task.Task
 import org.matrix.android.sdk.internal.util.awaitTransaction
 import org.matrix.android.sdk.internal.wellknown.GetWellknownTask
@ -55,7 +58,8 @@ internal interface GetHomeServerCapabilitiesTask : Task<GetHomeServerCapabilitie

 internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
        private val capabilitiesAPI: CapabilitiesAPI,
-        private val mediaAPI: MediaAPI,
+        private val unauthenticatedMediaAPI: UnauthenticatedMediaAPI,
+        private val authenticatedMediaAPI: AuthenticatedMediaAPI,
        @SessionDatabase private val monarchy: Monarchy,
        private val globalErrorReceiver: GlobalErrorReceiver,
        private val getWellknownTask: GetWellknownTask,
@ -70,7 +74,6 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
        if (!doRequest) {
            monarchy.awaitTransaction { realm ->
                val homeServerCapabilitiesEntity = HomeServerCapabilitiesEntity.getOrCreate(realm)
-
                doRequest = homeServerCapabilitiesEntity.lastUpdatedTimestamp + MIN_DELAY_BETWEEN_TWO_REQUEST_MILLIS < Date().time
            }
        }
@ -85,18 +88,22 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
            }
        }.getOrNull()

-        val mediaConfig = runCatching {
-            executeRequest(globalErrorReceiver) {
-                mediaAPI.getMediaConfig()
-            }
-        }.getOrNull()
-
        val versions = runCatching {
            executeRequest(null) {
                capabilitiesAPI.getVersions()
            }
        }.getOrNull()

+        val mediaConfig = runCatching {
+            executeRequest(globalErrorReceiver) {
+                if (versions?.doesServerSupportAuthenticatedMedia().orFalse()) {
+                    authenticatedMediaAPI.getMediaConfig()
+                } else {
+                    unauthenticatedMediaAPI.getMediaConfig()
+                }
+            }
+        }.getOrNull()
+
        // Domain may include a port (eg, matrix.org:8080)
        // Per https://spec.matrix.org/latest/client-server-api/#well-known-uri we should extract the hostname from the server name
        // So we take everything before the last : as the domain for the well-known task.
@ -155,6 +162,8 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
                        getVersionResult.doesServerSupportRemoteToggleOfPushNotifications()
                homeServerCapabilitiesEntity.canRedactEventWithRelations =
                        getVersionResult.doesServerSupportRedactionOfRelatedEvents()
+                homeServerCapabilitiesEntity.canUseAuthenticatedMedia =
+                        getVersionResult.doesServerSupportAuthenticatedMedia()
            }

            if (getWellknownResult != null && getWellknownResult is WellknownResult.Prompt) {
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesDataSource.kt
@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.homeserver

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import io.realm.kotlin.where
@ -46,7 +46,7 @@ internal class HomeServerCapabilitiesDataSource @Inject constructor(
                { realm: Realm -> realm.where<HomeServerCapabilitiesEntity>() },
                { HomeServerCapabilitiesMapper.map(it) }
        )
-        return Transformations.map(liveData) {
+        return liveData.map {
            it.firstOrNull().toOptional()
        }
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
@ -84,7 +84,10 @@ internal class DefaultIdentityService @Inject constructor(
        private val sessionParams: SessionParams
 ) : IdentityService, SessionLifecycleObserver {

-    private val lifecycleOwner: LifecycleOwner = LifecycleOwner { lifecycleRegistry }
+    private val lifecycleOwner: LifecycleOwner = object : LifecycleOwner {
+        override val lifecycle: Lifecycle
+            get() = lifecycleRegistry
+    }
    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(lifecycleOwner)

    private val listeners = mutableSetOf<IdentityServiceListener>()
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
@ -64,7 +64,10 @@ internal class IntegrationManager @Inject constructor(
        SessionLifecycleObserver {

    private val currentConfigs = ArrayList<IntegrationManagerConfig>()
-    private val lifecycleOwner: LifecycleOwner = LifecycleOwner { lifecycleRegistry }
+    private val lifecycleOwner: LifecycleOwner = object : LifecycleOwner {
+        override val lifecycle: Lifecycle
+            get() = lifecycleRegistry
+    }
    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(lifecycleOwner)

    private val listeners = HashSet<IntegrationManagerService.Listener>()
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/AuthenticatedMediaAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/AuthenticatedMediaAPI.kt
@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2024 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.media
+
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+/**
+ * Implementation of the media repository API using the new Authenticated media API.
+ */
+internal interface AuthenticatedMediaAPI : MediaAPI {
+    /**
+     * Retrieve the configuration of the content repository
+     * Ref: https://spec.matrix.org/v1.11/client-server-api/#get_matrixclientv1mediaconfig
+     */
+    @GET(NetworkConstants.URI_API_PREFIX_PATH_V1 + "media/config")
+    override suspend fun getMediaConfig(): GetMediaConfigResult
+
+    /**
+     * Get information about a URL for the client. Typically this is called when a client
+     * sees a URL in a message and wants to render a preview for the user.
+     * Ref: https://spec.matrix.org/v1.11/client-server-api/#get_matrixclientv1mediapreview_url
+     * @param url Required. The URL to get a preview of.
+     * @param ts The preferred point in time to return a preview for. The server may return a newer version
+     * if it does not have the requested version available.
+     */
+    @GET(NetworkConstants.URI_API_PREFIX_PATH_V1 + "media/preview_url")
+    override suspend fun getPreviewUrlData(@Query("url") url: String, @Query("ts") ts: Long?): JsonDict
+}
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/DefaultIsAuthenticatedMediaSupported.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/DefaultIsAuthenticatedMediaSupported.kt
@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2024 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.media
+
+import com.zhuinden.monarchy.Monarchy
+import io.realm.Realm
+import io.realm.RealmResults
+import org.matrix.android.sdk.internal.database.RealmLiveEntityObserver
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntity
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.SessionScope
+import timber.log.Timber
+import javax.inject.Inject
+
+@SessionScope
+internal class DefaultIsAuthenticatedMediaSupported @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+) :
+        IsAuthenticatedMediaSupported,
+        RealmLiveEntityObserver<HomeServerCapabilitiesEntity>(monarchy.realmConfiguration) {
+
+    override fun invoke(): Boolean {
+        return canUseAuthenticatedMedia
+    }
+
+    override val query = Monarchy.Query {
+        it.where(HomeServerCapabilitiesEntity::class.java)
+    }
+
+    override fun onChange(results: RealmResults<HomeServerCapabilitiesEntity>) {
+        canUseAuthenticatedMedia = results.canUseAuthenticatedMedia()
+        Timber.d("canUseAuthenticatedMedia: $canUseAuthenticatedMedia")
+    }
+
+    private var canUseAuthenticatedMedia = getInitialValue()
+
+    private fun getInitialValue(): Boolean {
+        return Realm.getInstance(monarchy.realmConfiguration).use { realm ->
+            query.createQuery(realm).findAll().canUseAuthenticatedMedia()
+        }
+    }
+
+    private fun RealmResults<HomeServerCapabilitiesEntity>.canUseAuthenticatedMedia(): Boolean {
+        return firstOrNull()?.canUseAuthenticatedMedia ?: false
+    }
+}
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetPreviewUrlTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetPreviewUrlTask.kt
@ -41,7 +41,7 @@ internal interface GetPreviewUrlTask : Task<GetPreviewUrlTask.Params, PreviewUrl
 }

 internal class DefaultGetPreviewUrlTask @Inject constructor(
-        private val mediaAPI: MediaAPI,
+        private val mediaAPIProvider: MediaAPIProvider,
        private val globalErrorReceiver: GlobalErrorReceiver,
        @SessionDatabase private val monarchy: Monarchy
 ) : GetPreviewUrlTask {
@ -66,7 +66,7 @@ internal class DefaultGetPreviewUrlTask @Inject constructor(

    private suspend fun doRequest(url: String, timestamp: Long?): PreviewUrlData {
        return executeRequest(globalErrorReceiver) {
-            mediaAPI.getPreviewUrlData(url, timestamp)
+            mediaAPIProvider.getMediaAPI().getPreviewUrlData(url, timestamp)
        }
                .toPreviewUrlData(url)
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetRawPreviewUrlTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetRawPreviewUrlTask.kt
@ -30,13 +30,13 @@ internal interface GetRawPreviewUrlTask : Task<GetRawPreviewUrlTask.Params, Json
 }

 internal class DefaultGetRawPreviewUrlTask @Inject constructor(
-        private val mediaAPI: MediaAPI,
+        private val mediaAPIProvider: MediaAPIProvider,
        private val globalErrorReceiver: GlobalErrorReceiver
 ) : GetRawPreviewUrlTask {

    override suspend fun execute(params: GetRawPreviewUrlTask.Params): JsonDict {
        return executeRequest(globalErrorReceiver) {
-            mediaAPI.getPreviewUrlData(params.url, params.timestamp)
+            mediaAPIProvider.getMediaAPI().getPreviewUrlData(params.url, params.timestamp)
        }
    }
 }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/IsAuthenticatedMediaSupported.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/IsAuthenticatedMediaSupported.kt
@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2024 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.media
+
+interface IsAuthenticatedMediaSupported {
+    operator fun invoke(): Boolean
+}
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/MediaAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/MediaAPI.kt
@ -1,11 +1,11 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (C) 2024 The Matrix.org Foundation C.I.C.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@ -17,26 +17,11 @@
 package org.matrix.android.sdk.internal.session.media

 import org.matrix.android.sdk.api.util.JsonDict
-import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.http.GET
-import retrofit2.http.Query

+/**
+ * This defines some method to interact with the media repository.
+ */
 internal interface MediaAPI {
-    /**
-     * Retrieve the configuration of the content repository
-     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-media-r0-config
-     */
-    @GET(NetworkConstants.URI_API_MEDIA_PREFIX_PATH_R0 + "config")
    suspend fun getMediaConfig(): GetMediaConfigResult
-
-    /**
-     * Get information about a URL for the client. Typically this is called when a client
-     * sees a URL in a message and wants to render a preview for the user.
-     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-media-r0-preview-url
-     * @param url Required. The URL to get a preview of.
-     * @param ts The preferred point in time to return a preview for. The server may return a newer version
-     * if it does not have the requested version available.
-     */
-    @GET(NetworkConstants.URI_API_MEDIA_PREFIX_PATH_R0 + "preview_url")
-    suspend fun getPreviewUrlData(@Query("url") url: String, @Query("ts") ts: Long?): JsonDict
+    suspend fun getPreviewUrlData(url: String, ts: Long?): JsonDict
 }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/MediaAPIProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/MediaAPIProvider.kt
@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.media
+
+import javax.inject.Inject
+
+internal class MediaAPIProvider @Inject constructor(
+        private val isAuthenticatedMediaSupported: IsAuthenticatedMediaSupported,
+        private val authenticatedMediaAPI: AuthenticatedMediaAPI,
+        private val unauthenticatedMediaAPI: UnauthenticatedMediaAPI,
+) {
+
+    fun getMediaAPI(): MediaAPI {
+        return if (isAuthenticatedMediaSupported()) {
+            authenticatedMediaAPI
+        } else {
+            unauthenticatedMediaAPI
+        }
+    }
+}
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/MediaModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/MediaModule.kt
@ -31,11 +31,21 @@ internal abstract class MediaModule {
        @Provides
        @JvmStatic
        @SessionScope
-        fun providesMediaAPI(retrofit: Retrofit): MediaAPI {
-            return retrofit.create(MediaAPI::class.java)
+        fun providesUnauthenticatedMediaAPI(retrofit: Retrofit): UnauthenticatedMediaAPI {
+            return retrofit.create(UnauthenticatedMediaAPI::class.java)
+        }
+
+        @Provides
+        @JvmStatic
+        @SessionScope
+        fun providesAuthenticatedMediaAPI(retrofit: Retrofit): AuthenticatedMediaAPI {
+            return retrofit.create(AuthenticatedMediaAPI::class.java)
        }
    }

+    @Binds
+    abstract fun bindIsAuthenticatedMediaSupported(isAuthenticatedMediaSupported: DefaultIsAuthenticatedMediaSupported): IsAuthenticatedMediaSupported
+
    @Binds
    abstract fun bindMediaService(service: DefaultMediaService): MediaService

--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/UnauthenticatedMediaAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/UnauthenticatedMediaAPI.kt
@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2024 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.media
+
+import org.matrix.android.sdk.api.util.JsonDict
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+internal interface UnauthenticatedMediaAPI : MediaAPI {
+    /**
+     * Retrieve the configuration of the content repository
+     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-media-r0-config
+     */
+    @GET(NetworkConstants.URI_API_MEDIA_PREFIX_PATH_R0 + "config")
+    override suspend fun getMediaConfig(): GetMediaConfigResult
+
+    /**
+     * Get information about a URL for the client. Typically this is called when a client
+     * sees a URL in a message and wants to render a preview for the user.
+     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-media-r0-preview-url
+     * @param url Required. The URL to get a preview of.
+     * @param ts The preferred point in time to return a preview for. The server may return a newer version
+     * if it does not have the requested version available.
+     */
+    @GET(NetworkConstants.URI_API_MEDIA_PREFIX_PATH_R0 + "preview_url")
+    override suspend fun getPreviewUrlData(@Query("url") url: String, @Query("ts") ts: Long?): JsonDict
+}
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/DefaultPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/DefaultPushRuleService.kt
@ -16,7 +16,7 @@
 package org.matrix.android.sdk.internal.session.pushrules

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.pushrules.Action
@ -160,7 +160,7 @@ internal class DefaultPushRuleService @Inject constructor(
                    result.pushRules.map(PushRuleEntity::ruleId).filter { !it.startsWith(".") }
                }
        )
-        return Transformations.map(liveData) { results ->
+        return liveData.map { results ->
            results.firstOrNull().orEmpty().toSet()
        }
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.room

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import androidx.paging.PagedList
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.session.events.model.Event
@ -242,7 +242,7 @@ internal class DefaultRoomService @Inject constructor(
                },
                { it.asDomain() }
        )
-        return Transformations.map(liveData) { results ->
+        return liveData.map { results ->
            results.firstOrNull().toOptional()
        }
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomDataSource.kt
@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.room

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import org.matrix.android.sdk.api.extensions.orFalse
@ -48,7 +48,7 @@ internal class RoomDataSource @Inject constructor(
                }
        )

-        return Transformations.map(liveData) { results ->
+        return liveData.map { results ->
            results.firstOrNull().orFalse()
        }
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/accountdata/RoomAccountDataDataSource.kt
@ -18,7 +18,7 @@ package org.matrix.android.sdk.internal.session.room.accountdata

 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import io.realm.RealmQuery
@ -44,7 +44,7 @@ internal class RoomAccountDataDataSource @Inject constructor(
    }

    fun getLiveAccountDataEvent(roomId: String, type: String): LiveData<Optional<RoomAccountDataEvent>> {
-        return Transformations.map(getLiveAccountDataEvents(roomId, setOf(type))) {
+        return getLiveAccountDataEvents(roomId, setOf(type)).map {
            it.firstOrNull().toOptional()
        }
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.room.draft

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import io.realm.kotlin.createObject
@ -72,7 +72,7 @@ internal class DraftRepository @Inject constructor(
                    }
                }
        )
-        return Transformations.map(liveData) {
+        return liveData.map {
            it.firstOrNull()?.firstOrNull().toOptional()
        }
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/DefaultLocationSharingService.kt
@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.room.location

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import com.zhuinden.monarchy.Monarchy
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@ -119,13 +119,13 @@ internal class DefaultLocationSharingService @AssistedInject constructor(
    }

    override fun getLiveLocationShareSummary(beaconInfoEventId: String): LiveData<Optional<LiveLocationShareAggregatedSummary>> {
-        return Transformations.map(
-                monarchy.findAllMappedWithChanges(
+        return monarchy
+                .findAllMappedWithChanges(
                        { LiveLocationShareAggregatedSummaryEntity.where(it, roomId = roomId, eventId = beaconInfoEventId) },
                        liveLocationShareAggregatedSummaryMapper
                )
-        ) {
-            it.firstOrNull().toOptional()
-        }
+                .map {
+                    it.firstOrNull().toOptional()
+                }
    }
 }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.room.notification

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import com.zhuinden.monarchy.Monarchy
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@ -42,7 +42,7 @@ internal class DefaultRoomPushRuleService @AssistedInject constructor(
    }

    override fun getLiveRoomNotificationState(): LiveData<RoomNotificationState> {
-        return Transformations.map(getPushRuleForRoom()) {
+        return getPushRuleForRoom().map {
            it?.toRoomNotificationState() ?: RoomNotificationState.ALL_MESSAGES
        }
    }
@ -60,7 +60,7 @@ internal class DefaultRoomPushRuleService @AssistedInject constructor(
                    result.toRoomPushRule()
                }
        )
-        return Transformations.map(liveData) { results ->
+        return liveData.map { results ->
            results.firstOrNull()
        }
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/poll/DefaultPollHistoryService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/poll/DefaultPollHistoryService.kt
@ -17,7 +17,8 @@
 package org.matrix.android.sdk.internal.session.room.poll

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
+import androidx.lifecycle.switchMap
 import com.zhuinden.monarchy.Monarchy
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@ -112,7 +113,7 @@ internal class DefaultPollHistoryService @AssistedInject constructor(
    override fun getPollEvents(): LiveData<List<TimelineEvent>> {
        val pollHistoryStatusLiveData = getPollHistoryStatus()

-        return Transformations.switchMap(pollHistoryStatusLiveData) { results ->
+        return pollHistoryStatusLiveData.switchMap { results ->
            val oldestTimestamp = results.firstOrNull()?.oldestTimestampTargetReachedMs ?: clock.epochMillis()
            getPollStartEventsAfter(oldestTimestamp)
        }
@ -132,7 +133,7 @@ internal class DefaultPollHistoryService @AssistedInject constructor(
                }
        )

-        return Transformations.map(eventsLiveData) { events ->
+        return eventsLiveData.map { events ->
            events.filter { it.root.getClearType() in EventType.POLL_START.values }
                    .distinctBy { it.eventId }
        }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.room.read

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import com.zhuinden.monarchy.Monarchy
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@ -112,7 +112,7 @@ internal class DefaultReadService @AssistedInject constructor(
                { ReadMarkerEntity.where(it, roomId) },
                { it.eventId }
        )
-        return Transformations.map(liveRealmData) {
+        return liveRealmData.map {
            it.firstOrNull().toOptional()
        }
    }
@ -122,7 +122,7 @@ internal class DefaultReadService @AssistedInject constructor(
                { ReadReceiptEntity.where(it, roomId = roomId, userId = userId, threadId = threadId) },
                { it.eventId }
        )
-        return Transformations.map(liveRealmData) {
+        return liveRealmData.map {
            it.firstOrNull().toOptional()
        }
    }
@ -143,7 +143,7 @@ internal class DefaultReadService @AssistedInject constructor(
                { ReadReceiptsSummaryEntity.where(it, eventId) },
                { readReceiptsSummaryMapper.map(it) }
        )
-        return Transformations.map(liveRealmData) {
+        return liveRealmData.map {
            it.firstOrNull().orEmpty()
        }
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@ -16,7 +16,7 @@
 package org.matrix.android.sdk.internal.session.room.relation

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import com.zhuinden.monarchy.Monarchy
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@ -163,7 +163,7 @@ internal class DefaultRelationService @AssistedInject constructor(
                { EventAnnotationsSummaryEntity.where(it, roomId, eventId) },
                { it.asDomain() }
        )
-        return Transformations.map(liveData) { results ->
+        return liveData.map { results ->
            results.firstOrNull().toOptional()
        }
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt
@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.room.state

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import io.realm.RealmQuery
@ -52,7 +52,7 @@ internal class StateEventDataSource @Inject constructor(
                { realm -> buildStateEventQuery(realm, roomId, setOf(eventType), stateKey) },
                { it.root?.asDomain() }
        )
-        return Transformations.map(liveData) { results ->
+        return liveData.map { results ->
            results.firstOrNull().toOptional()
        }
    }
@ -72,7 +72,7 @@ internal class StateEventDataSource @Inject constructor(
                { realm -> buildStateEventQuery(realm, roomId, eventTypes, stateKey) },
                { it.root?.asDomain() }
        )
-        return Transformations.map(liveData) { results ->
+        return liveData.map { results ->
            results.filterNotNull()
        }
    }
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@ -19,7 +19,8 @@ package org.matrix.android.sdk.internal.session.room.summary

 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
+import androidx.lifecycle.switchMap
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
 import com.zhuinden.monarchy.Monarchy
@ -86,7 +87,7 @@ internal class RoomSummaryDataSource @Inject constructor(
                { realm -> RoomSummaryEntity.where(realm, roomId).isNotEmpty(RoomSummaryEntityFields.DISPLAY_NAME) },
                { roomSummaryMapper.map(it) }
        )
-        return Transformations.map(liveData) { results ->
+        return liveData.map { results ->
            results.firstOrNull().toOptional()
        }
    }
@ -115,7 +116,7 @@ internal class RoomSummaryDataSource @Inject constructor(
                { realm -> LocalRoomSummaryEntity.where(realm, roomId) },
                { localRoomSummaryMapper.map(it) }
        )
-        return Transformations.map(liveData) { results ->
+        return liveData.map { results ->
            results.firstOrNull().toOptional()
        }
    }
@ -167,7 +168,7 @@ internal class RoomSummaryDataSource @Inject constructor(
                    roomSummaryMapper.map(it)
                }
        )
-        return Transformations.map(liveData) { results ->
+        return liveData.map { results ->
            results.firstOrNull().toOptional()
        }
    }
@ -294,7 +295,7 @@ internal class RoomSummaryDataSource @Inject constructor(
        val liveRooms = monarchy.findAllManagedWithChanges {
            roomSummariesQuery(it, queryParams)
        }
-        return Transformations.map(liveRooms) {
+        return liveRooms.map {
            it.realmResults.where().count().toInt()
        }
    }
@ -417,7 +418,7 @@ internal class RoomSummaryDataSource @Inject constructor(
        // and switch map to listen those?
        val mediatorLiveData = HierarchyLiveDataHelper(spaceId, memberShips, this).liveData()

-        return Transformations.switchMap(mediatorLiveData) { allIds ->
+        return mediatorLiveData.switchMap { allIds ->
            monarchy.findAllMappedWithChanges(
                    {
                        it.where<RoomSummaryEntity>()
@ -442,15 +443,16 @@ internal class RoomSummaryDataSource @Inject constructor(
    }

    fun getFlattenOrphanRoomsLive(): LiveData<List<RoomSummary>> {
-        return Transformations.map(
-                getRoomSummariesLive(roomSummaryQueryParams {
+        return getRoomSummariesLive(
+                roomSummaryQueryParams {
                    memberships = Membership.activeMemberships()
                    excludeType = listOf(RoomType.SPACE)
                    roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                })
-        ) {
-            it.filter { isOrphan(it) }
-        }
+                }
+        )
+                .map {
+                    it.filter { isOrphan(it) }
+                }
    }

    private fun isOrphan(roomSummary: RoomSummary): Boolean {
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.user

 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import androidx.paging.DataSource
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
@ -73,7 +73,7 @@ internal class UserDataSource @Inject constructor(
                { UserEntity.where(it, userId) },
                { it.asDomain() }
        )
-        return Transformations.map(liveData) { results ->
+        return liveData.map { results ->
            results.firstOrNull().toOptional()
        }
    }
--- a/Show more
+++ b/Show more