Skip to content

Commit

Permalink
Merge tag 'v1.6.30' into rebase/element-android-1.6.30
Browse files Browse the repository at this point in the history
tag
  • Loading branch information
yostyle committed Feb 20, 2025
2 parents 8d4a328 + 73a0ec7 commit ec28017
Show file tree
Hide file tree
Showing 2,994 changed files with 38,397 additions and 40,594 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ 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:
Expand Down Expand Up @@ -69,11 +69,11 @@ 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:
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
6 changes: 3 additions & 3 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 Down
12 changes: 6 additions & 6 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 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 Down
10 changes: 5 additions & 5 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 @@ -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 @@ -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.

53 changes: 52 additions & 1 deletion ELEMENT_CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,54 @@
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 +64,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

0 comments on commit ec28017

Please sign in to comment.