Merge Element X 2026.01.1 #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

raphael-chevallier merged 456 commits into develop from raphoid/merge-26.01.1

Feb 5, 2026

.editorconfig

-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,7 @@ ktlint_standard_class-signature = disabled @@
     ktlint_standard_when-entry-bracing = disabled
     ktlint_standard_blank-line-between-when-conditions = disabled
     ktlint_standard_mixed-condition-operators = disabled
+    ktlint_standard_no-unused-imports = enabled
     [*.java]
     ij_java_align_consecutive_assignments = false
@@ Expand Down @@

.github/workflows/build.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -47,22 +47,23 @@ jobs:
  
              ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}

              ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}

              ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}

              ELEMENT_SDK_SENTRY_DSN: ${{ secrets.ELEMENT_SDK_SENTRY_DSN }}

              ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}

              ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}

              ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}

              ELEMENT_CALL_RAGESHAKE_URL: ${{ secrets.ELEMENT_CALL_RAGESHAKE_URL }}

            run: ./gradlew :app:assembleGplayTchapWithpinningDebug app:assembleFDroidTchapWithpinningDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES

          - name: Upload debug APKs

            if: ${{ matrix.variant == 'debug' }}

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: elementx-debug

              path: |

                app/build/outputs/apk/gplayTchapWithpinning/debug/*-universal-debug.apk

                app/build/outputs/apk/fdroidTchapWithpinning/debug/*-universal-debug.apk

          - name: Upload x86_64 APK for Maestro

            if: ${{ matrix.variant == 'debug' }}

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: elementx-apk-maestro

              path: |

    @@ -105,15 +106,15 @@ jobs:
  
              ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}

              ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}

              ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}

              ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}

              ELEMENT_SDK_SENTRY_DSN: ${{ secrets.ELEMENT_SDK_SENTRY_DSN }}

              ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}

              ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}

              ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}

              ELEMENT_CALL_RAGESHAKE_URL: ${{ secrets.ELEMENT_CALL_RAGESHAKE_URL }}

            run: ./gradlew :app:assembleGplayTchapWithpinningNightly -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES

          - name: Upload Tchap X nightly APKs

            if: ${{ matrix.variant == 'nightly' }}

            uses: actions/upload-artifact@v4

            uses: actions/upload-artifact@v6

            with:

              name: Tchap.X.beta-nightly

              path: |

    @@ -124,15 +125,15 @@ jobs:
  
              ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}

              ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}

              ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}

              ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}

              ELEMENT_SDK_SENTRY_DSN: ${{ secrets.ELEMENT_SDK_SENTRY_DSN }}

              ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}

              ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}

              ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}

              ELEMENT_CALL_RAGESHAKE_URL: ${{ secrets.ELEMENT_CALL_RAGESHAKE_URL }}

            run: ./gradlew :app:assembleGplaybTchapWithpinningNightly -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES

          - name: Upload Btchap X nightly APKs

            if: ${{ matrix.variant == 'nightly' }}

            uses: actions/upload-artifact@v4

            uses: actions/upload-artifact@v6

            with:

              name: Btchap.X.beta-nightly

              path: |

.github/workflows/build_enterprise.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -54,14 +54,15 @@ jobs: @@
               ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
               ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
               ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}
+              ELEMENT_SDK_SENTRY_DSN: ${{ secrets.ELEMENT_SDK_SENTRY_DSN }}
               ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}
               ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}
               ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}
               ELEMENT_CALL_RAGESHAKE_URL: ${{ secrets.ELEMENT_CALL_RAGESHAKE_URL }}
             run: ./gradlew :app:assembleGplayTchapWithpinningDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
           - name: Upload debug Enterprise APKs
             if: ${{ matrix.variant == 'debug' }}
-            uses: actions/upload-artifact@v5
+            uses: actions/upload-artifact@v6
             with:
               name: elementx-enterprise-debug
               path: |
@@ Expand Down @@

.github/workflows/maestro-local.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -45,7 +45,7 @@ jobs:
  
              ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}

              ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}

          - name: Upload APK as artifact

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: elementx-apk-maestro

              path: |

    @@ -71,7 +71,7 @@ jobs:
  
              ref: ${{ github.ref }}

              lfs: true # Tchap TODO : Remove this when maven is using matrix-sdk from Tchap repository

          - name: Download APK artifact from previous job

            uses: actions/download-artifact@v6

            uses: actions/download-artifact@v7

            with:

              name: elementx-apk-maestro

          - name: Enable KVM group perms

    @@ -104,7 +104,7 @@ jobs:
  
              script: |

                .github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh app-gplay-tchap-withpinning-x86_64-debug.apk

          - name: Upload test results

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: test-results

              path: |

.github/workflows/nightly.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,7 @@ jobs: @@
               ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
               ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
               ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}
+              ELEMENT_SDK_SENTRY_DSN: ${{ secrets.ELEMENT_SDK_SENTRY_DSN }}
               ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}
               ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}
               ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}
@@ Expand Down @@

.github/workflows/nightlyReports.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -43,7 +43,7 @@ jobs:
  
          - name: ✅ Upload kover report

            if: always()

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: kover-results

              path: |

    @@ -75,7 +75,7 @@ jobs:
  
            run: ./gradlew dependencyCheckAnalyze $CI_GRADLE_ARG_PROPERTIES

          - name: Upload dependency analysis

            if: always()

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: dependency-analysis

              path: build/reports/dependency-check-report.html

.github/workflows/quality.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -102,7 +102,7 @@ jobs:
  
            run: ./gradlew :tests:konsist:testDebugUnitTest $CI_GRADLE_ARG_PROPERTIES --no-daemon

          - name: Upload reports

            if: always()

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: konsist-report

              path: |

    @@ -182,7 +182,7 @@ jobs:
  
            run: ./gradlew :app:lintGplayTchapWithpinningDebug :app:lintFdroidTchapWithpinningDebug lintDebug $CI_GRADLE_ARG_PROPERTIES --continue

          - name: Upload reports

            if: always()

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: linting-report

              path: |

    @@ -225,7 +225,7 @@ jobs:
  
            run: ./gradlew detekt $CI_GRADLE_ARG_PROPERTIES --no-daemon

          - name: Upload reports

            if: always()

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: detekt-report

              path: |

    @@ -268,7 +268,7 @@ jobs:
  
            run: ./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES

          - name: Upload reports

            if: always()

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: ktlint-report

              path: |

    @@ -334,7 +334,7 @@ jobs:
  
              # https://github.com/actions/checkout/issues/881

              ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}

          - name: Download reports from previous jobs

            uses: actions/download-artifact@v6

            uses: actions/download-artifact@v7

          - name: Prepare Danger

            if: always()

            run: |

.github/workflows/release.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -32,13 +32,14 @@ jobs:
  
              ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}

              ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}

              ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}

              ELEMENT_SDK_SENTRY_DSN: ${{ secrets.ELEMENT_SDK_SENTRY_DSN }}

              ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}

              ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}

              ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}

              ELEMENT_CALL_RAGESHAKE_URL: ${{ secrets.ELEMENT_CALL_RAGESHAKE_URL }}

            run: ./gradlew bundleGplayTchapWithpinningRelease $CI_GRADLE_ARG_PROPERTIES

          - name: Upload bundle as artifact

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: elementx-app-gplay-bundle-unsigned

              path: |

    @@ -76,7 +77,7 @@ jobs:
  
              ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}

            run: ./gradlew bundleGplayTchapWithpinningRelease $CI_GRADLE_ARG_PROPERTIES

          - name: Upload bundle as artifact

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: elementx-enterprise-app-gplay-bundle-unsigned

              path: |

    @@ -104,7 +105,7 @@ jobs:
  
              ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}

            run: ./gradlew assembleFdroidTchapWithpinningRelease $CI_GRADLE_ARG_PROPERTIES

          - name: Upload apks as artifact

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: elementx-app-fdroid-apks-unsigned

              path: |

.github/workflows/sync-localazy.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -36,7 +36,7 @@ jobs:
  
              ./tools/localazy/importSupportedLocalesFromLocalazy.py

              ./tools/test/generateAllScreenshots.py

          - name: Create Pull Request for Strings

            uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9

            uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0

            with:

              token: ${{ secrets.DANGER_GITHUB_API_TOKEN }}

              commit-message: Sync Strings from Localazy

.github/workflows/sync-sas-strings.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -23,7 +23,7 @@ jobs:
  
          - name: Run SAS String script

            run: ./tools/sas/import_sas_strings.py

          - name: Create Pull Request for SAS Strings

            uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9

            uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0

            with:

              commit-message: Sync SAS Strings

              title: Sync SAS Strings

.github/workflows/tests.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -63,7 +63,7 @@ jobs:
  
          - name: 🚫 Upload kover failed coverage reports

            if: failure()

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: kover-error-report

              path: |

    @@ -75,7 +75,7 @@ jobs:
  
          - name: 🚫 Upload test results on error

            if: failure()

            uses: actions/upload-artifact@v5

            uses: actions/upload-artifact@v6

            with:

              name: tests-and-screenshot-tests-results

              path: |

    @@ -85,7 +85,7 @@ jobs:
  
          # https://github.com/codecov/codecov-action

          - name: ☂️ Upload coverage reports to codecov

            uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1

            uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2

            # Skip in forks

            if: ${{ github.repository == 'element-hq/element-x-android' && ('pull_request' != github.event_name || github.event.pull_request.head.repo.full_name == github.repository) }}

            with:

.idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge Element X 2026.01.1 #116

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!