Merge remote-tracking branch 'origin/master' into dev

2024-12-22 00:34:31 +03:00 · 2024-05-01 02:33:23 +02:00 · 2024-05-01 02:33:23 +02:00 · f2990b2a44
commit f2990b2a44
parent 9baee41ff7 a4f01de80e
1250 changed files with 1278 additions and 1256 deletions
--- a/.codecov.yml
+++ b/.codecov.yml
@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 codecov:
  branch: master
  ci:
--- a/.devcontainer/Dockerfile.license
+++ b/.devcontainer/Dockerfile.license
@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
-SPDX-License-Identifier: AGPL-3.0-or-later
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@ -1,6 +1,6 @@
 <!--
 ~ SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
- ~ SPDX-License-Identifier: AGPL-3.0-or-later
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
 # Instructions

--- a/.devcontainer/devcontainer.env.license
+++ b/.devcontainer/devcontainer.env.license
@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
-SPDX-License-Identifier: AGPL-3.0-or-later
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
--- a/.devcontainer/devcontainer.json.license
+++ b/.devcontainer/devcontainer.json.license
@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
-SPDX-License-Identifier: AGPL-3.0-or-later
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
--- a/.drone.yml
+++ b/.drone.yml
@ -4,7 +4,7 @@ type: docker
 name: tests-stable

 # SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only


 steps:
--- a/.editorconfig
+++ b/.editorconfig
@ -3,7 +3,7 @@
 # see http://EditorConfig.org

 # SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

 # This is the file in the root of the project.
 # For sub folders you can have other files that override only some settings.
--- a/.github/.config.yml.license
+++ b/.github/.config.yml.license
@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH and Nextcloud contributors
-SPDX-License-Identifier: AGPL-3.0-or-later
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 # You can add one username per supported platform and one custom link
 custom: https://nextcloud.com/include/
--- a/.github/ISSUE_TEMPLATE/bug_report.yml.license
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml.license
@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
-SPDX-License-Identifier: AGPL-3.0-or-later
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
--- a/.github/ISSUE_TEMPLATE/config.yml.license
+++ b/.github/ISSUE_TEMPLATE/config.yml.license
@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
-SPDX-License-Identifier: AGPL-3.0-or-later
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
--- a/.github/ISSUE_TEMPLATE/feature_request.md.license
+++ b/.github/ISSUE_TEMPLATE/feature_request.md.license
@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
-SPDX-License-Identifier: AGPL-3.0-or-later
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
--- a/.github/pull_request_template.md.license
+++ b/.github/pull_request_template.md.license
@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
 SPDX-FileCopyrightText: 2023 Marcel Hibbe <dev@mhibbe.de>
-SPDX-License-Identifier: AGPL-3.0-or-later
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
--- a/.github/workflows/assembleFlavors.yml
+++ b/.github/workflows/assembleFlavors.yml
@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

 name: "Assemble"

--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

 name: Check

--- a/.github/workflows/command-rebase.yml
+++ b/.github/workflows/command-rebase.yml
@ -4,7 +4,7 @@
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization

 # SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

 name: Rebase command

--- a/.github/workflows/detectWrongSettings.yml
+++ b/.github/workflows/detectWrongSettings.yml
@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-FileCopyrightText: 2023 Tobias Kaminsky <tobias@kaminsky.me>
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

 name: "Detect wrong settings"

--- a/.github/workflows/qa.yml
+++ b/.github/workflows/qa.yml
@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

 name: "QA"

--- a/.github/workflows/screenShotTest.yml
+++ b/.github/workflows/screenShotTest.yml
@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

 name: "Screenshot Test"

--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

 name: Unit tests

--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 # built application files
 *.apk
 *.ap_
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@ -1,6 +1,6 @@
 version: 2
 # SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 # General settings to apply
 always_pending:
  title_regex: '(WIP|wip)'
--- a/.tx/config.license
+++ b/.tx/config.license
@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
 SPDX-FileCopyrightText: 2012 Bartosz Przybylski <bart.p.pl@gmail.com>
-SPDX-License-Identifier: AGPL-3.0-or-later
+SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,7 +1,7 @@
 <!--
 ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
 ~ SPDX-FileCopyrightText: 2016-2024 Tobias Kaminsky <tobias@kaminsky.me>
- ~ SPDX-License-Identifier: AGPL-3.0-or-later
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->

 ## 3.29.0 (April 24, 2024)
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -1,6 +1,6 @@
 <!--
 ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- ~ SPDX-License-Identifier: AGPL-3.0-or-later
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
 In the Nextcloud community, participants from all over the world come together to create Free Software for a free internet. This is made possible by the support, hard work and enthusiasm of thousands of people, including those who create and use Nextcloud software.

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,6 +1,6 @@
 <!--
 ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- ~ SPDX-License-Identifier: AGPL-3.0-or-later
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
 # [Nextcloud](https://nextcloud.com) Android app

@ -191,7 +191,7 @@ Source code of app:
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2024 Your Name <your@email.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 ```
 
@ -201,7 +201,7 @@ Source code of app:
  ~ Nextcloud Talk - Android Client
  ~ 
  ~ SPDX-FileCopyrightText: 2024 Your name <your@email.com>
-  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
 ```

--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 <!--
 ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- ~ SPDX-License-Identifier: AGPL-3.0-or-later
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
 # [Nextcloud](https://nextcloud.com) Android app :iphone:

--- a/SECURITY.md
+++ b/SECURITY.md
@ -1,6 +1,6 @@
 <!--
 ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- ~ SPDX-License-Identifier: AGPL-3.0-or-later
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
 # Security Policy

--- a/SETUP.md
+++ b/SETUP.md
@ -1,6 +1,6 @@
 <!--
 ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- ~ SPDX-License-Identifier: AGPL-3.0-or-later
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
 These instructions will help you to set up your development environment, get the source code of the Nextcloud for Android app and build it by yourself. If you want to help developing the app take a look to the [contribution guidelines][0].

--- a/app/.gitignore
+++ b/app/.gitignore
@ -1,3 +1,3 @@
 # SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 /build
--- a/app/build.gradle
+++ b/app/build.gradle
@ -6,7 +6,7 @@
 * SPDX-FileCopyrightText: 2024 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2024 Andy Scherzinger <info@andy-scherzinger.de>
 * SPDX-FileCopyrightText: 2022 Álvaro Brey Vilas <alvaro@alvarobrey.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 import com.github.spotbugs.snom.Confidence
 import com.github.spotbugs.snom.Effort
@ -98,6 +98,9 @@ android {
    namespace 'com.owncloud.android'
    testNamespace "${namespace}.test"

+    androidResources {
+        generateLocaleConfig = true
+    }

    defaultConfig {
        minSdkVersion 24
--- a/app/detekt.yml
+++ b/app/detekt.yml
@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 build:
  maxIssues: 2
  weights:
--- a/app/lint.xml
+++ b/app/lint.xml
@ -6,7 +6,7 @@
  ~ SPDX-FileCopyrightText: 2022 Andy Scherzinger <info@andy-scherzinger.de>
  ~ SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
  ~ SPDX-FileCopyrightText: 2022 Tobias Kaminsky <tobias@kaminsky.me>
-  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
 <lint>
    <issue id="UnusedAttribute">
--- a/app/src/androidTest/AndroidManifest.xml
+++ b/app/src/androidTest/AndroidManifest.xml
@ -4,7 +4,7 @@
  ~
  ~ SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH and Nextcloud contributors
  ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
-  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
  ~
  ~ UI Automator requires Android 4.3 (API level 18) or higher.
  ~ So this AndroidManifest will be merged with the normal one (not requiring to change the minSdk)
--- a/app/src/androidTest/disabledTests/uiautomator/InitialTest.java
+++ b/app/src/androidTest/disabledTests/uiautomator/InitialTest.java
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2018 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2015 ownCloud Inc.
- * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
+ * SPDX-License-Identifier: GPL-2.0-only AND (AGPL-3.0-or-later OR GPL-2.0-only)
 */
 package com.owncloud.android.uiautomator;

--- a/app/src/androidTest/java/com/nextcloud/client/ActivitiesActivityIT.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/ActivitiesActivityIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client

--- a/app/src/androidTest/java/com/nextcloud/client/AuthenticatorActivityIT.java
+++ b/app/src/androidTest/java/com/nextcloud/client/AuthenticatorActivityIT.java
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2021 Andy Scherzinger <info@andy-scherzinger.de>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client;

--- a/app/src/androidTest/java/com/nextcloud/client/CommunityActivityIT.java
+++ b/app/src/androidTest/java/com/nextcloud/client/CommunityActivityIT.java
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client;

--- a/app/src/androidTest/java/com/nextcloud/client/EndToEndAction.java
+++ b/app/src/androidTest/java/com/nextcloud/client/EndToEndAction.java
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2023 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client;

--- a/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client

--- a/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client

--- a/app/src/androidTest/java/com/nextcloud/client/FirstRunActivityIT.java
+++ b/app/src/androidTest/java/com/nextcloud/client/FirstRunActivityIT.java
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client;

--- a/app/src/androidTest/java/com/nextcloud/client/SettingsActivityIT.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/SettingsActivityIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client

--- a/app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java
+++ b/app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client;

--- a/app/src/androidTest/java/com/nextcloud/client/TestRunner.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/TestRunner.kt
@ -4,7 +4,7 @@
 * SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
 * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH
 * SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client

--- a/app/src/androidTest/java/com/nextcloud/client/UploadListActivityActivityIT.java
+++ b/app/src/androidTest/java/com/nextcloud/client/UploadListActivityActivityIT.java
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client;

--- a/app/src/androidTest/java/com/nextcloud/client/account/AnonymousUserTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/account/AnonymousUserTest.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.account

--- a/app/src/androidTest/java/com/nextcloud/client/account/MockUserTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/account/MockUserTest.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.account

--- a/app/src/androidTest/java/com/nextcloud/client/account/OwnCloudClientManagerTest.java
+++ b/app/src/androidTest/java/com/nextcloud/client/account/OwnCloudClientManagerTest.java
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.account;

--- a/app/src/androidTest/java/com/nextcloud/client/account/RegisteredUserTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/account/RegisteredUserTest.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.account

--- a/app/src/androidTest/java/com/nextcloud/client/account/UserAccountManagerImplTest.java
+++ b/app/src/androidTest/java/com/nextcloud/client/account/UserAccountManagerImplTest.java
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2019-2023 Tobias Kaminsky <tobias@kaminsky.me>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.account;

--- a/app/src/androidTest/java/com/nextcloud/client/assistant/AssistantRepositoryTests.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/assistant/AssistantRepositoryTests.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2024 Alper Ozturk <alper_ozturk@proton.me>
 * SPDX-FileCopyrightText: 2024 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.assistant

--- a/app/src/androidTest/java/com/nextcloud/client/database/migrations/MigrationTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/database/migrations/MigrationTest.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.database.migrations

--- a/app/src/androidTest/java/com/nextcloud/client/documentscan/GeneratePDFUseCaseTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/documentscan/GeneratePDFUseCaseTest.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.documentscan

--- a/app/src/androidTest/java/com/nextcloud/client/etm/EtmActivityTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/etm/EtmActivityTest.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.etm

--- a/app/src/androidTest/java/com/nextcloud/client/files/DeepLinkHandlerTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/DeepLinkHandlerTest.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.files

--- a/app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.files.download

--- a/app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.files.download

--- a/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.files.download

--- a/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.files.download

--- a/app/src/androidTest/java/com/nextcloud/client/integrations/deck/DeckApiTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/integrations/deck/DeckApiTest.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.integrations.deck

--- a/app/src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.jobs

--- a/app/src/androidTest/java/com/nextcloud/client/jobs/ContactsBackupIT.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/jobs/ContactsBackupIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.jobs

--- a/app/src/androidTest/java/com/nextcloud/client/migrations/MigrationsDbTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/migrations/MigrationsDbTest.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.migrations

--- a/app/src/androidTest/java/com/nextcloud/client/migrations/MigrationsManagerTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/migrations/MigrationsManagerTest.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.migrations

--- a/app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferences.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferences.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.migrations

--- a/app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferencesTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferencesTest.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.migrations

--- a/app/src/androidTest/java/com/nextcloud/client/network/ConnectivityServiceImplIT.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/network/ConnectivityServiceImplIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.client.network

--- a/app/src/androidTest/java/com/nextcloud/extensions/BundleExtensionTests.kt
+++ b/app/src/androidTest/java/com/nextcloud/extensions/BundleExtensionTests.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2024 Alper Ozturk <alper_ozturk@proton.me>
 * SPDX-FileCopyrightText: 2024 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.extensions

--- a/app/src/androidTest/java/com/nextcloud/extensions/IntentExtensionTests.kt
+++ b/app/src/androidTest/java/com/nextcloud/extensions/IntentExtensionTests.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2024 Alper Ozturk <alper_ozturk@proton.me>
 * SPDX-FileCopyrightText: 2024 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.extensions

--- a/app/src/androidTest/java/com/nextcloud/sso/InputStreamBinderTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/sso/InputStreamBinderTest.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2021 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2021 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.sso

--- a/app/src/androidTest/java/com/nextcloud/test/GrantStoragePermissionRule.kt
+++ b/app/src/androidTest/java/com/nextcloud/test/GrantStoragePermissionRule.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2021 Álvaro Brey <alvaro@alvarobrey.com>
 * SPDX-FileCopyrightText: 2021 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.test

--- a/app/src/androidTest/java/com/nextcloud/test/InjectionOverrideRule.kt
+++ b/app/src/androidTest/java/com/nextcloud/test/InjectionOverrideRule.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.test

--- a/app/src/androidTest/java/com/nextcloud/test/InjectionTestActivityTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/test/InjectionTestActivityTest.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.test

--- a/app/src/androidTest/java/com/nextcloud/test/RandomStringGenerator.kt
+++ b/app/src/androidTest/java/com/nextcloud/test/RandomStringGenerator.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
 * SPDX-FileCopyrightText: 2022 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.test

--- a/app/src/androidTest/java/com/nextcloud/test/RetryTestRule.kt
+++ b/app/src/androidTest/java/com/nextcloud/test/RetryTestRule.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.test

--- a/app/src/androidTest/java/com/nextcloud/test/TestMainApp.kt
+++ b/app/src/androidTest/java/com/nextcloud/test/TestMainApp.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.test

--- a/app/src/androidTest/java/com/nextcloud/test/model/TestModels.kt
+++ b/app/src/androidTest/java/com/nextcloud/test/model/TestModels.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2024 Alper Ozturk <alper_ozturk@proton.me>
 * SPDX-FileCopyrightText: 2024 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.test.model

--- a/app/src/androidTest/java/com/nextcloud/ui/BitmapIT.kt
+++ b/app/src/androidTest/java/com/nextcloud/ui/BitmapIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2022 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2022 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.ui

--- a/app/src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt
+++ b/app/src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nextcloud.ui

--- a/app/src/androidTest/java/com/nmc/android/ui/LauncherActivityIT.kt
+++ b/app/src/androidTest/java/com/nmc/android/ui/LauncherActivityIT.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2023 TSI-mc
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.nmc.android.ui

--- a/app/src/androidTest/java/com/owncloud/android/AbstractIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/AbstractIT.java
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2018 Tobias Kaminsky <tobias@kaminsky.me>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android;

--- a/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android;

--- a/app/src/androidTest/java/com/owncloud/android/DownloadIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/DownloadIT.java
@ -4,7 +4,7 @@
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android;

--- a/app/src/androidTest/java/com/owncloud/android/EncryptionIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/EncryptionIT.kt
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2024 Your Name <your@email.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */

 package com.owncloud.android
--- a/app/src/androidTest/java/com/owncloud/android/FileIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/FileIT.java
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2018 Tobias Kaminsky <tobias@kaminsky.me>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android;

--- a/app/src/androidTest/java/com/owncloud/android/ScreenshotsIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/ScreenshotsIT.java
@ -2,7 +2,7 @@
 * Nextcloud - Android Client
 *
 * SPDX-FileCopyrightText: 2018 Tobias Kaminsky <tobias@kaminsky.me>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android;

--- a/app/src/androidTest/java/com/owncloud/android/UploadIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/UploadIT.java
@ -4,7 +4,7 @@
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android;

--- a/app/src/androidTest/java/com/owncloud/android/authentication/AuthenticatorActivityIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/authentication/AuthenticatorActivityIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android.authentication

--- a/app/src/androidTest/java/com/owncloud/android/authentication/PassCodeManagerIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/authentication/PassCodeManagerIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android.authentication

--- a/app/src/androidTest/java/com/owncloud/android/datamodel/ArbitraryDataProviderIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/datamodel/ArbitraryDataProviderIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android.datamodel

--- a/app/src/androidTest/java/com/owncloud/android/datamodel/ContentResolverHelperIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/datamodel/ContentResolverHelperIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2021 Álvaro Brey <alvaro@alvarobrey.com>
 * SPDX-FileCopyrightText: 2021 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android.datamodel

--- a/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentProviderClientIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentProviderClientIT.java
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android.datamodel;

--- a/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentResolverIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentResolverIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android.datamodel

--- a/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android.datamodel;

--- a/app/src/androidTest/java/com/owncloud/android/datamodel/OCCapabilityIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/datamodel/OCCapabilityIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android.datamodel

--- a/app/src/androidTest/java/com/owncloud/android/datamodel/OCFileIconTests.kt
+++ b/app/src/androidTest/java/com/owncloud/android/datamodel/OCFileIconTests.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2023 Alper Ozturk <alper_ozturk@proton.me>
 * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android.datamodel

--- a/app/src/androidTest/java/com/owncloud/android/datamodel/UploadStorageManagerTest.java
+++ b/app/src/androidTest/java/com/owncloud/android/datamodel/UploadStorageManagerTest.java
@ -4,7 +4,7 @@
 * SPDX-FileCopyrightText: 2017 JARP <jarp@customer-187-174-218-184.uninet-ide.com.mx
 * SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2021 Chris Narkiewicz <hello@ezaquarii.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android.datamodel;

--- a/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt
@ -4,7 +4,7 @@
 * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
 * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android.files.services

--- a/app/src/androidTest/java/com/owncloud/android/files/services/LegacyFileUploaderIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/files/services/LegacyFileUploaderIT.kt
@ -3,7 +3,7 @@
 *
 * SPDX-FileCopyrightText: 2022 Tobias Kaminsky <tobias@kaminsky.me>
 * SPDX-FileCopyrightText: 2022 Nextcloud GmbH
- * SPDX-License-Identifier: AGPL-3.0-or-later
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 */
 package com.owncloud.android.files.services

--- a/Show more
+++ b/Show more