Skip to content

Commit 73a0ec7

Browse files
bmartybmarty
committed
Merge branch 'release/1.6.30' into main
2 parents 069aa9d + febd9fe commit 73a0ec7

File tree

2,462 files changed

+4967
-4921
lines changed

Some content is hidden

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

2,462 files changed

+4967
-4921
lines changed

‎.idea/copyright/NewVector.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGES.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Changes in Element v1.6.30 (2025-02-04)
2+
=======================================
3+
4+
Dual licensing: AGPL + Element Commercial ([#8990](https://github.com/element-hq/element-android/issues/8990))
5+
6+
Bugfixes 🐛
7+
----------
8+
- Fix incoming call crash on Android 14+. ([#8964](https://github.com/element-hq/element-android/issues/8964))
9+
10+
111
Changes in Element v1.6.28 (2025-01-13)
212
=======================================
313

‎LICENSE-COMMERCIAL

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Licensees holding a valid commercial license with Element may use this
2+
software in accordance with the terms contained in a written agreement
3+
between you and Element.
4+
5+
To purchase a commercial license please contact our sales team at
6+
licensing@element.io

‎README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,14 @@ Issues are triaged by community members and the Android App Team, following the
5656

5757
We use [issue labels](https://github.com/element-hq/element-meta/wiki/Issue-labelling) to sort all incoming issues.
5858

59+
## Copyright and License
60+
61+
Copyright (c) 2018 - 2025 New Vector Ltd
62+
63+
This software is dual licensed by New Vector Ltd (Element). It can be used either:
64+
65+
(1) for free under the terms of the GNU Affero General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
66+
67+
(2) under the terms of a paid-for Element Commercial License agreement between you and Element (the terms of which may vary depending on what you and Element have agreed to).
68+
69+
Unless required by applicable law or agreed to in writing, software distributed under the Licenses is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Licenses for the specific language governing permissions and limitations under the Licenses.

‎dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ ext.libs = [
101101
],
102102
element : [
103103
'opusencoder' : "io.element.android:opusencoder:1.1.0",
104-
'wysiwyg' : "io.element.android:wysiwyg:2.37.4"
104+
'wysiwyg' : "io.element.android:wysiwyg:2.38.2"
105105
],
106106
squareup : [
107107
'moshi' : "com.squareup.moshi:moshi:$moshi",

‎fastlane/metadata/android/en-US/changelogs/40106300.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Main changes in this version: Fix incoming call crash on Android 14+.
2+
Full changelog: https://github.com/element-hq/element-android/releases

‎library/attachment-viewer/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2020-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
apply plugin: 'com.android.library'

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2020-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.attachmentviewer

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2020-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.attachmentviewer

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2020-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.attachmentviewer

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Copyright 2020-2024 New Vector Ltd.
33
* Copyright 2018 stfalcon.com
44
*
5-
* SPDX-License-Identifier: AGPL-3.0-only
6-
* Please see LICENSE in the repository root for full details.
5+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
6+
* Please see LICENSE files in the repository root for full details.
77
*/
88

99
package im.vector.lib.attachmentviewer

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2020-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.attachmentviewer

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2020-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.attachmentviewer

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2020-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.attachmentviewer

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Copyright 2020-2024 New Vector Ltd.
33
* Copyright 2018 stfalcon.com
44
*
5-
* SPDX-License-Identifier: AGPL-3.0-only
6-
* Please see LICENSE in the repository root for full details.
5+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
6+
* Please see LICENSE files in the repository root for full details.
77
*/
88

99
package im.vector.lib.attachmentviewer

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Copyright 2020-2024 New Vector Ltd.
33
* Copyright 2018 stfalcon.com
44
*
5-
* SPDX-License-Identifier: AGPL-3.0-only
6-
* Please see LICENSE in the repository root for full details.
5+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
6+
* Please see LICENSE files in the repository root for full details.
77
*/
88

99
package im.vector.lib.attachmentviewer

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Copyright 2020-2024 New Vector Ltd.
33
* Copyright 2018 stfalcon.com
44
*
5-
* SPDX-License-Identifier: AGPL-3.0-only
6-
* Please see LICENSE in the repository root for full details.
5+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
6+
* Please see LICENSE files in the repository root for full details.
77
*/
88

99
package im.vector.lib.attachmentviewer

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2020-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.attachmentviewer

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2020-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.attachmentviewer

‎library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2020-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.attachmentviewer

‎library/core-utils/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2021-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
plugins {

‎library/core-utils/src/main/java/im/vector/lib/core/utils/compat/Compat.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2022-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.core.utils.compat

‎library/core-utils/src/main/java/im/vector/lib/core/utils/compat/MutableCollectionCompat.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2022-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.core.utils.compat

‎library/core-utils/src/main/java/im/vector/lib/core/utils/epoxy/charsequence/EpoxyCharSequence.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2022-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.core.utils.epoxy.charsequence

‎library/core-utils/src/main/java/im/vector/lib/core/utils/epoxy/charsequence/Extensions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2022-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.core.utils.epoxy.charsequence

‎library/core-utils/src/main/java/im/vector/lib/core/utils/flow/TimingOperators.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2021-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.core.utils.flow

‎library/core-utils/src/main/java/im/vector/lib/core/utils/timer/Clock.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2023, 2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.core.utils.timer

‎library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2020-2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.core.utils.timer

‎library/core-utils/src/main/java/im/vector/lib/core/utils/timer/SpecialRound.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2023, 2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.core.utils.timer

‎library/core-utils/src/test/java/im/vector/lib/core/utils/test/fakes/FakeClock.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2023, 2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.core.utils.test.fakes

‎library/core-utils/src/test/java/im/vector/lib/core/utils/timer/CountUpTimerTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2023, 2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.core.utils.timer

‎library/core-utils/src/test/java/im/vector/lib/core/utils/timer/SpecialRoundTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* Copyright 2023, 2024 New Vector Ltd.
33
*
4-
* SPDX-License-Identifier: AGPL-3.0-only
5-
* Please see LICENSE in the repository root for full details.
4+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
5+
* Please see LICENSE files in the repository root for full details.
66
*/
77

88
package im.vector.lib.core.utils.timer

‎library/external/dialpad/src/main/java/com/android/dialer/animation/AnimUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Copyright 2024 New Vector Ltd.
33
* Copyright 2014 The Android Open Source Project
44
*
5-
* SPDX-License-Identifier: AGPL-3.0-only
6-
* Please see LICENSE in the repository root for full details.
5+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
6+
* Please see LICENSE files in the repository root for full details.
77
*/
88

99
package com.android.dialer.animation;

‎library/external/dialpad/src/main/java/com/android/dialer/compat/PathInterpolatorCompat.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Copyright 2024 New Vector Ltd.
33
* Copyright 2015 The Android Open Source Project
44
*
5-
* SPDX-License-Identifier: AGPL-3.0-only
6-
* Please see LICENSE in the repository root for full details.
5+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
6+
* Please see LICENSE files in the repository root for full details.
77
*/
88

99
package com.android.dialer.compat;

‎library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadKeyButton.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Copyright 2024 New Vector Ltd.
33
* Copyright 2012 The Android Open Source Project
44
*
5-
* SPDX-License-Identifier: AGPL-3.0-only
6-
* Please see LICENSE in the repository root for full details.
5+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
6+
* Please see LICENSE files in the repository root for full details.
77
*/
88

99
package com.android.dialer.dialpadview;

‎library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadTextView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Copyright 2024 New Vector Ltd.
33
* Copyright 2014 The Android Open Source Project
44
*
5-
* SPDX-License-Identifier: AGPL-3.0-only
6-
* Please see LICENSE in the repository root for full details.
5+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
6+
* Please see LICENSE files in the repository root for full details.
77
*/
88

99
package com.android.dialer.dialpadview;

‎library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Copyright 2024 New Vector Ltd.
33
* Copyright 2014 The Android Open Source Project
44
*
5-
* SPDX-License-Identifier: AGPL-3.0-only
6-
* Please see LICENSE in the repository root for full details.
5+
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
6+
* Please see LICENSE files in the repository root for full details.
77
*/
88

99
package com.android.dialer.dialpadview;

0 commit comments

Comments
 (0)