Skip to content
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

Rebase against Element Android v1.6.32 #1150

Merged
merged 66 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
2fb4439
Merge branch 'origin/develop' into Weblate.
weblate Jan 13, 2025
3e67489
Translated using Weblate (Hungarian)
bmarty Jan 13, 2025
71e8ab9
Translated using Weblate (Georgian)
bmarty Jan 13, 2025
06f23c8
Merge branch 'origin/develop' into Weblate.
weblate Jan 13, 2025
2bee087
Merge branch 'origin/develop' into Weblate.
weblate Jan 13, 2025
8b61707
Merge branch 'origin/develop' into Weblate.
weblate Jan 13, 2025
f9c6b60
Merge branch 'origin/develop' into Weblate.
weblate Jan 13, 2025
b670708
Translated using Weblate (Persian)
danialbehzadi Jan 13, 2025
0eddea4
Translated using Weblate (Persian)
danialbehzadi Jan 13, 2025
2f1b849
Translated using Weblate (Albanian)
ujdhesa Jan 13, 2025
f3af34d
Translated using Weblate (Albanian)
ujdhesa Jan 13, 2025
fb92511
Translated using Weblate (Chinese (Traditional))
s8321414 Jan 13, 2025
87ad09c
Translated using Weblate (Chinese (Traditional))
s8321414 Jan 13, 2025
a86780e
Translated using Weblate (French)
Glandos Jan 14, 2025
d59275f
Translated using Weblate (Estonian)
Jan 14, 2025
4ef8b2f
Translated using Weblate (Estonian)
Jan 14, 2025
c9528d8
Translated using Weblate (Indonesian)
Linerly Jan 14, 2025
f50b445
Translated using Weblate (Indonesian)
Linerly Jan 14, 2025
e8d6aea
Merge branch 'origin/develop' into Weblate.
weblate Jan 14, 2025
6059961
Translated using Weblate (Portuguese (Brazil))
mike22664 Jan 16, 2025
df40889
Translated using Weblate (Ukrainian)
IhorHordiichuk Jan 16, 2025
8ef6181
Translated using Weblate (Slovak)
mike22664 Jan 16, 2025
bb24b16
Translated using Weblate (Ukrainian)
IhorHordiichuk Jan 16, 2025
9b5f4a7
Merge branch 'origin/develop' into Weblate.
weblate Jan 17, 2025
a16544f
Translated using Weblate (Swedish)
LinAGKar Jan 21, 2025
e1530b0
Translated using Weblate (Swedish)
LinAGKar Jan 21, 2025
32d9d75
Translated using Weblate (Spanish)
mike22664 Jan 22, 2025
26b604c
Translated using Weblate (Slovak)
mike22664 Jan 22, 2025
15b5183
Translated using Weblate (Slovak)
dodog Jan 22, 2025
b0acd59
Translated using Weblate (Slovak)
dodog Jan 22, 2025
aada1a1
Translated using Weblate (Czech)
waclaw66 Jan 24, 2025
439200f
Translated using Weblate (Czech)
waclaw66 Jan 24, 2025
b250ad4
Merge branch 'origin/develop' into Weblate.
weblate Jan 24, 2025
3e61abb
Translated using Weblate (Chinese (Simplified))
lilydjwg Feb 1, 2025
c2d7c88
Translated using Weblate (Chinese (Simplified))
S3608362402 Feb 3, 2025
e714687
Merge tag 'v1.6.30' into develop
bmarty Feb 4, 2025
0321e93
version++
bmarty Feb 4, 2025
a861b77
Upgrade github action from v3 to v4
bmarty Feb 4, 2025
4a43097
Upgrade github action from v3 to v4
bmarty Feb 4, 2025
7b2c142
Merge branch 'origin/develop' into Weblate.
weblate Feb 5, 2025
3d2d08c
Translated using Weblate (Estonian)
Feb 5, 2025
5a12b0b
Merge tag 'v1.6.30' into rebase/element-android-1.6.30
yostyle Feb 5, 2025
dd40f32
fix conflicts
yostyle Feb 5, 2025
39a4bc2
Translated using Weblate (Slovak)
dodog Feb 5, 2025
4eee9c0
Translated using Weblate (Persian)
danialbehzadi Feb 5, 2025
5ffee06
Translated using Weblate (Indonesian)
Linerly Feb 6, 2025
11aa64e
Translated using Weblate (French)
Glandos Feb 6, 2025
753101f
Add action to report room. #8998
bmarty Feb 7, 2025
b204d27
Add action to report room: use the report Room API.
bmarty Feb 7, 2025
4b2ebce
Translated using Weblate (Ukrainian)
IhorHordiichuk Feb 9, 2025
705d9b2
Translated using Weblate (Czech)
waclaw66 Feb 10, 2025
b1f4db5
Translated using Weblate (Swedish)
LinAGKar Feb 14, 2025
3c3eb49
Merge pull request #9000 from element-hq/feature/bma/reportRoom
bmarty Feb 17, 2025
10d1dbf
Merge branch 'origin/develop' into Weblate.
weblate Feb 17, 2025
8bcb9a5
Translated using Weblate (Estonian)
Feb 17, 2025
b96899f
Translated using Weblate (Persian)
danialbehzadi Feb 17, 2025
bb4ea45
Translated using Weblate (Albanian)
ujdhesa Feb 17, 2025
5c8e9bb
Translated using Weblate (Chinese (Traditional))
s8321414 Feb 18, 2025
12bc03c
Translated using Weblate (Chinese (Traditional))
s8321414 Feb 18, 2025
3a14792
Translated using Weblate (Portuguese (Brazil))
bmarty Feb 18, 2025
882a275
Merge pull request #9007 from RiotTranslateBot/weblate-element-androi…
bmarty Feb 18, 2025
021881e
Changelog for version 1.6.32
bmarty Feb 18, 2025
88ab879
Adding fastlane file for version 1.6.32
bmarty Feb 18, 2025
f0699b0
Merge branch 'release/1.6.32' into main
bmarty Feb 18, 2025
12541c9
Merge tag 'v1.6.32' into rebase/element-android-1.6.32
yostyle Feb 19, 2025
68e057d
Merge branch 'develop' into rebase/element-android-1.6.32
yostyle Feb 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ jobs:
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
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
- name: Assemble ${{ matrix.target }} debug apk
run: ./gradlew assemble${{ matrix.target }}Debug $CI_GRADLE_ARG_PROPERTIES
- name: Upload ${{ matrix.target }} debug APKs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.target }}-debug
path: |
Expand All @@ -69,19 +69,19 @@ jobs:
# 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
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
- name: Assemble ${{ matrix.target }} unsigned apk
run: ./gradlew clean assemble${{ matrix.target }}Release $CI_GRADLE_ARG_PROPERTIES
- name: Upload ${{ matrix.target }} unsigned APKs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.target }}-release-unsigned
path: |
Expand All @@ -97,7 +97,7 @@ jobs:
steps:
- name: Obtain apk from artifact
id: download
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.TARGET_NAME }}-release-unsigned
- name: Show apks in artifact
Expand All @@ -112,7 +112,7 @@ jobs:
# Don't fail when finding trackers so they can be reported later
args: /github/workspace/${{ env.TARGET_FOLDER }}/release/${{ steps.list-apks.outputs.FIRST_APK_NAME }} -j -o /github/workspace/exodus.json -e 0
- name: Upload exodus json report
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: exodus.json
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: 3.8
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/post-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: 3.8
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
- name: Start synapse server
uses: michaelkaye/[email protected].4
uses: michaelkaye/[email protected].5
with:
uploadLogs: true
httpPort: 8080
Expand All @@ -79,7 +79,7 @@ jobs:
adb logcat >> emulator.log &
./gradlew $CI_GRADLE_ARG_PROPERTIES connectedGplayRustCryptoDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || (adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1 )
- name: Upload Test Report Log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: uitest-error-results
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:
Expand All @@ -54,11 +54,11 @@ jobs:
app_id: ${{ secrets.APP_ID_DANGERBOT }}
private_key: ${{ secrets.APP_PEM_DANGERBOT }}
- uses: actions/checkout@v4
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:
Expand All @@ -77,7 +77,7 @@ jobs:
./gradlew vector-app:lintFdroidBtchapWithdmvoipWithoutpinningRelease $CI_GRADLE_ARG_PROPERTIES
- name: Upload reports
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linting-report
path: |
Expand Down Expand Up @@ -107,11 +107,11 @@ jobs:
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:
Expand All @@ -120,7 +120,7 @@ jobs:
run: ./gradlew dependencyCheckAnalyze $CI_GRADLE_ARG_PROPERTIES
- name: Upload dependency analysis
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dependency-analysis
path: build/reports/dependency-check-report.html
6 changes: 3 additions & 3 deletions .github/workflows/tests-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-rust-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-rust-{0}', github.sha) || format('unit-tests-rust-{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
- uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '11'
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
### # ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES

- name: Upload Rust Integration Test Report Log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: integration-test-rust-error-results
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ jobs:
with:
lfs: true
fetch-depth: 0
- name: Use JDK 17
- name: Use JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
- name: Configure gradle
uses: gradle/actions/setup-gradle@v3
with:
Expand All @@ -46,7 +46,7 @@ jobs:

#- name: Archive Screenshot Results on Error
# if: failure()
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: screenshot-results
# path: |
Expand All @@ -56,7 +56,7 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: 3.8
- uses: michaelkaye/[email protected].4
- uses: michaelkaye/[email protected].5
with:
uploadLogs: true
httpPort: 8080
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
### ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES

- name: Upload Integration Test Report Log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: integration-test-error-results
Expand Down Expand Up @@ -140,11 +140,11 @@ jobs:
# cancel-in-progress: true
# steps:
# - uses: actions/checkout@v4
# - name: Use JDK 17
# - name: Use JDK 21
# uses: actions/setup-java@v4
# with:
# distribution: 'temurin' # See 'Supported distributions' for available options
# java-version: '17'
# java-version: '21'
# - name: Configure gradle
# uses: gradle/actions/setup-gradle@v3
# with:
Expand Down
4 changes: 2 additions & 2 deletions .idea/copyright/NewVector.xml

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

61 changes: 60 additions & 1 deletion ELEMENT_CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,62 @@
Changes in Element v1.6.32 (2025-02-18)
=======================================

Other changes
-------------
- Add action to report room. ([#8998](https://github.com/element-hq/element-android/issues/8998))


Changes in Element v1.6.30 (2025-02-04)
=======================================

Dual licensing: AGPL + Element Commercial ([#8990](https://github.com/element-hq/element-android/issues/8990))

Bugfixes 🐛
----------
- Fix incoming call crash on Android 14+. ([#8964](https://github.com/element-hq/element-android/issues/8964))


Changes in Element v1.6.28 (2025-01-13)
=======================================

- Start sunsetting the application: prevent creation of new accounts on server with MAS support, and redirect users to Element X. ([#8983](https://github.com/element-hq/element-android/pull/8983))
- Sync strings. ([#8986](https://github.com/element-hq/element-android/pull/8986))


Changes in Element v1.6.26 (2024-12-20)
=======================================

Other changes
-------------
- Bump org.matrix.rustcomponents:crypto-android from 0.5.0 to 0.6.0 based on matrix-sdk-crypto-0.9.0 ([#8960](https://github.com/element-hq/element-android/issues/8960))


Changes in Element v1.6.24 (2024-11-19)
=======================================

Bugfixes 🐛
----------
- Extended file name support to include characters from multiple languages, including Cyrillic and Han scripts. ([#6449](https://github.com/element-hq/element-android/issues/6449)) ([#6449](https://github.com/element-hq/element-android/issues/6449))
- Intercept mobile.element.io links with Element app ([#8904](https://github.com/element-hq/element-android/issues/8904))
- Show a notice when a previously verified user is not anymore ([#8933](https://github.com/element-hq/element-android/issues/8933))

Other changes
-------------
- Indicate when calls are unsupported in the timeline/notifications ([#8938](https://github.com/element-hq/element-android/issues/8938))


Changes in Element v1.6.22 (2024-09-23)
=======================================

Important: this version removes the dependency of the deprecated libolm library.
Application installations that have not been updated to the first version with the migration (v1.6.0 released at 2023-05-17) will not be able to migrate the account.
More details in ([#8901](https://github.com/element-hq/element-android/issues/8901))

Other changes
-------------
- Remove legacy QR code login. ([#8889](https://github.com/element-hq/element-android/issues/8889))


Changes in Element v1.6.20 (2024-07-25)
=======================================

Expand All @@ -13,7 +72,7 @@ Bugfixes 🐛
----------
- Fix redacted events not grouped correctly when hidden events are inserted between. ([#8840](https://github.com/element-hq/element-android/issues/8840))
- Element-Android session doesn't encrypt for a dehydrated device ([#8842](https://github.com/element-hq/element-android/issues/8842))
- Intercept only links from `element.io` well known hosts. The previous behaviour broke OIDC login in Element X. ([#8894](https://github.com/element-hq/element-android/issues/8894))
- Intercept only links from `element.io` well known hosts. The previous behaviour broke OIDC login in Element X. ([#8849](https://github.com/element-hq/element-android/issues/8849))

Other changes
-------------
Expand Down
8 changes: 3 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,7 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.9)
strscan
rexml (3.3.9)
rouge (2.0.7)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
Expand All @@ -224,7 +223,6 @@ GEM
simctl (1.6.10)
CFPropertyList
naturally
strscan (3.1.0)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand All @@ -239,13 +237,13 @@ GEM
unf_ext (0.0.9.1)
unicode-display_width (2.5.0)
word_wrap (1.0.0)
xcodeproj (1.24.0)
xcodeproj (1.25.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
rexml (>= 3.3.6, < 4.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
Expand Down
Loading
Loading