Skip to content

Commit

Permalink
Merge pull request #8990 from element-hq/feature/bma/licenseUpdate
Browse files Browse the repository at this point in the history 
Dual licensing: AGPL + Element Commercial
  • Loading branch information
@bmarty
bmarty authored Jan 14, 2025
2 parents 6fc948d + 5893c70 commit 1620981
Show file tree
Hide file tree
Showing 2,456 changed files with 4,926 additions and 4,909 deletions.
4 changes: 2 additions & 2 deletions .idea/copyright/NewVector.xml
View file

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

6 changes: 6 additions & 0 deletions LICENSE-COMMERCIAL
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Licensees holding a valid commercial license with Element may use this
software in accordance with the terms contained in a written agreement
between you and Element.

To purchase a commercial license please contact our sales team at
[email protected]
11 changes: 11 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,14 @@ Issues are triaged by community members and the Android App Team, following the

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

## Copyright and License

Copyright (c) 2018 - 2025 New Vector Ltd

This software is dual licensed by New Vector Ltd (Element). It can be used either:

(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

(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).

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.
4 changes: 2 additions & 2 deletions library/attachment-viewer/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2020-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

apply plugin: 'com.android.library'
Expand Down
4 changes: 2 additions & 2 deletions ...attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2020-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2020-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions ...ttachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2020-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions ...ttachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Copyright 2020-2024 New Vector Ltd.
* Copyright 2018 stfalcon.com
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2020-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2020-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2020-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Copyright 2020-2024 New Vector Ltd.
* Copyright 2018 stfalcon.com
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions .../attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Copyright 2020-2024 New Vector Ltd.
* Copyright 2018 stfalcon.com
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions ...y/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Copyright 2020-2024 New Vector Ltd.
* Copyright 2018 stfalcon.com
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2020-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2020-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions ...attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2020-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.attachmentviewer
Expand Down
4 changes: 2 additions & 2 deletions library/core-utils/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2021-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

plugins {
Expand Down
4 changes: 2 additions & 2 deletions library/core-utils/src/main/java/im/vector/lib/core/utils/compat/Compat.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2022-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.core.utils.compat
Expand Down
4 changes: 2 additions & 2 deletions library/core-utils/src/main/java/im/vector/lib/core/utils/compat/MutableCollectionCompat.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2022-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.core.utils.compat
Expand Down
4 changes: 2 additions & 2 deletions ...core-utils/src/main/java/im/vector/lib/core/utils/epoxy/charsequence/EpoxyCharSequence.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2022-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.core.utils.epoxy.charsequence
Expand Down
4 changes: 2 additions & 2 deletions library/core-utils/src/main/java/im/vector/lib/core/utils/epoxy/charsequence/Extensions.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2022-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.core.utils.epoxy.charsequence
Expand Down
4 changes: 2 additions & 2 deletions library/core-utils/src/main/java/im/vector/lib/core/utils/flow/TimingOperators.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2021-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.core.utils.flow
Expand Down
4 changes: 2 additions & 2 deletions library/core-utils/src/main/java/im/vector/lib/core/utils/timer/Clock.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2023, 2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.core.utils.timer
Expand Down
4 changes: 2 additions & 2 deletions library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2020-2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.core.utils.timer
Expand Down
4 changes: 2 additions & 2 deletions library/core-utils/src/main/java/im/vector/lib/core/utils/timer/SpecialRound.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2023, 2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.core.utils.timer
Expand Down
4 changes: 2 additions & 2 deletions library/core-utils/src/test/java/im/vector/lib/core/utils/test/fakes/FakeClock.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2023, 2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.core.utils.test.fakes
Expand Down
4 changes: 2 additions & 2 deletions library/core-utils/src/test/java/im/vector/lib/core/utils/timer/CountUpTimerTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2023, 2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.core.utils.timer
Expand Down
4 changes: 2 additions & 2 deletions library/core-utils/src/test/java/im/vector/lib/core/utils/timer/SpecialRoundTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright 2023, 2024 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package im.vector.lib.core.utils.timer
Expand Down
4 changes: 2 additions & 2 deletions library/external/dialpad/src/main/java/com/android/dialer/animation/AnimUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Copyright 2024 New Vector Ltd.
* Copyright 2014 The Android Open Source Project
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package com.android.dialer.animation;
Expand Down
4 changes: 2 additions & 2 deletions library/external/dialpad/src/main/java/com/android/dialer/compat/PathInterpolatorCompat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Copyright 2024 New Vector Ltd.
* Copyright 2015 The Android Open Source Project
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package com.android.dialer.compat;
Expand Down
4 changes: 2 additions & 2 deletions library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadKeyButton.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Copyright 2024 New Vector Ltd.
* Copyright 2012 The Android Open Source Project
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package com.android.dialer.dialpadview;
Expand Down
4 changes: 2 additions & 2 deletions library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadTextView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Copyright 2024 New Vector Ltd.
* Copyright 2014 The Android Open Source Project
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package com.android.dialer.dialpadview;
Expand Down
4 changes: 2 additions & 2 deletions library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Copyright 2024 New Vector Ltd.
* Copyright 2014 The Android Open Source Project
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package com.android.dialer.dialpadview;
Expand Down
4 changes: 2 additions & 2 deletions library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DigitsEditText.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Copyright 2024 New Vector Ltd.
* Copyright 2011 The Android Open Source Project
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package com.android.dialer.dialpadview;
Expand Down
4 changes: 2 additions & 2 deletions library/external/dialpad/src/main/java/com/android/dialer/util/ViewUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Copyright 2024 New Vector Ltd.
* Copyright 2012 The Android Open Source Project
*
* SPDX-License-Identifier: AGPL-3.0-only
* Please see LICENSE in the repository root for full details.
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/

package com.android.dialer.util;
Expand Down
Loading

0 comments on commit 1620981

Please sign in to comment.