Skip to content

Commit 9507ae3

Browse files
bmartybmarty
committed
Merge branch 'release/25.11.2' into main
2 parents c05eeb9 + f28e4ca commit 9507ae3

File tree

1,157 files changed

+9481
-7127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,157 files changed

+9481
-7127
lines changed

‎.editorconfig‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ ktlint_standard_annotation = disabled
2626
ktlint_standard_parameter-list-wrapping = disabled
2727
ktlint_standard_indent = disabled
2828
ktlint_standard_blank-line-before-declaration = disabled
29-
ktlint_function_naming_ignore_when_annotated_with=Composable
29+
ktlint_function_naming_ignore_when_annotated_with = Composable
30+
# Added when upgrading to 1.7.1
31+
ktlint_standard_function-expression-body = disabled
32+
ktlint_standard_chain-method-continuation = disabled
33+
ktlint_standard_class-signature = disabled
3034

3135
[*.java]
3236
ij_java_align_consecutive_assignments = false

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ jobs:
5353
run: ./gradlew :app:assembleGplayDebug app:assembleFDroidDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
5454
- name: Upload debug APKs
5555
if: ${{ matrix.variant == 'debug' }}
56-
uses: actions/upload-artifact@v4
56+
uses: actions/upload-artifact@v5
5757
with:
5858
name: elementx-debug
5959
path: |
6060
app/build/outputs/apk/gplay/debug/*-universal-debug.apk
6161
app/build/outputs/apk/fdroid/debug/*-universal-debug.apk
6262
- name: Upload x86_64 APK for Maestro
6363
if: ${{ matrix.variant == 'debug' }}
64-
uses: actions/upload-artifact@v4
64+
uses: actions/upload-artifact@v5
6565
with:
6666
name: elementx-apk-maestro
6767
path: |

‎.github/workflows/build_enterprise.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
run: ./gradlew :app:assembleGplayDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
6262
- name: Upload debug Enterprise APKs
6363
if: ${{ matrix.variant == 'debug' }}
64-
uses: actions/upload-artifact@v4
64+
uses: actions/upload-artifact@v5
6565
with:
6666
name: elementx-enterprise-debug
6767
path: |

‎.github/workflows/danger.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- run: |
2121
npm install --save-dev @babel/plugin-transform-flow-strip-types
2222
- name: Danger
23-
uses: danger/danger-js@bdccecb77e0144055fbaea9224f10cf8b1229b68 # 13.0.4
23+
uses: danger/danger-js@67ed2c1f42fd2fc198cc3c14b43c8f83351f4fe9 # 13.0.5
2424
with:
2525
args: "--dangerfile ./tools/danger/dangerfile.js"
2626
env:

‎.github/workflows/maestro-local.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
4545
ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
4646
- name: Upload APK as artifact
47-
uses: actions/upload-artifact@v4
47+
uses: actions/upload-artifact@v5
4848
with:
4949
name: elementx-apk-maestro
5050
path: |
@@ -69,7 +69,7 @@ jobs:
6969
# https://github.com/actions/checkout/issues/881
7070
ref: ${{ github.ref }}
7171
- name: Download APK artifact from previous job
72-
uses: actions/download-artifact@v5
72+
uses: actions/download-artifact@v6
7373
with:
7474
name: elementx-apk-maestro
7575
- name: Enable KVM group perms
@@ -102,7 +102,7 @@ jobs:
102102
script: |
103103
.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh app-gplay-x86_64-debug.apk
104104
- name: Upload test results
105-
uses: actions/upload-artifact@v4
105+
uses: actions/upload-artifact@v5
106106
with:
107107
name: test-results
108108
path: |

‎.github/workflows/nightlyReports.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- name: ✅ Upload kover report
4444
if: always()
45-
uses: actions/upload-artifact@v4
45+
uses: actions/upload-artifact@v5
4646
with:
4747
name: kover-results
4848
path: |
@@ -74,7 +74,7 @@ jobs:
7474
run: ./gradlew dependencyCheckAnalyze $CI_GRADLE_ARG_PROPERTIES
7575
- name: Upload dependency analysis
7676
if: always()
77-
uses: actions/upload-artifact@v4
77+
uses: actions/upload-artifact@v5
7878
with:
7979
name: dependency-analysis
8080
path: build/reports/dependency-check-report.html

‎.github/workflows/quality.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
run: ./gradlew :tests:konsist:testDebugUnitTest $CI_GRADLE_ARG_PROPERTIES --no-daemon
9898
- name: Upload reports
9999
if: always()
100-
uses: actions/upload-artifact@v4
100+
uses: actions/upload-artifact@v5
101101
with:
102102
name: konsist-report
103103
path: |
@@ -174,7 +174,7 @@ jobs:
174174
run: ./gradlew :app:lintGplayDebug :app:lintFdroidDebug lintDebug $CI_GRADLE_ARG_PROPERTIES --continue
175175
- name: Upload reports
176176
if: always()
177-
uses: actions/upload-artifact@v4
177+
uses: actions/upload-artifact@v5
178178
with:
179179
name: linting-report
180180
path: |
@@ -214,7 +214,7 @@ jobs:
214214
run: ./gradlew detekt $CI_GRADLE_ARG_PROPERTIES --no-daemon
215215
- name: Upload reports
216216
if: always()
217-
uses: actions/upload-artifact@v4
217+
uses: actions/upload-artifact@v5
218218
with:
219219
name: detekt-report
220220
path: |
@@ -254,7 +254,7 @@ jobs:
254254
run: ./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES
255255
- name: Upload reports
256256
if: always()
257-
uses: actions/upload-artifact@v4
257+
uses: actions/upload-artifact@v5
258258
with:
259259
name: ktlint-report
260260
path: |
@@ -317,7 +317,7 @@ jobs:
317317
# https://github.com/actions/checkout/issues/881
318318
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
319319
- name: Download reports from previous jobs
320-
uses: actions/download-artifact@v5
320+
uses: actions/download-artifact@v6
321321
- name: Prepare Danger
322322
if: always()
323323
run: |
@@ -326,7 +326,7 @@ jobs:
326326
yarn add danger-plugin-lint-report --dev
327327
- name: Danger lint
328328
if: always()
329-
uses: danger/danger-js@bdccecb77e0144055fbaea9224f10cf8b1229b68 # 13.0.4
329+
uses: danger/danger-js@67ed2c1f42fd2fc198cc3c14b43c8f83351f4fe9 # 13.0.5
330330
with:
331331
args: "--dangerfile ./tools/danger/dangerfile-lint.js"
332332
env:

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
ELEMENT_CALL_RAGESHAKE_URL: ${{ secrets.ELEMENT_CALL_RAGESHAKE_URL }}
3939
run: ./gradlew bundleGplayRelease $CI_GRADLE_ARG_PROPERTIES
4040
- name: Upload bundle as artifact
41-
uses: actions/upload-artifact@v4
41+
uses: actions/upload-artifact@v5
4242
with:
4343
name: elementx-app-gplay-bundle-unsigned
4444
path: |
@@ -74,7 +74,7 @@ jobs:
7474
ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
7575
run: ./gradlew bundleGplayRelease $CI_GRADLE_ARG_PROPERTIES
7676
- name: Upload bundle as artifact
77-
uses: actions/upload-artifact@v4
77+
uses: actions/upload-artifact@v5
7878
with:
7979
name: elementx-enterprise-app-gplay-bundle-unsigned
8080
path: |
@@ -102,7 +102,7 @@ jobs:
102102
ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
103103
run: ./gradlew assembleFdroidRelease $CI_GRADLE_ARG_PROPERTIES
104104
- name: Upload apks as artifact
105-
uses: actions/upload-artifact@v4
105+
uses: actions/upload-artifact@v5
106106
with:
107107
name: elementx-app-fdroid-apks-unsigned
108108
path: |

‎.github/workflows/tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161

6262
- name: 🚫 Upload kover failed coverage reports
6363
if: failure()
64-
uses: actions/upload-artifact@v4
64+
uses: actions/upload-artifact@v5
6565
with:
6666
name: kover-error-report
6767
path: |
@@ -73,7 +73,7 @@ jobs:
7373

7474
- name: 🚫 Upload test results on error
7575
if: failure()
76-
uses: actions/upload-artifact@v4
76+
uses: actions/upload-artifact@v5
7777
with:
7878
name: tests-and-screenshot-tests-results
7979
path: |

‎CHANGES.md‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,72 @@
1+
Changes in Element X v25.11.0
2+
=============================
3+
4+
Hotfix release.
5+
6+
Includes https://github.com/element-hq/element-x-android/pull/5615, which fixes an issue that prevented Element Call notifications from being displayed sometimes.
7+
8+
**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.10.1...v25.11.0
9+
10+
Changes in Element X v25.10.1
11+
=============================
12+
13+
<!-- Release notes generated using configuration in .github/release.yml at v25.10.1 -->
14+
15+
## What's Changed
16+
### ✨ Features
17+
* Sync notifications using WorkManager by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5545
18+
### 🙌 Improvements
19+
* Sort feature flags by @bmarty in https://github.com/element-hq/element-x-android/pull/5557
20+
### 🐛 Bugfixes
21+
* Makes sure images are loaded when cancelling multiaccount flow by @ganfra in https://github.com/element-hq/element-x-android/pull/5502
22+
* Fix 'test push loop back' notification check by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5541
23+
* Display 'join anyway' button on room preview when the state can't be loaded by @ShadowRZ in https://github.com/element-hq/element-x-android/pull/5514
24+
* Fix media viewer not being dismissed with reduced motion enabled by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5555
25+
* Keep the cursor position in room list search when going back by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5570
26+
* Make sure declining a call stops observing the ringing call state by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5563
27+
### 🗣 Translations
28+
* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5515
29+
* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5562
30+
### 🧱 Build
31+
* Do some cleanup on our immutable annotation usage by @bmarty in https://github.com/element-hq/element-x-android/pull/5503
32+
* `interface TestParameterValuesProvider` is deprecated. by @bmarty in https://github.com/element-hq/element-x-android/pull/5568
33+
### Dependency upgrades
34+
* fix(deps): update metro to v0.6.9 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5480
35+
* fix(deps): update dependency org.unifiedpush.android:connector to v3.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5443
36+
* fix(deps): update wysiwyg to v2.40.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5400
37+
* fix(deps): update dependency io.github.sergio-sastre.composablepreviewscanner:android to v0.7.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5510
38+
* fix(deps): update camera to v1.5.1 - autoclosed by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5509
39+
* chore(deps): update plugin dependencycheck to v12.1.7 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5518
40+
* chore(deps): update plugin licensee to v1.14.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5477
41+
* chore(deps): update dependency python to 3.14 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5475
42+
* fix(deps): update metro to v0.6.10 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5520
43+
* fix(deps): update dependency org.unifiedpush.android:connector to v3.1.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5519
44+
* chore(deps): update plugin gms_google_services to v4.4.4 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5507
45+
* fix(deps): update dependency com.google.firebase:firebase-bom to v34.4.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5522
46+
* fix(deps): update dependency com.squareup.okhttp3:okhttp-bom to v5.2.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5524
47+
* fix(deps): update dependency net.zetetic:sqlcipher-android to v4.11.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5525
48+
* fix(deps): update dependencyanalysis to v3.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5523
49+
* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.10.13 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5527
50+
* chore(deps): update plugin dependencycheck to v12.1.8 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5531
51+
* chore(deps): update rnkdsh/action-upload-diawi action to v1.5.12 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5533
52+
* fix(deps): update dependency org.maplibre.gl:android-sdk to v12.0.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5548
53+
* fix(deps): update metro to v0.7.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5554
54+
* fix(deps): update dependency com.posthog:posthog-android to v3.24.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5564
55+
* chore(deps): update plugin sonarqube to v7 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5535
56+
### Others
57+
* Import Compound tokens - fixed icons by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5506
58+
* Replace Uri by String in States that are used in Composable function. by @bmarty in https://github.com/element-hq/element-x-android/pull/5508
59+
* Let room filters follow the design. by @bmarty in https://github.com/element-hq/element-x-android/pull/5526
60+
* Allow uploading notification push rules in bug reports by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5538
61+
* Add number of accounts info in the rageshake data. by @bmarty in https://github.com/element-hq/element-x-android/pull/5532
62+
* design(space): match figma for Space views by @ganfra in https://github.com/element-hq/element-x-android/pull/5540
63+
* Extract console message logger and mutualize instance of Json by @bmarty in https://github.com/element-hq/element-x-android/pull/5552
64+
* Improve colors customization by @bmarty in https://github.com/element-hq/element-x-android/pull/5542
65+
* Fix test warning by @bmarty in https://github.com/element-hq/element-x-android/pull/5558
66+
67+
68+
**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.10.0...v25.10.1
69+
170
Changes in Element X v25.10.0
271
=============================
372

0 commit comments

Comments
 (0)