diff --git a/app/screenshots/gplay/debug/com.nextcloud.client.AuthenticatorActivityIT_login.png b/app/screenshots/gplay/debug/com.nextcloud.client.AuthenticatorActivityIT_login.png
index 0c1b4916ea21..cb5dac286862 100644
Binary files a/app/screenshots/gplay/debug/com.nextcloud.client.AuthenticatorActivityIT_login.png and b/app/screenshots/gplay/debug/com.nextcloud.client.AuthenticatorActivityIT_login.png differ
diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFileDialog.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFileDialog.png
index bb93a174e2db..cce676ca07e5 100644
Binary files a/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFileDialog.png and b/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFileDialog.png differ
diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFilesDialog.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFilesDialog.png
index f61b09696988..5e7317033879 100644
Binary files a/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFilesDialog.png and b/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFilesDialog.png differ
diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFolderDialog.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFolderDialog.png
index ef0b1d7912b4..9a367f27563e 100644
Binary files a/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFolderDialog.png and b/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFolderDialog.png differ
diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFoldersDialog.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFoldersDialog.png
index f61b09696988..5e7317033879 100644
Binary files a/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFoldersDialog.png and b/app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testRemoveFoldersDialog.png differ
diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailFragmentStaticServerIT_showDetailsActivitiesError.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailFragmentStaticServerIT_showDetailsActivitiesError.png
index b27159ae2b50..2b6b39e4f757 100644
Binary files a/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailFragmentStaticServerIT_showDetailsActivitiesError.png and b/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailFragmentStaticServerIT_showDetailsActivitiesError.png differ
diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailSharingFragmentIT_listSharesFileAllShareTypes.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailSharingFragmentIT_listSharesFileAllShareTypes.png
index b7a1e3001fec..21818ebab472 100644
Binary files a/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailSharingFragmentIT_listSharesFileAllShareTypes.png and b/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailSharingFragmentIT_listSharesFileAllShareTypes.png differ
diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showFiles.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showFiles.png
index 322292003c77..b9124114040c 100644
Binary files a/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showFiles.png and b/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showFiles.png differ
diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showFolderTypes.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showFolderTypes.png
index 980a96bb53cb..6befb0a7219d 100644
Binary files a/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showFolderTypes.png and b/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showFolderTypes.png differ
diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.trashbin.TrashbinActivityIT_differentUser.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.trashbin.TrashbinActivityIT_differentUser.png
index 535bddb9ebaa..dc7e9793ee1a 100644
Binary files a/app/screenshots/gplay/debug/com.owncloud.android.ui.trashbin.TrashbinActivityIT_differentUser.png and b/app/screenshots/gplay/debug/com.owncloud.android.ui.trashbin.TrashbinActivityIT_differentUser.png differ
diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.trashbin.TrashbinActivityIT_error.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.trashbin.TrashbinActivityIT_error.png
index 535bddb9ebaa..dc7e9793ee1a 100644
Binary files a/app/screenshots/gplay/debug/com.owncloud.android.ui.trashbin.TrashbinActivityIT_error.png and b/app/screenshots/gplay/debug/com.owncloud.android.ui.trashbin.TrashbinActivityIT_error.png differ
diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.trashbin.TrashbinActivityIT_normalUser.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.trashbin.TrashbinActivityIT_normalUser.png
index d76e2d91b6a3..cf104f97ff45 100644
Binary files a/app/screenshots/gplay/debug/com.owncloud.android.ui.trashbin.TrashbinActivityIT_normalUser.png and b/app/screenshots/gplay/debug/com.owncloud.android.ui.trashbin.TrashbinActivityIT_normalUser.png differ
diff --git a/app/src/androidTest/disabledTests/AuthenticatorActivityTest.java b/app/src/androidTest/disabledTests/AuthenticatorActivityTest.java
index cebf636e865f..3f56bf33cbfb 100644
--- a/app/src/androidTest/disabledTests/AuthenticatorActivityTest.java
+++ b/app/src/androidTest/disabledTests/AuthenticatorActivityTest.java
@@ -1,20 +1,8 @@
-//**
-// * ownCloud Android client application
-// *
-// * Copyright (C) 2015 ownCloud Inc.
-// *
-// * This program is free software: you can redistribute it and/or modify
-// * it under the terms of the GNU General Public License version 2,
-// * as published by the Free Software Foundation.
-// *
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// * GNU General Public License for more details.
-// *
-// * You should have received a copy of the GNU General Public License
-// * along with this program. If not, see .
+//*
+// * Nextcloud - Android Client
// *
+// * SPDX-FileCopyrightText: 2015 ownCloud Inc.
+// * SPDX-License-Identifier: GPL-2.0-only
// */
//
//package com.owncloud.android.authentication;
diff --git a/app/src/androidTest/disabledTests/uiautomator/InitialTest.java b/app/src/androidTest/disabledTests/uiautomator/InitialTest.java
index 0a1cba99340b..500adf74b139 100644
--- a/app/src/androidTest/disabledTests/uiautomator/InitialTest.java
+++ b/app/src/androidTest/disabledTests/uiautomator/InitialTest.java
@@ -1,21 +1,10 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * Copyright (C) 2015 ownCloud Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2018 Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2015 ownCloud Inc.
+ * SPDX-License-Identifier: GPL-2.0-only
*/
-
package com.owncloud.android.uiautomator;
import android.content.Intent;
diff --git a/app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt
index c8ac3c05e8a8..14b8e425cc74 100644
--- a/app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt
@@ -1,21 +1,8 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.files.download
diff --git a/app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt
index a7231fb52dff..bf49bf45afad 100644
--- a/app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.files.download
diff --git a/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt
index bbbbd03f40ce..516b332a9e1c 100644
--- a/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt
@@ -1,21 +1,8 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.files.download
diff --git a/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt
index 527bda87e354..692b26850bbb 100644
--- a/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt
@@ -1,21 +1,8 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.files.download
diff --git a/app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt
index 3a3d284f1824..3b794bce1c4e 100644
--- a/app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt
@@ -152,7 +152,7 @@ class FileDetailSharingFragmentIT : AbstractIT() {
OCShare(file.decryptedRemotePath).apply {
remoteId = 7
shareType = ShareType.CIRCLE
- sharedWithDisplayName = "Personal circle"
+ sharedWithDisplayName = "Personal team"
permissions = SHARE_PERMISSION_FLAG
userId = getUserId(user)
activity.storageManager.saveShare(this)
@@ -161,7 +161,7 @@ class FileDetailSharingFragmentIT : AbstractIT() {
OCShare(file.decryptedRemotePath).apply {
remoteId = 8
shareType = ShareType.CIRCLE
- sharedWithDisplayName = "Public circle"
+ sharedWithDisplayName = "Public team"
permissions = SHARE_PERMISSION_FLAG
userId = getUserId(user)
activity.storageManager.saveShare(this)
@@ -170,7 +170,7 @@ class FileDetailSharingFragmentIT : AbstractIT() {
OCShare(file.decryptedRemotePath).apply {
remoteId = 9
shareType = ShareType.CIRCLE
- sharedWithDisplayName = "Closed circle"
+ sharedWithDisplayName = "Closed team"
permissions = SHARE_PERMISSION_FLAG
userId = getUserId(user)
activity.storageManager.saveShare(this)
@@ -179,7 +179,7 @@ class FileDetailSharingFragmentIT : AbstractIT() {
OCShare(file.decryptedRemotePath).apply {
remoteId = 10
shareType = ShareType.CIRCLE
- sharedWithDisplayName = "Secret circle"
+ sharedWithDisplayName = "Secret team"
permissions = SHARE_PERMISSION_FLAG
userId = getUserId(user)
activity.storageManager.saveShare(this)
diff --git a/app/src/generic/java/com/nextcloud/client/di/VariantComponentsModule.java b/app/src/generic/java/com/nextcloud/client/di/VariantComponentsModule.java
index 6afc823f4444..1dd19f3b22b6 100644
--- a/app/src/generic/java/com/nextcloud/client/di/VariantComponentsModule.java
+++ b/app/src/generic/java/com/nextcloud/client/di/VariantComponentsModule.java
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2919 Chris Narkiewicz
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.di;
diff --git a/app/src/generic/java/com/owncloud/android/utils/PushUtils.java b/app/src/generic/java/com/owncloud/android/utils/PushUtils.java
index c39ce93890d9..e6faf604601e 100644
--- a/app/src/generic/java/com/owncloud/android/utils/PushUtils.java
+++ b/app/src/generic/java/com/owncloud/android/utils/PushUtils.java
@@ -1,25 +1,10 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * @author Chris Narkiewicz
- * Copyright (C) 2017 Mario Danic
- * Copyright (C) 2019 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.owncloud.android.utils;
import android.content.Context;
diff --git a/app/src/generic/java/com/owncloud/android/utils/SecurityUtils.java b/app/src/generic/java/com/owncloud/android/utils/SecurityUtils.java
index 3f25b7cdd1be..721f0269ba16 100644
--- a/app/src/generic/java/com/owncloud/android/utils/SecurityUtils.java
+++ b/app/src/generic/java/com/owncloud/android/utils/SecurityUtils.java
@@ -1,21 +1,8 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * Copyright (C) 2018 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2018 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.utils;
diff --git a/app/src/gplay/java/com/nextcloud/client/di/VariantComponentsModule.java b/app/src/gplay/java/com/nextcloud/client/di/VariantComponentsModule.java
index 8723bc1a8153..849c3ca79165 100644
--- a/app/src/gplay/java/com/nextcloud/client/di/VariantComponentsModule.java
+++ b/app/src/gplay/java/com/nextcloud/client/di/VariantComponentsModule.java
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2919 Chris Narkiewicz
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.di;
diff --git a/app/src/gplay/java/com/owncloud/android/authentication/ModifiedAuthenticatorActivity.java b/app/src/gplay/java/com/owncloud/android/authentication/ModifiedAuthenticatorActivity.java
index a9c0e80db595..8d5222df1fae 100644
--- a/app/src/gplay/java/com/owncloud/android/authentication/ModifiedAuthenticatorActivity.java
+++ b/app/src/gplay/java/com/owncloud/android/authentication/ModifiedAuthenticatorActivity.java
@@ -1,3 +1,9 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
package com.owncloud.android.authentication;
import android.os.Bundle;
@@ -5,26 +11,6 @@
import com.nextcloud.client.di.Injectable;
import com.owncloud.android.utils.GooglePlayUtils;
-/**
- * Nextcloud Android client application
- *
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
public class ModifiedAuthenticatorActivity extends AuthenticatorActivity implements Injectable {
@Override
diff --git a/app/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java b/app/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java
index 45e4c98669ad..f2dddfe4db38 100644
--- a/app/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java
+++ b/app/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java
@@ -1,22 +1,9 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.services.firebase;
diff --git a/app/src/gplay/java/com/owncloud/android/utils/GooglePlayUtils.kt b/app/src/gplay/java/com/owncloud/android/utils/GooglePlayUtils.kt
index 59e5ad402ee0..77406b865ce8 100644
--- a/app/src/gplay/java/com/owncloud/android/utils/GooglePlayUtils.kt
+++ b/app/src/gplay/java/com/owncloud/android/utils/GooglePlayUtils.kt
@@ -1,21 +1,8 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see //www.gnu.org/licenses/>.
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.utils
diff --git a/app/src/gplay/java/com/owncloud/android/utils/PushUtils.java b/app/src/gplay/java/com/owncloud/android/utils/PushUtils.java
index a6ce47396bb7..22df021fdfeb 100644
--- a/app/src/gplay/java/com/owncloud/android/utils/PushUtils.java
+++ b/app/src/gplay/java/com/owncloud/android/utils/PushUtils.java
@@ -1,27 +1,11 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * @author Chris Narkiewicz
- * @author Tobias Kaminsky
- * Copyright (C) 2017-2018 Mario Danic
- * Copyright (C) 2019 Chris Narkiewicz
- * Copyright (C) 2019 Tobias Kaminsky
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2019 Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2017-2018 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.owncloud.android.utils;
import android.accounts.Account;
diff --git a/app/src/gplay/java/com/owncloud/android/utils/SecurityUtils.java b/app/src/gplay/java/com/owncloud/android/utils/SecurityUtils.java
index f38eedbe3c08..954bba461752 100644
--- a/app/src/gplay/java/com/owncloud/android/utils/SecurityUtils.java
+++ b/app/src/gplay/java/com/owncloud/android/utils/SecurityUtils.java
@@ -1,21 +1,8 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * Copyright (C) 2018 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2018 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.utils;
diff --git a/app/src/huawei/java/com/nextcloud/client/di/VariantComponentsModule.java b/app/src/huawei/java/com/nextcloud/client/di/VariantComponentsModule.java
index cd2f5ef69aba..74822d8b673d 100644
--- a/app/src/huawei/java/com/nextcloud/client/di/VariantComponentsModule.java
+++ b/app/src/huawei/java/com/nextcloud/client/di/VariantComponentsModule.java
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2919 Chris Narkiewicz
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.di;
diff --git a/app/src/huawei/java/com/owncloud/android/utils/PushUtils.java b/app/src/huawei/java/com/owncloud/android/utils/PushUtils.java
index 2ae3f798e8fe..38998104e821 100644
--- a/app/src/huawei/java/com/owncloud/android/utils/PushUtils.java
+++ b/app/src/huawei/java/com/owncloud/android/utils/PushUtils.java
@@ -1,21 +1,10 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * @author Chris Narkiewicz Copyright (C) 2017 Mario Danic Copyright (C) 2019 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify it 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.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License along with this program. If not, see
- * .
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.owncloud.android.utils;
import android.content.Context;
diff --git a/app/src/huawei/java/com/owncloud/android/utils/SecurityUtils.java b/app/src/huawei/java/com/owncloud/android/utils/SecurityUtils.java
index f3d6ac234b62..721f0269ba16 100644
--- a/app/src/huawei/java/com/owncloud/android/utils/SecurityUtils.java
+++ b/app/src/huawei/java/com/owncloud/android/utils/SecurityUtils.java
@@ -1,18 +1,8 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Mario Danic Copyright (C) 2018 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify it 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.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License along with this program. If not, see
- * .
+ * SPDX-FileCopyrightText: 2018 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.utils;
diff --git a/app/src/main/java/com/nextcloud/client/NominatimClient.kt b/app/src/main/java/com/nextcloud/client/NominatimClient.kt
index 283d528e8e3a..d5b07fd00255 100644
--- a/app/src/main/java/com/nextcloud/client/NominatimClient.kt
+++ b/app/src/main/java/com/nextcloud/client/NominatimClient.kt
@@ -1,22 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author ZetaTom
- * Copyright (C) 2023 ZetaTom
- * Copyright (C) 2023 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2023 ZetaTom
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client
diff --git a/app/src/main/java/com/nextcloud/client/core/LocalBinder.kt b/app/src/main/java/com/nextcloud/client/core/LocalBinder.kt
index 404c55f8d4c4..8d28140a47ce 100644
--- a/app/src/main/java/com/nextcloud/client/core/LocalBinder.kt
+++ b/app/src/main/java/com/nextcloud/client/core/LocalBinder.kt
@@ -1,21 +1,8 @@
-/**
- * Nextcloud Android client application
- *
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+/*
+ * Nextcloud - Android Client
*
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.core
diff --git a/app/src/main/java/com/nextcloud/client/core/LocalConnection.kt b/app/src/main/java/com/nextcloud/client/core/LocalConnection.kt
index 7708e04c01b1..9ca3f81cfdcb 100644
--- a/app/src/main/java/com/nextcloud/client/core/LocalConnection.kt
+++ b/app/src/main/java/com/nextcloud/client/core/LocalConnection.kt
@@ -1,21 +1,8 @@
-/**
- * Nextcloud Android client application
- *
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+/*
+ * Nextcloud - Android Client
*
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.core
diff --git a/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt b/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt
index c895dad97e1f..e04cc277b815 100644
--- a/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt
+++ b/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt
@@ -1,25 +1,10 @@
/*
- * Nextcloud Android client application
- *
- * @author Dariusz Olszewski
- * Copyright (C) 2022 Dariusz Olszewski
- * Copyright (C) 2022 Nextcloud GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this program. If not, see .
+ * Nextcloud - Android Client
*
+ * SPDX-FileCopyrightText: 2022 Dariusz Olszewski
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.nextcloud.client.database.dao
import androidx.room.Dao
diff --git a/app/src/main/java/com/nextcloud/client/device/BatteryStatus.kt b/app/src/main/java/com/nextcloud/client/device/BatteryStatus.kt
index 2bd1be16f2db..8fee2a813897 100644
--- a/app/src/main/java/com/nextcloud/client/device/BatteryStatus.kt
+++ b/app/src/main/java/com/nextcloud/client/device/BatteryStatus.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.device
diff --git a/app/src/main/java/com/nextcloud/client/di/ComponentsModule.java b/app/src/main/java/com/nextcloud/client/di/ComponentsModule.java
index 84e1f447fbd1..60346b2fbb11 100644
--- a/app/src/main/java/com/nextcloud/client/di/ComponentsModule.java
+++ b/app/src/main/java/com/nextcloud/client/di/ComponentsModule.java
@@ -1,23 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.nextcloud.client.di;
import com.nextcloud.client.documentscan.DocumentScanActivity;
diff --git a/app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt b/app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt
index 1d6e22590a43..b16e0f6e070b 100644
--- a/app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt
+++ b/app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt
@@ -1,22 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author ZetaTom
- * Copyright (C) 2023 ZetaTom
- * Copyright (C) 2023 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2023 ZetaTom
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.editimage
diff --git a/app/src/main/java/com/nextcloud/client/etm/EtmViewModel.kt b/app/src/main/java/com/nextcloud/client/etm/EtmViewModel.kt
index 01e12e9b40d4..c40b30e0c917 100644
--- a/app/src/main/java/com/nextcloud/client/etm/EtmViewModel.kt
+++ b/app/src/main/java/com/nextcloud/client/etm/EtmViewModel.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.etm
diff --git a/app/src/main/java/com/nextcloud/client/etm/pages/EtmBackgroundJobsFragment.kt b/app/src/main/java/com/nextcloud/client/etm/pages/EtmBackgroundJobsFragment.kt
index d55caec0b0ae..a33505906f46 100644
--- a/app/src/main/java/com/nextcloud/client/etm/pages/EtmBackgroundJobsFragment.kt
+++ b/app/src/main/java/com/nextcloud/client/etm/pages/EtmBackgroundJobsFragment.kt
@@ -1,22 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- * Copyright (C) 2020 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.etm.pages
diff --git a/app/src/main/java/com/nextcloud/client/files/DeepLinkHandler.kt b/app/src/main/java/com/nextcloud/client/files/DeepLinkHandler.kt
index ce1732cf8d90..c4707f939673 100644
--- a/app/src/main/java/com/nextcloud/client/files/DeepLinkHandler.kt
+++ b/app/src/main/java/com/nextcloud/client/files/DeepLinkHandler.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.files
diff --git a/app/src/main/java/com/nextcloud/client/files/Direction.kt b/app/src/main/java/com/nextcloud/client/files/Direction.kt
index d288c15b0e98..e2f0402158a7 100644
--- a/app/src/main/java/com/nextcloud/client/files/Direction.kt
+++ b/app/src/main/java/com/nextcloud/client/files/Direction.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.files
diff --git a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt
index 03ece0215871..b0087103dadc 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.jobs
diff --git a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManager.kt b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManager.kt
index ad8ea71bc795..68a7a027ec57 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManager.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManager.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.jobs
diff --git a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt
index 841c8a8af8dd..945e14ded7ca 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.jobs
diff --git a/app/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt b/app/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt
index fcf02665fba1..0d7ef0a6f22f 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.jobs
diff --git a/app/src/main/java/com/nextcloud/client/jobs/JobInfo.kt b/app/src/main/java/com/nextcloud/client/jobs/JobInfo.kt
index 95379fcbf023..935964c5490a 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/JobInfo.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/JobInfo.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.jobs
diff --git a/app/src/main/java/com/nextcloud/client/jobs/JobsModule.kt b/app/src/main/java/com/nextcloud/client/jobs/JobsModule.kt
index 79f2f2386c3d..f05e9a041823 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/JobsModule.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/JobsModule.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.jobs
diff --git a/app/src/main/java/com/nextcloud/client/jobs/TestJob.kt b/app/src/main/java/com/nextcloud/client/jobs/TestJob.kt
index cfd9e996c0a3..c30f2cb169da 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/TestJob.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/TestJob.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.jobs
diff --git a/app/src/main/java/com/nextcloud/client/jobs/download/DownloadTask.kt b/app/src/main/java/com/nextcloud/client/jobs/download/DownloadTask.kt
index 32678a45f387..692f86982d83 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/download/DownloadTask.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/download/DownloadTask.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.jobs.download
diff --git a/app/src/main/java/com/nextcloud/client/jobs/transfer/TransferState.kt b/app/src/main/java/com/nextcloud/client/jobs/transfer/TransferState.kt
index f4bdd87fb3d6..596e51a6e219 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/transfer/TransferState.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/transfer/TransferState.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.jobs.transfer
diff --git a/app/src/main/java/com/nextcloud/client/migrations/MigrationError.kt b/app/src/main/java/com/nextcloud/client/migrations/MigrationError.kt
index fce1abca5d84..67aabecd15cb 100644
--- a/app/src/main/java/com/nextcloud/client/migrations/MigrationError.kt
+++ b/app/src/main/java/com/nextcloud/client/migrations/MigrationError.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.migrations
diff --git a/app/src/main/java/com/nextcloud/client/migrations/MigrationInfo.kt b/app/src/main/java/com/nextcloud/client/migrations/MigrationInfo.kt
index c7e3b883bd53..2e227289ff35 100644
--- a/app/src/main/java/com/nextcloud/client/migrations/MigrationInfo.kt
+++ b/app/src/main/java/com/nextcloud/client/migrations/MigrationInfo.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.migrations
diff --git a/app/src/main/java/com/nextcloud/client/migrations/Migrations.kt b/app/src/main/java/com/nextcloud/client/migrations/Migrations.kt
index d459d3b7aa75..31d4a0ea6707 100644
--- a/app/src/main/java/com/nextcloud/client/migrations/Migrations.kt
+++ b/app/src/main/java/com/nextcloud/client/migrations/Migrations.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.migrations
diff --git a/app/src/main/java/com/nextcloud/client/migrations/MigrationsDb.kt b/app/src/main/java/com/nextcloud/client/migrations/MigrationsDb.kt
index f864e05cc9f5..d7e03579f186 100644
--- a/app/src/main/java/com/nextcloud/client/migrations/MigrationsDb.kt
+++ b/app/src/main/java/com/nextcloud/client/migrations/MigrationsDb.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.migrations
diff --git a/app/src/main/java/com/nextcloud/client/migrations/MigrationsManager.kt b/app/src/main/java/com/nextcloud/client/migrations/MigrationsManager.kt
index 2bca8c9c65f4..5fc6b82f2d5c 100644
--- a/app/src/main/java/com/nextcloud/client/migrations/MigrationsManager.kt
+++ b/app/src/main/java/com/nextcloud/client/migrations/MigrationsManager.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.migrations
diff --git a/app/src/main/java/com/nextcloud/client/migrations/MigrationsManagerImpl.kt b/app/src/main/java/com/nextcloud/client/migrations/MigrationsManagerImpl.kt
index 95197af6622a..d6afa000cccb 100644
--- a/app/src/main/java/com/nextcloud/client/migrations/MigrationsManagerImpl.kt
+++ b/app/src/main/java/com/nextcloud/client/migrations/MigrationsManagerImpl.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.migrations
diff --git a/app/src/main/java/com/nextcloud/client/mixins/ActivityMixin.kt b/app/src/main/java/com/nextcloud/client/mixins/ActivityMixin.kt
index 6041b0d352a5..98406e20e16a 100644
--- a/app/src/main/java/com/nextcloud/client/mixins/ActivityMixin.kt
+++ b/app/src/main/java/com/nextcloud/client/mixins/ActivityMixin.kt
@@ -1,22 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- * Copyright (C) 2020 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.mixins
diff --git a/app/src/main/java/com/nextcloud/client/mixins/MixinRegistry.kt b/app/src/main/java/com/nextcloud/client/mixins/MixinRegistry.kt
index 2fc01bf9e35a..c38e066fe83c 100644
--- a/app/src/main/java/com/nextcloud/client/mixins/MixinRegistry.kt
+++ b/app/src/main/java/com/nextcloud/client/mixins/MixinRegistry.kt
@@ -1,22 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- * Copyright (C) 2020 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.mixins
diff --git a/app/src/main/java/com/nextcloud/client/mixins/SessionMixin.kt b/app/src/main/java/com/nextcloud/client/mixins/SessionMixin.kt
index 21beaeee58a0..365b56e5aaca 100644
--- a/app/src/main/java/com/nextcloud/client/mixins/SessionMixin.kt
+++ b/app/src/main/java/com/nextcloud/client/mixins/SessionMixin.kt
@@ -1,22 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- * Copyright (C) 2020 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.mixins
diff --git a/app/src/main/java/com/nextcloud/client/network/Connectivity.kt b/app/src/main/java/com/nextcloud/client/network/Connectivity.kt
index 63783b7d2366..11ac9866b9ed 100644
--- a/app/src/main/java/com/nextcloud/client/network/Connectivity.kt
+++ b/app/src/main/java/com/nextcloud/client/network/Connectivity.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.network
diff --git a/app/src/main/java/com/nextcloud/client/network/ConnectivityService.java b/app/src/main/java/com/nextcloud/client/network/ConnectivityService.java
index 1a314dd2eab1..2f97bae39c0c 100644
--- a/app/src/main/java/com/nextcloud/client/network/ConnectivityService.java
+++ b/app/src/main/java/com/nextcloud/client/network/ConnectivityService.java
@@ -1,23 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.nextcloud.client.network;
/**
diff --git a/app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt b/app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt
index 95b35e8170ba..8fc1890063e9 100644
--- a/app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt
+++ b/app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt
@@ -1,22 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author ZetaTom
- * Copyright (C) 2023 ZetaTom
- * Copyright (C) 2023 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2023 ZetaTom
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.ui
diff --git a/app/src/main/java/com/nextcloud/utils/ShortcutUtil.kt b/app/src/main/java/com/nextcloud/utils/ShortcutUtil.kt
index b45432c7944f..16b8bc389801 100644
--- a/app/src/main/java/com/nextcloud/utils/ShortcutUtil.kt
+++ b/app/src/main/java/com/nextcloud/utils/ShortcutUtil.kt
@@ -1,24 +1,11 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Felix Nüsse
- *
- * Copyright (C) 2022 Felix Nüsse
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2023 Alper Ozturk
+ * SPDX-FileCopyrightText: 2022 Álvaro Brey
+ * SPDX-FileCopyrightText: 2022 Felix Nüsse
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.nextcloud.utils
import android.app.PendingIntent
diff --git a/app/src/main/java/com/nmc/android/ui/LauncherActivity.kt b/app/src/main/java/com/nmc/android/ui/LauncherActivity.kt
index 0573b12ecc59..db2068781d31 100644
--- a/app/src/main/java/com/nmc/android/ui/LauncherActivity.kt
+++ b/app/src/main/java/com/nmc/android/ui/LauncherActivity.kt
@@ -1,23 +1,11 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author TSI-mc
- * Copyright (C) 2023 TSI-mc
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2023 Alper Ozturk
+ * SPDX-FileCopyrightText: 2023 Andy Scherzinger
+ * SPDX-FileCopyrightText: 2023 TSI-mc
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.nmc.android.ui
import android.content.Intent
diff --git a/app/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java b/app/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java
index 92cc7b19c982..6e088e721150 100644
--- a/app/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java
+++ b/app/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java
@@ -1,21 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * Copyright (C) 2017 Mario Danic
- * Copyright (C) 2017 Nextcloud.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.datamodel;
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/CopyToClipboardActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/CopyToClipboardActivity.kt
index 197a0b97a3cd..2fdd965173c7 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/CopyToClipboardActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/CopyToClipboardActivity.kt
@@ -1,22 +1,8 @@
/*
- * ownCloud Android client application
+ * Nextcloud - Android Client
*
- * @author David A. Velasco
- * @author Andy Scherzinger
- * Copyright (C) 2015 ownCloud Inc.
- * Copyright (C) 2018 Andy Scherzinger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2023 Alper Ozturk
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activity
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
index 18abd8d85165..0961de2671b8 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
@@ -1,21 +1,9 @@
/*
- * ownCloud Android client application
- * @author TSI-mc
- * Copyright (C) 2016 ownCloud Inc.
- * Copyright (C) 2023 TSI-mc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * Nextcloud - Android Client
*
+ * SPDX-FileCopyrightText: 2023 TSI-mc
+ * SPDX-FileCopyrightText: 2022 Álvaro Brey
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activity
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt
index dc2c56bd58a5..909dd0d58131 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt
@@ -1,21 +1,8 @@
/*
- * ownCloud Android client application
- *
- * @author masensio
- * Copyright (C) 2016 ownCloud Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * Nextcloud - Android Client
*
+ * SPDX-FileCopyrightText: 2022 Álvaro Brey
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activity
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.kt
index db7f1f54a2f7..282cc7c139ad 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.kt
@@ -1,25 +1,10 @@
/*
- * ownCloud Android client application
- *
- * @author Bartek Przybylski
- * @author masensio
- * @author David A. Velasco
- * Copyright (C) 2011 Bartek Przybylski
- * Copyright (C) 2015 ownCloud Inc.
- * Copyright (C) 2020 Kwon Yuna
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * Nextcloud - Android Client
*
+ * SPDX-FileCopyrightText: 2023 Alper Ozturk
+ * SPDX-FileCopyrightText: 2015 ownCloud Inc.
+ * SPDX-FileCopyrightText: 2011 Bartek Przybylski
+ * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activity
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchFooterViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchFooterViewHolder.kt
index d4cb9d1d91c4..61c49765d57b 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchFooterViewHolder.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchFooterViewHolder.kt
@@ -1,23 +1,9 @@
/*
+ * Nextcloud - Android Client
*
- * Nextcloud Android client application
- *
- * @author Álvaro Brey Vilas
- * Copyright (C) 2021 Álvaro Brey Vilas
- * Copyright (C) 2021 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2021 Álvaro Brey
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.adapter
diff --git a/app/src/main/java/com/owncloud/android/ui/asynctasks/GetRemoteFileTask.kt b/app/src/main/java/com/owncloud/android/ui/asynctasks/GetRemoteFileTask.kt
index 3120f07ce2d6..568bcfc934f1 100644
--- a/app/src/main/java/com/owncloud/android/ui/asynctasks/GetRemoteFileTask.kt
+++ b/app/src/main/java/com/owncloud/android/ui/asynctasks/GetRemoteFileTask.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.asynctasks
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/AccountRemovalDialog.kt b/app/src/main/java/com/owncloud/android/ui/dialog/AccountRemovalDialog.kt
index 8498dbf7d11d..e04d85944095 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/AccountRemovalDialog.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/AccountRemovalDialog.kt
@@ -1,26 +1,11 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author ZetaTom
- * @author Tobias Kaminsky
- * Copyright (C) 2023 ZetaTom
- * Copyright (C) 2020 Tobias Kaminsky
- * Copyright (C) 2020 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2023 ZetaTom
+ * SPDX-FileCopyrightText: 2020 Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2020-2023 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.owncloud.android.ui.dialog
import android.app.Dialog
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.kt
index a8eecc464086..958d231cda10 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.kt
@@ -1,21 +1,12 @@
/*
- * ownCloud Android client application
- *
- * @author David A. Velasco
- * Copyright (C) 2015 ownCloud Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * Nextcloud - Android Client
*
+ * SPDX-FileCopyrightText: 2023 Alper Ozturk
+ * SPDX-FileCopyrightText: 2022 Álvaro Brey
+ * SPDX-FileCopyrightText: 2018 Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2015 David A. Velasco
+ * SPDX-FileCopyrightText: 2015 ownCloud Inc.
+ * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
package com.owncloud.android.ui.dialog
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.kt
index 22223b199004..e43b325af5de 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.kt
@@ -1,24 +1,14 @@
/*
- * ownCloud Android client application
+ * Nextcloud - Android Client
*
- * @author David A. Velasco
- * @author Andy Scherzinger
- * @author TSI-mc
- * Copyright (C) 2015 ownCloud Inc.
- * Copyright (C) 2018 Andy Scherzinger
- * Copyright (C) 2018 TSI-mc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2023 Alper Ozturk
+ * SPDX-FileCopyrightText: 2022 Álvaro Brey
+ * SPDX-FileCopyrightText: 2021 2018 TSI-mc
+ * SPDX-FileCopyrightText: 2018 Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2018 Andy Scherzinger
+ * SPDX-FileCopyrightText: 2015 David A. Velasco
+ * SPDX-FileCopyrightText: 2015 ownCloud Inc.
+ * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
package com.owncloud.android.ui.dialog
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.kt b/app/src/main/java/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.kt
index 4722796e9c57..1d7534219358 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.kt
@@ -1,22 +1,11 @@
-/**
- * ownCloud Android client application
- *
- * Copyright (C) 2015 ownCloud Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see //www.gnu.org/licenses/>.
+/*
+ * Nextcloud - Android Client
*
+ * SPDX-FileCopyrightText: 2023 Alper Ozturk
+ * SPDX-FileCopyrightText: 2015 David A. Velasco
+ * SPDX-FileCopyrightText: 2015 ownCloud Inc.
+ * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
-
@file:Suppress("DEPRECATION")
package com.owncloud.android.ui.dialog
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.kt b/app/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.kt
index a1854907e9bb..c3ca59c3b76e 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.kt
@@ -1,20 +1,10 @@
/*
- * ownCloud Android client application
- *
- * Copyright (C) 2015 ownCloud Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * Nextcloud - Android Client
*
+ * SPDX-FileCopyrightText: 2023 Alper Ozturk
+ * SPDX-FileCopyrightText: 2015 masensio
+ * SPDX-FileCopyrightText: 2015 ownCloud Inc.
+ * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
package com.owncloud.android.ui.dialog
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.kt
index 5795076df890..2b8e9dde57c4 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.kt
@@ -1,22 +1,13 @@
/*
- * ownCloud Android client application
+ * Nextcloud - Android Client
*
- * @author masensio
- * @author Andy Scherzinger
- * Copyright (C) 2015 ownCloud GmbH.
- * Copyright (C) 2018 Andy Scherzinger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2023 Alper Ozturk
+ * SPDX-FileCopyrightText: 2022 Álvaro Brey
+ * SPDX-FileCopyrightText: 2017-2020 Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2018 Andy Scherzinger
+ * SPDX-FileCopyrightText: 2015 masensio
+ * SPDX-FileCopyrightText: 2015 ownCloud Inc.
+ * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
package com.owncloud.android.ui.dialog
diff --git a/app/src/main/java/com/owncloud/android/ui/events/ChangeMenuEvent.kt b/app/src/main/java/com/owncloud/android/ui/events/ChangeMenuEvent.kt
index c832ddcb0c28..2d11080cf29f 100644
--- a/app/src/main/java/com/owncloud/android/ui/events/ChangeMenuEvent.kt
+++ b/app/src/main/java/com/owncloud/android/ui/events/ChangeMenuEvent.kt
@@ -1,21 +1,9 @@
-/**
- * Nextcloud Android client application
- *
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+/*
+ * Nextcloud - Android Client
*
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see //www.gnu.org/licenses/>.
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.events
diff --git a/app/src/main/java/com/owncloud/android/ui/events/DummyDrawerEvent.kt b/app/src/main/java/com/owncloud/android/ui/events/DummyDrawerEvent.kt
index a6ef22f65b15..3912216b11ae 100644
--- a/app/src/main/java/com/owncloud/android/ui/events/DummyDrawerEvent.kt
+++ b/app/src/main/java/com/owncloud/android/ui/events/DummyDrawerEvent.kt
@@ -1,21 +1,9 @@
-/**
- * Nextcloud Android client application
- *
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+/*
+ * Nextcloud - Android Client
*
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see //www.gnu.org/licenses/>.
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.events
diff --git a/app/src/main/java/com/owncloud/android/ui/events/FavoriteEvent.kt b/app/src/main/java/com/owncloud/android/ui/events/FavoriteEvent.kt
index 6a51e979160d..3b4808dfb131 100644
--- a/app/src/main/java/com/owncloud/android/ui/events/FavoriteEvent.kt
+++ b/app/src/main/java/com/owncloud/android/ui/events/FavoriteEvent.kt
@@ -1,21 +1,9 @@
-/**
- * Nextcloud Android client application
- *
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+/*
+ * Nextcloud - Android Client
*
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see //www.gnu.org/licenses/>.
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.events
diff --git a/app/src/main/java/com/owncloud/android/ui/events/SearchEvent.kt b/app/src/main/java/com/owncloud/android/ui/events/SearchEvent.kt
index 966687d2e0f0..2144e700a832 100644
--- a/app/src/main/java/com/owncloud/android/ui/events/SearchEvent.kt
+++ b/app/src/main/java/com/owncloud/android/ui/events/SearchEvent.kt
@@ -1,21 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.events
diff --git a/app/src/main/java/com/owncloud/android/ui/events/SyncEventFinished.kt b/app/src/main/java/com/owncloud/android/ui/events/SyncEventFinished.kt
index 9d0ce00632df..3b6f3ce36be5 100644
--- a/app/src/main/java/com/owncloud/android/ui/events/SyncEventFinished.kt
+++ b/app/src/main/java/com/owncloud/android/ui/events/SyncEventFinished.kt
@@ -1,21 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.events
diff --git a/app/src/main/java/com/owncloud/android/ui/events/TokenPushEvent.kt b/app/src/main/java/com/owncloud/android/ui/events/TokenPushEvent.kt
index fc93aebc3174..3edf8a1e1e03 100644
--- a/app/src/main/java/com/owncloud/android/ui/events/TokenPushEvent.kt
+++ b/app/src/main/java/com/owncloud/android/ui/events/TokenPushEvent.kt
@@ -1,21 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.events
diff --git a/app/src/main/java/com/owncloud/android/ui/events/VCardToggleEvent.kt b/app/src/main/java/com/owncloud/android/ui/events/VCardToggleEvent.kt
index 706ae9d14860..15c6cc63e4fa 100644
--- a/app/src/main/java/com/owncloud/android/ui/events/VCardToggleEvent.kt
+++ b/app/src/main/java/com/owncloud/android/ui/events/VCardToggleEvent.kt
@@ -1,21 +1,9 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see //www.gnu.org/licenses/>.
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.events
diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt b/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt
index a858b321e3d5..ef791a1727d6 100644
--- a/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt
+++ b/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt
@@ -1,21 +1,12 @@
/*
- * ownCloud Android client application
- *
- * Copyright (C) 2016 ownCloud Inc.
- * Copyright (C) 2022 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * Nextcloud - Android Client
*
+ * SPDX-FileCopyrightText: 2024 Alper Ozturk
+ * SPDX-FileCopyrightText: 2022 Álvaro Brey
+ * SPDX-FileCopyrightText: 2018-2021 Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+ * SPDX-FileCopyrightText: 2016 ownCloud Inc.
+ * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
package com.owncloud.android.ui.helpers
diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
index 74350f20aad7..0da228a12ca4 100644
--- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
@@ -1,28 +1,14 @@
/*
- * ownCloud Android client application
+ * Nextcloud - Android Client
*
- * @author David A. Velasco
- * @author Chris Narkiewicz
- * @author Andy Scherzinger
- * @author TSI-mc
- * @author Parneet Singh
- * Copyright (C) 2016 ownCloud Inc.
- * Copyright (C) 2019 Chris Narkiewicz
- * Copyright (C) 2020 Andy Scherzinger
- * Copyright (C) 2023 TSI-mc
- * Copyright (C) Parneet Singh
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2023 Parneet Singh
+ * SPDX-FileCopyrightText: 2023 Alper Ozturk
+ * SPDX-FileCopyrightText: 2023 TSI-mc
+ * SPDX-FileCopyrightText: 2020 Andy Scherzinger
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2016 David A. Velasco
+ * SPDX-FileCopyrightText: 2016 ownCloud Inc.
+ * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
package com.owncloud.android.ui.preview
diff --git a/app/src/main/java/com/owncloud/android/ui/unifiedsearch/GetSearchProvidersTask.kt b/app/src/main/java/com/owncloud/android/ui/unifiedsearch/GetSearchProvidersTask.kt
index 38dc196a3a5a..d86946e245c6 100644
--- a/app/src/main/java/com/owncloud/android/ui/unifiedsearch/GetSearchProvidersTask.kt
+++ b/app/src/main/java/com/owncloud/android/ui/unifiedsearch/GetSearchProvidersTask.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.unifiedsearch
diff --git a/app/src/main/java/com/owncloud/android/ui/unifiedsearch/SearchOnProviderTask.kt b/app/src/main/java/com/owncloud/android/ui/unifiedsearch/SearchOnProviderTask.kt
index 8bfc2ba88e10..6186a5ff0738 100644
--- a/app/src/main/java/com/owncloud/android/ui/unifiedsearch/SearchOnProviderTask.kt
+++ b/app/src/main/java/com/owncloud/android/ui/unifiedsearch/SearchOnProviderTask.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.unifiedsearch
diff --git a/app/src/main/java/com/owncloud/android/ui/unifiedsearch/UnifiedSearchViewModel.kt b/app/src/main/java/com/owncloud/android/ui/unifiedsearch/UnifiedSearchViewModel.kt
index c36b5d265c35..8dd9800d36b4 100644
--- a/app/src/main/java/com/owncloud/android/ui/unifiedsearch/UnifiedSearchViewModel.kt
+++ b/app/src/main/java/com/owncloud/android/ui/unifiedsearch/UnifiedSearchViewModel.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.unifiedsearch
diff --git a/app/src/main/java/com/owncloud/android/utils/DataHolderUtil.java b/app/src/main/java/com/owncloud/android/utils/DataHolderUtil.java
index 24f0e71681a9..4114140efcf6 100644
--- a/app/src/main/java/com/owncloud/android/utils/DataHolderUtil.java
+++ b/app/src/main/java/com/owncloud/android/utils/DataHolderUtil.java
@@ -1,21 +1,9 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.utils;
diff --git a/app/src/main/java/com/owncloud/android/utils/KeyboardUtils.kt b/app/src/main/java/com/owncloud/android/utils/KeyboardUtils.kt
index 19d337d18224..f8a742b9a626 100644
--- a/app/src/main/java/com/owncloud/android/utils/KeyboardUtils.kt
+++ b/app/src/main/java/com/owncloud/android/utils/KeyboardUtils.kt
@@ -1,27 +1,11 @@
/*
- * Nextcloud Android client application
- *
- * @author ZetaTom
- * @author Álvaro Brey
- * Copyright (C) 2023 ZetaTom
- * Copyright (C) 2022 Álvaro Brey
- * Copyright (C) 2022 Nextcloud GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this program. If not, see .
+ * Nextcloud - Android Client
*
+ * SPDX-FileCopyrightText: 2023 ZetaTom
+ * SPDX-FileCopyrightText: 2022 Álvaro Brey
+ * SPDX-FileCopyrightText: 2022-2023 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.owncloud.android.utils
import android.view.Window
diff --git a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
index 78b3396e409e..32139657d67e 100644
--- a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
+++ b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
@@ -1,26 +1,11 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Álvaro Brey Vilas
- * @author Andy Scherzinger
- * Copyright (C) 2021 Álvaro Brey Vilas
- * Copyright (C) 2021 Nextcloud GmbH
- * Copyright (C) 2015 Andy Scherzinger
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2021 Álvaro Brey
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH
+ * SPDX-FileCopyrightText: 2015 Andy Scherzinger
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.owncloud.android.utils
import android.Manifest
diff --git a/app/src/main/java/com/owncloud/android/utils/UriUtils.kt b/app/src/main/java/com/owncloud/android/utils/UriUtils.kt
index 080bece54506..65845b93fa5f 100644
--- a/app/src/main/java/com/owncloud/android/utils/UriUtils.kt
+++ b/app/src/main/java/com/owncloud/android/utils/UriUtils.kt
@@ -1,19 +1,11 @@
-/**
- * ownCloud Android client application
- *
- * Copyright (C) 2015 ownCloud Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+/*
+ * Nextcloud - Android Client
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see //www.gnu.org/licenses/>.
+ * SPDX-FileCopyrightText: 2023 Álvaro Brey
+ * SPDX-FileCopyrightText: 2021 Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH
+ * SPDX-FileCopyrightText: 2015 ownCloud Inc.
+ * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
package com.owncloud.android.utils
diff --git a/app/src/main/java/com/owncloud/android/utils/svg/MenuSimpleTarget.java b/app/src/main/java/com/owncloud/android/utils/svg/MenuSimpleTarget.java
index 9f2d986b72a3..055afddacfe1 100644
--- a/app/src/main/java/com/owncloud/android/utils/svg/MenuSimpleTarget.java
+++ b/app/src/main/java/com/owncloud/android/utils/svg/MenuSimpleTarget.java
@@ -1,33 +1,17 @@
-/**
- * Nextcloud Android client application
- *
- * @author Alejandro Bautista
- * Copyright (C) 2017 Andy Scherzinger
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+/*
+ * Nextcloud - Android Client
*
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2017 Alejandro Morales
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.owncloud.android.utils.svg;
import com.bumptech.glide.request.target.SimpleTarget;
/**
- * SimpleTarget for MenuItems
+ * SimpleTarget for MenuItems.
*/
-
public abstract class MenuSimpleTarget extends SimpleTarget{
private final int mIdMenuItem;
@@ -37,7 +21,6 @@ public MenuSimpleTarget(int idMenuItem){
this.mIdMenuItem=idMenuItem;
}
-
public int getIdMenuItem() {
return mIdMenuItem;
}
diff --git a/app/src/main/java/org/nextcloud/providers/cursors/FileCursor.java b/app/src/main/java/org/nextcloud/providers/cursors/FileCursor.java
index af8edfe4651a..0a3d2ad69a75 100644
--- a/app/src/main/java/org/nextcloud/providers/cursors/FileCursor.java
+++ b/app/src/main/java/org/nextcloud/providers/cursors/FileCursor.java
@@ -1,23 +1,12 @@
/*
- * nextCloud Android client application
- *
- * @author Bartosz Przybylski
- * Copyright (C) 2016 Bartosz Przybylski
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * Nextcloud - Android Client
*
+ * SPDX-FileCopyrightText: 2020 Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2019 Jens Mueller
+ * SPDX-FileCopyrightText: 2016 Iskra Delta
+ * SPDX-FileCopyrightText: 2015 Bartosz Przybylski
+ * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
-
package org.nextcloud.providers.cursors;
import android.database.MatrixCursor;
diff --git a/app/src/main/java/org/nextcloud/providers/cursors/RootCursor.java b/app/src/main/java/org/nextcloud/providers/cursors/RootCursor.java
index 2e5a1cd8c241..e154050fa8ac 100644
--- a/app/src/main/java/org/nextcloud/providers/cursors/RootCursor.java
+++ b/app/src/main/java/org/nextcloud/providers/cursors/RootCursor.java
@@ -1,23 +1,11 @@
/*
- * nextCloud Android client application
- *
- * @author Bartosz Przybylski
- * Copyright (C) 2016 Bartosz Przybylski
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * Nextcloud - Android Client
*
+ * SPDX-FileCopyrightText: 2021 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2019 Jens Mueller
+ * SPDX-FileCopyrightText: 2016 Bartosz Przybylski
+ * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
-
package org.nextcloud.providers.cursors;
import android.content.Context;
diff --git a/app/src/main/res/drawable-night/round_bgnd.xml b/app/src/main/res/drawable-night/round_bgnd.xml
index 9d9d087d59d7..a8a8e7bdc92d 100644
--- a/app/src/main/res/drawable-night/round_bgnd.xml
+++ b/app/src/main/res/drawable-night/round_bgnd.xml
@@ -1,24 +1,11 @@
-
+ android:shape="oval">
+
diff --git a/app/src/main/res/drawable-night/shared_via_link.xml b/app/src/main/res/drawable-night/shared_via_link.xml
index 7414129bea59..bd1841046f30 100644
--- a/app/src/main/res/drawable-night/shared_via_link.xml
+++ b/app/src/main/res/drawable-night/shared_via_link.xml
@@ -1,36 +1,16 @@
-
+ android:width="24dp"
+ android:height="24dp"
+ android:tint="#FFFFFFFF"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
-
+ android:fillColor="@android:color/white"
+ android:pathData="M440,680L280,680Q197,680 138.5,621.5Q80,563 80,480Q80,397 138.5,338.5Q197,280 280,280L440,280L440,360L280,360Q230,360 195,395Q160,430 160,480Q160,530 195,565Q230,600 280,600L440,600L440,680ZM320,520L320,440L640,440L640,520L320,520ZM520,680L520,600L680,600Q730,600 765,565Q800,530 800,480Q800,430 765,395Q730,360 680,360L520,360L520,280L680,280Q763,280 821.5,338.5Q880,397 880,480Q880,563 821.5,621.5Q763,680 680,680L520,680Z" />
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/shared_via_users.xml b/app/src/main/res/drawable-night/shared_via_users.xml
index 7ed47f1de077..612a6bf44d19 100644
--- a/app/src/main/res/drawable-night/shared_via_users.xml
+++ b/app/src/main/res/drawable-night/shared_via_users.xml
@@ -1,30 +1,17 @@
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
-
+ android:pathData="M720,880Q670,880 635,845Q600,810 600,760Q600,753 601,745.5Q602,738 604,732L322,568Q305,583 284,591.5Q263,600 240,600Q190,600 155,565Q120,530 120,480Q120,430 155,395Q190,360 240,360Q263,360 284,368.5Q305,377 322,392L604,228Q602,222 601,214.5Q600,207 600,200Q600,150 635,115Q670,80 720,80Q770,80 805,115Q840,150 840,200Q840,250 805,285Q770,320 720,320Q697,320 676,311.5Q655,303 638,288L356,452Q358,458 359,465.5Q360,473 360,480Q360,487 359,494.5Q358,502 356,508L638,672Q655,657 676,648.5Q697,640 720,640Q770,640 805,675Q840,710 840,760Q840,810 805,845Q770,880 720,880Z"
+ android:strokeWidth="8"
+ android:strokeColor="#FF000000" />
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/borderless_btn.xml b/app/src/main/res/drawable/borderless_btn.xml
index 6cc185ea0f57..1e637b9f828a 100644
--- a/app/src/main/res/drawable/borderless_btn.xml
+++ b/app/src/main/res/drawable/borderless_btn.xml
@@ -1,29 +1,14 @@
-
+
+
+
-
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/drawable/e2e_border.xml b/app/src/main/res/drawable/e2e_border.xml
index e2e72e79466f..84577fa080d7 100644
--- a/app/src/main/res/drawable/e2e_border.xml
+++ b/app/src/main/res/drawable/e2e_border.xml
@@ -1,29 +1,15 @@
-
+ android:shape="rectangle">
-
+
diff --git a/app/src/main/res/drawable/ic_assistant.xml b/app/src/main/res/drawable/ic_assistant.xml
index 237c16cc017b..9308c15f6ea4 100644
--- a/app/src/main/res/drawable/ic_assistant.xml
+++ b/app/src/main/res/drawable/ic_assistant.xml
@@ -1,24 +1,10 @@
-
+ ~ SPDX-FileCopyrightText: 2024 Alper Ozturk
+ ~ SPDX-FileCopyrightText: 2024 Nextcloud GmbH
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
.
+ ~ Nextcloud - Android Client
+ ~
+ ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+ ~ SPDX-License-Identifier: Apache-2.0
-->
-
+ android:tint="?attr/colorControlNormal"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
+
diff --git a/app/src/main/res/drawable/ic_circles.xml b/app/src/main/res/drawable/ic_circles.xml
index af9ffa86178b..3f152e7daecf 100644
--- a/app/src/main/res/drawable/ic_circles.xml
+++ b/app/src/main/res/drawable/ic_circles.xml
@@ -1,34 +1,18 @@
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
-
-
-
+ android:fillColor="#FF000000"
+ android:fillType="nonZero"
+ android:pathData="M0.99,17.505L0.99,16.06C0.99,15.402 1.327,14.867 2,14.454C2.672,14.041 3.559,13.835 4.66,13.835C4.859,13.835 5.05,13.839 5.234,13.846C5.417,13.854 5.593,13.873 5.761,13.904C5.548,14.225 5.387,14.562 5.28,14.913C5.172,15.264 5.119,15.631 5.119,16.014L5.119,17.505L0.99,17.505ZM6.495,17.505L6.495,16.014C6.495,15.525 6.629,15.077 6.897,14.673C7.164,14.267 7.543,13.911 8.032,13.606C8.521,13.3 9.106,13.071 9.787,12.917C10.467,12.764 11.205,12.688 12,12.688C12.81,12.688 13.556,12.764 14.237,12.917C14.917,13.071 15.502,13.3 15.991,13.606C16.48,13.911 16.855,14.267 17.115,14.673C17.374,15.077 17.505,15.525 17.505,16.014L17.505,17.505L6.495,17.505ZM18.881,17.505L18.881,16.014C18.881,15.617 18.831,15.241 18.732,14.89C18.632,14.539 18.484,14.209 18.285,13.904C18.452,13.873 18.625,13.854 18.801,13.846C18.976,13.839 19.156,13.835 19.34,13.835C20.441,13.835 21.328,14.038 22,14.443C22.673,14.848 23.01,15.387 23.01,16.06L23.01,17.505L18.881,17.505ZM4.66,12.917C4.156,12.917 3.724,12.738 3.365,12.379C3.005,12.019 2.825,11.587 2.825,11.083C2.825,10.562 3.005,10.127 3.365,9.775C3.724,9.424 4.156,9.248 4.66,9.248C5.181,9.248 5.616,9.424 5.968,9.775C6.319,10.127 6.495,10.562 6.495,11.083C6.495,11.587 6.319,12.019 5.968,12.379C5.616,12.738 5.181,12.917 4.66,12.917ZM19.34,12.917C18.835,12.917 18.403,12.738 18.044,12.379C17.685,12.019 17.505,11.587 17.505,11.083C17.505,10.562 17.685,10.127 18.044,9.775C18.403,9.424 18.835,9.248 19.34,9.248C19.86,9.248 20.296,9.424 20.647,9.775C20.998,10.127 21.175,10.562 21.175,11.083C21.175,11.587 20.998,12.019 20.647,12.379C20.296,12.738 19.86,12.917 19.34,12.917ZM12,12C11.236,12 10.585,11.732 10.05,11.197C9.516,10.662 9.248,10.012 9.248,9.248C9.248,8.468 9.516,7.815 10.05,7.287C10.585,6.759 11.236,6.495 12,6.495C12.78,6.495 13.434,6.759 13.962,7.287C14.489,7.815 14.752,8.468 14.752,9.248C14.752,10.012 14.489,10.662 13.962,11.197C13.434,11.732 12.78,12 12,12Z" />
diff --git a/app/src/main/res/drawable/ic_dashboard.xml b/app/src/main/res/drawable/ic_dashboard.xml
index ddff82815997..cf60c988baf7 100644
--- a/app/src/main/res/drawable/ic_dashboard.xml
+++ b/app/src/main/res/drawable/ic_dashboard.xml
@@ -1,35 +1,20 @@
-
-
+ ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+ android:viewportHeight="16">
+ android:strokeLineJoin="round" />
diff --git a/app/src/main/res/drawable/ic_document_grey600.xml b/app/src/main/res/drawable/ic_document_grey600.xml
index 850b7058bb78..c997f20a94ac 100644
--- a/app/src/main/res/drawable/ic_document_grey600.xml
+++ b/app/src/main/res/drawable/ic_document_grey600.xml
@@ -1,26 +1,16 @@
-
+ android:height="24dp"
+ android:tint="#757575"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
+
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index 406f0b5f6f70..ac538c1f850d 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -1,32 +1,17 @@
-
-
+ ~ SPDX-FileCopyrightText: 2019 Nextcloud GmbH
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+.
+ ~ Nextcloud - Android Client
+ ~
+ ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+ ~ SPDX-License-Identifier: Apache-2.0
-->
-
-
+
diff --git a/app/src/main/res/drawable/ic_folder_overlay_external.xml b/app/src/main/res/drawable/ic_folder_overlay_external.xml
index d4ddea4ea0ef..aa4855673371 100644
--- a/app/src/main/res/drawable/ic_folder_overlay_external.xml
+++ b/app/src/main/res/drawable/ic_folder_overlay_external.xml
@@ -1,30 +1,15 @@
-
-
+
diff --git a/app/src/main/res/drawable/ic_folder_overlay_key.xml b/app/src/main/res/drawable/ic_folder_overlay_key.xml
index 381992f9e1e2..06a4b74b6a92 100644
--- a/app/src/main/res/drawable/ic_folder_overlay_key.xml
+++ b/app/src/main/res/drawable/ic_folder_overlay_key.xml
@@ -1,30 +1,15 @@
-
-
+
diff --git a/app/src/main/res/drawable/ic_folder_overlay_link.xml b/app/src/main/res/drawable/ic_folder_overlay_link.xml
index c8aea32fa283..bd1841046f30 100644
--- a/app/src/main/res/drawable/ic_folder_overlay_link.xml
+++ b/app/src/main/res/drawable/ic_folder_overlay_link.xml
@@ -1,30 +1,16 @@
-
-
-
+ android:tint="#FFFFFFFF"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_folder_overlay_lock.xml b/app/src/main/res/drawable/ic_folder_overlay_lock.xml
index 761e502767bd..e73414de2646 100644
--- a/app/src/main/res/drawable/ic_folder_overlay_lock.xml
+++ b/app/src/main/res/drawable/ic_folder_overlay_lock.xml
@@ -1,30 +1,15 @@
-
-
+
diff --git a/app/src/main/res/drawable/ic_folder_overlay_share.xml b/app/src/main/res/drawable/ic_folder_overlay_share.xml
index 15d238ea662a..30766f285b23 100644
--- a/app/src/main/res/drawable/ic_folder_overlay_share.xml
+++ b/app/src/main/res/drawable/ic_folder_overlay_share.xml
@@ -1,30 +1,16 @@
-
-
+ android:width="20dp"
+ android:height="20dp"
+ android:tint="#FFFFFF"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+
diff --git a/app/src/main/res/drawable/ic_folder_overlay_upload.xml b/app/src/main/res/drawable/ic_folder_overlay_upload.xml
index cccfb3308519..3e06d89f7804 100644
--- a/app/src/main/res/drawable/ic_folder_overlay_upload.xml
+++ b/app/src/main/res/drawable/ic_folder_overlay_upload.xml
@@ -1,30 +1,15 @@
-
-
+
diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml
index 7f6b15eba864..216121712607 100644
--- a/app/src/main/res/drawable/ic_link.xml
+++ b/app/src/main/res/drawable/ic_link.xml
@@ -5,9 +5,12 @@
~ SPDX-License-Identifier: Apache-2.0
-->
-
+ android:height="24dp"
+ android:tint="#757575"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
+
diff --git a/app/src/main/res/drawable/ic_locked_dots_small.xml b/app/src/main/res/drawable/ic_locked_dots_small.xml
index b492c59fb8e8..a7a40d8a75a4 100644
--- a/app/src/main/res/drawable/ic_locked_dots_small.xml
+++ b/app/src/main/res/drawable/ic_locked_dots_small.xml
@@ -1,33 +1,20 @@
+ ~ SPDX-FileCopyrightText: 2022 Álvaro Brey
+ ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
-
-
+
+
diff --git a/app/src/main/res/drawable/ic_more_apps.xml b/app/src/main/res/drawable/ic_more_apps.xml
index 0f857b81eaef..3854b44b90e3 100644
--- a/app/src/main/res/drawable/ic_more_apps.xml
+++ b/app/src/main/res/drawable/ic_more_apps.xml
@@ -1,20 +1,9 @@
-
-
+
diff --git a/app/src/main/res/drawable/ic_notes.xml b/app/src/main/res/drawable/ic_notes.xml
index 52386c660a46..6395a55c5027 100644
--- a/app/src/main/res/drawable/ic_notes.xml
+++ b/app/src/main/res/drawable/ic_notes.xml
@@ -1,20 +1,9 @@
-
.
- -->
-
+ ~ SPDX-FileCopyrightText: 2023 Alper Ozturk
+ ~ SPDX-FileCopyrightText: 2023 Nextcloud GmbH
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
.
- -->
-
-
+
-
-
-
-
+ android:height="24dp"
+ android:tint="#FF000000"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
+ android:fillColor="@android:color/white"
+ android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L560,120L560,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L760,760Q760,760 760,760Q760,760 760,760L760,400L840,400L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM320,680L320,600L640,600L640,680L320,680ZM320,560L320,480L640,480L640,560L320,560ZM320,440L320,360L640,360L640,440L320,440ZM680,360L680,280L600,280L600,200L680,200L680,120L760,120L760,200L840,200L840,280L760,280L760,360L680,360Z" />
diff --git a/app/src/main/res/drawable/ic_unshared.xml b/app/src/main/res/drawable/ic_unshared.xml
index 0bbc893a240a..7bd9ed61e5f9 100644
--- a/app/src/main/res/drawable/ic_unshared.xml
+++ b/app/src/main/res/drawable/ic_unshared.xml
@@ -12,5 +12,5 @@
android:viewportHeight="24.0">
+ android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
diff --git a/app/src/main/res/drawable/ic_user_status_away.xml b/app/src/main/res/drawable/ic_user_status_away.xml
index ab5ca96420b9..2d822d1a21c1 100644
--- a/app/src/main/res/drawable/ic_user_status_away.xml
+++ b/app/src/main/res/drawable/ic_user_status_away.xml
@@ -1,30 +1,17 @@
-.
+ ~ Nextcloud - Android Client
+ ~
+ ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky
+ ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
-->
-
+ android:strokeLineJoin="round" />
diff --git a/app/src/main/res/drawable/ic_user_status_invisible.xml b/app/src/main/res/drawable/ic_user_status_invisible.xml
index 18a35e8e1862..20cb53c5d3d5 100644
--- a/app/src/main/res/drawable/ic_user_status_invisible.xml
+++ b/app/src/main/res/drawable/ic_user_status_invisible.xml
@@ -1,32 +1,17 @@
-
-
+ ~ SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+.
- -->
+ ~ Nextcloud - Android Client
+ ~
+ ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+ ~ SPDX-License-Identifier: Apache-2.0
+-->
-
-
+ android:autoMirrored="true"
+ android:tint="#262626"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/indicator_dot_not_selected.xml b/app/src/main/res/drawable/indicator_dot_not_selected.xml
index ab1f0e72f97e..f09d25041ace 100644
--- a/app/src/main/res/drawable/indicator_dot_not_selected.xml
+++ b/app/src/main/res/drawable/indicator_dot_not_selected.xml
@@ -1,31 +1,23 @@
-
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/indicator_dot_selected.xml b/app/src/main/res/drawable/indicator_dot_selected.xml
index 26b301aa7ae2..7d618bd48fb0 100644
--- a/app/src/main/res/drawable/indicator_dot_selected.xml
+++ b/app/src/main/res/drawable/indicator_dot_selected.xml
@@ -1,30 +1,22 @@
-
-
-
-
+
+
+
+
diff --git a/app/src/main/res/drawable/online_status.xml b/app/src/main/res/drawable/online_status.xml
index fb042c2d3e0f..dc8d56882d0e 100644
--- a/app/src/main/res/drawable/online_status.xml
+++ b/app/src/main/res/drawable/online_status.xml
@@ -1,21 +1,9 @@
-
diff --git a/app/src/main/res/drawable/photo_pin.xml b/app/src/main/res/drawable/photo_pin.xml
index 0e53ed279c9a..8a119355f19e 100644
--- a/app/src/main/res/drawable/photo_pin.xml
+++ b/app/src/main/res/drawable/photo_pin.xml
@@ -1,23 +1,10 @@
.
+ ~ Nextcloud - Android Client
+ ~
+ ~ SPDX-FileCopyrightText: 2023 ZetaTom
+ ~ SPDX-FileCopyrightText: 2023 Nextcloud GmbH
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
-->
-
-
-
+ android:height="64dp"
+ android:tint="#FFFFFF"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ripple.xml b/app/src/main/res/drawable/ripple.xml
index a626b01f8b3c..b466410efc72 100644
--- a/app/src/main/res/drawable/ripple.xml
+++ b/app/src/main/res/drawable/ripple.xml
@@ -1,23 +1,11 @@
-
+ ~ SPDX-FileCopyrightText: 2022 Álvaro Brey
+ ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
diff --git a/app/src/main/res/drawable/round_bgnd.xml b/app/src/main/res/drawable/round_bgnd.xml
index f4f807528d97..7f1bac3bcbaf 100644
--- a/app/src/main/res/drawable/round_bgnd.xml
+++ b/app/src/main/res/drawable/round_bgnd.xml
@@ -1,24 +1,11 @@
-
+ android:shape="oval">
+
diff --git a/app/src/main/res/drawable/rounded_rect.xml b/app/src/main/res/drawable/rounded_rect.xml
index f91930f933d9..8a68c316f337 100644
--- a/app/src/main/res/drawable/rounded_rect.xml
+++ b/app/src/main/res/drawable/rounded_rect.xml
@@ -1,24 +1,12 @@
-
+ android:shape="rectangle">
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shared_via_link.xml b/app/src/main/res/drawable/shared_via_link.xml
index 10cea077c6de..d5ca0a47e468 100644
--- a/app/src/main/res/drawable/shared_via_link.xml
+++ b/app/src/main/res/drawable/shared_via_link.xml
@@ -1,36 +1,16 @@
-
+ android:width="24dp"
+ android:height="24dp"
+ android:tint="#FF000000"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
-
+ android:fillColor="@android:color/white"
+ android:pathData="M440,680L280,680Q197,680 138.5,621.5Q80,563 80,480Q80,397 138.5,338.5Q197,280 280,280L440,280L440,360L280,360Q230,360 195,395Q160,430 160,480Q160,530 195,565Q230,600 280,600L440,600L440,680ZM320,520L320,440L640,440L640,520L320,520ZM520,680L520,600L680,600Q730,600 765,565Q800,530 800,480Q800,430 765,395Q730,360 680,360L520,360L520,280L680,280Q763,280 821.5,338.5Q880,397 880,480Q880,563 821.5,621.5Q763,680 680,680L520,680Z" />
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shared_via_users.xml b/app/src/main/res/drawable/shared_via_users.xml
index 7b3bfd5b1b74..ec65fbdf60de 100644
--- a/app/src/main/res/drawable/shared_via_users.xml
+++ b/app/src/main/res/drawable/shared_via_users.xml
@@ -1,30 +1,17 @@
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
-
+ android:pathData="M720,880Q670,880 635,845Q600,810 600,760Q600,753 601,745.5Q602,738 604,732L322,568Q305,583 284,591.5Q263,600 240,600Q190,600 155,565Q120,530 120,480Q120,430 155,395Q190,360 240,360Q263,360 284,368.5Q305,377 322,392L604,228Q602,222 601,214.5Q600,207 600,200Q600,150 635,115Q670,80 720,80Q770,80 805,115Q840,150 840,200Q840,250 805,285Q770,320 720,320Q697,320 676,311.5Q655,303 638,288L356,452Q358,458 359,465.5Q360,473 360,480Q360,487 359,494.5Q358,502 356,508L638,672Q655,657 676,648.5Q697,640 720,640Q770,640 805,675Q840,710 840,760Q840,810 805,845Q770,880 720,880Z"
+ android:strokeWidth="8"
+ android:strokeColor="#FFFFFFFF" />
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/split_action_bg.xml b/app/src/main/res/drawable/split_action_bg.xml
deleted file mode 100644
index b449e7fffb1a..000000000000
--- a/app/src/main/res/drawable/split_action_bg.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/uploader_list_separator.xml b/app/src/main/res/drawable/uploader_list_separator.xml
deleted file mode 100644
index 838615eeb5b0..000000000000
--- a/app/src/main/res/drawable/uploader_list_separator.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/whats_new_progress_transition.xml b/app/src/main/res/drawable/whats_new_progress_transition.xml
index d13dc2c04872..e90fbb477029 100644
--- a/app/src/main/res/drawable/whats_new_progress_transition.xml
+++ b/app/src/main/res/drawable/whats_new_progress_transition.xml
@@ -1,24 +1,12 @@
-
\ No newline at end of file
+
diff --git a/app/src/main/res/drawable/white_outline.xml b/app/src/main/res/drawable/white_outline.xml
index e45c7c1477a0..5165c54f0757 100644
--- a/app/src/main/res/drawable/white_outline.xml
+++ b/app/src/main/res/drawable/white_outline.xml
@@ -1,22 +1,10 @@
-
diff --git a/app/src/main/res/layout/activity_manage_space.xml b/app/src/main/res/layout/activity_manage_space.xml
index f5b45d800acc..25358a017f5b 100644
--- a/app/src/main/res/layout/activity_manage_space.xml
+++ b/app/src/main/res/layout/activity_manage_space.xml
@@ -1,21 +1,4 @@
-
diff --git a/app/src/main/res/layout/file_details_share_share_item.xml b/app/src/main/res/layout/file_details_share_share_item.xml
index 807b66f03f1a..1e888f04c425 100644
--- a/app/src/main/res/layout/file_details_share_share_item.xml
+++ b/app/src/main/res/layout/file_details_share_share_item.xml
@@ -4,6 +4,7 @@
~
~ SPDX-FileCopyrightText: 2021 TSI-mc
~ SPDX-FileCopyrightText: 2018 Andy Scherzinger
+ ~ SPDX-FileCopyrightText: 2015 Masensio
- ~ SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
-->
+ android:padding="@dimen/file_download_fragment_layout_padding">
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/alternate_fragment_margin"
+ android:text="@string/downloader_not_downloaded_yet"
+ android:textColor="@color/dark_background_text_color" />
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/fragment_margin"
+ android:layout_marginBottom="@dimen/alternate_fragment_margin"
+ android:gravity="center"
+ android:orientation="horizontal">
-
+
-
+ android:background="@android:color/transparent"
+ android:contentDescription="@string/common_cancel"
+ android:src="@drawable/ic_action_cancel_grey" />
-
+
+ android:id="@+id/error_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_margin="@dimen/zero"
+ android:contentDescription="@string/downloader_download_failed_ticker"
+ android:src="@drawable/image_fail" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_margin="@dimen/file_download_fragment_display_text_margin"
+ android:text="@string/downloader_download_failed_ticker"
+ android:textColor="@color/dark_background_text_color" />
-
diff --git a/app/src/main/res/layout/file_list_actions_bottom_sheet_creator.xml b/app/src/main/res/layout/file_list_actions_bottom_sheet_creator.xml
index 50aafa58aefa..5dc893e0e2a4 100644
--- a/app/src/main/res/layout/file_list_actions_bottom_sheet_creator.xml
+++ b/app/src/main/res/layout/file_list_actions_bottom_sheet_creator.xml
@@ -1,25 +1,11 @@
-
-
+ ~ SPDX-FileCopyrightText: 2019 Tobias Kaminsky
+ ~ SPDX-FileCopyrightText: 2019 Nextcloud GmbH
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+
-
+
diff --git a/app/src/main/res/layout/files_picker.xml b/app/src/main/res/layout/files_picker.xml
index e6ec41d03b8f..b2e754389747 100644
--- a/app/src/main/res/layout/files_picker.xml
+++ b/app/src/main/res/layout/files_picker.xml
@@ -38,11 +38,10 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
-
+ android:background="@color/list_divider_background"/>
diff --git a/app/src/main/res/layout/upload_files_layout.xml b/app/src/main/res/layout/upload_files_layout.xml
index ee799542bc77..baf66ce792ce 100644
--- a/app/src/main/res/layout/upload_files_layout.xml
+++ b/app/src/main/res/layout/upload_files_layout.xml
@@ -39,11 +39,10 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
-
+ android:background="@color/list_divider_background"/>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 0c23e15f1550..e9c749b86943 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,22 +1,9 @@
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index dadd3c215551..4e83c5b7e67c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -39,10 +39,23 @@
%s içinde aramaTümüBir şeyler yazın
+ Bu görevi silmek istediğinize emin misiniz?
+ Görevi silTamamlanamadı
+ Lütfen görev listesi yüklenirken bekleyin
+ Herhangi bir görev yok.Yeni bir görev eklemek için bir görev türü seçin.
+ %s türünde bir görev yok. Sağ alttan yeni bir görev ekleyebilirsiniz.
+ YapılıyorZamanlanmışTamamlanmış
+ Görev oluşturulurken bir sorun çıktı
+ Görev oluşturulduGörev silindi
+ Görev silinirken bir sorun çıktı
+ Görev listesi alınamadı. Lütfen İnternet bağlantınızı denetleyin.
+ Görevi sil
+ Görev türleri alınamadı. Lütfen İnternet bağlantınızı denetleyin.
+ YardımcıBilinmiyorİlişkili hesap bulunamadı!Erişilemedi: %1$s
@@ -242,6 +255,7 @@
Çekmece üst bilgisinin arka plan görseliİşlemlerTüm dosyalar
+ YardımcıSık kullanılanlarOrtamGrup klasörleri
@@ -260,6 +274,7 @@
Otomatik yüklemeUçtan uca şifreleme henüz kurulmamışİnternet bağlantısı olmadan yapılamaz
+ YardımcıDiğerNotlarTalk
@@ -754,6 +769,7 @@
bağlantı ile paylaşılmışSizinle %1$s ile paylaşılmışPaylaşım eklenemedi
+ Paylaşım eklenemedi. Bu dosya ya da klasör bu kişi ya da grup ile zaten paylaşılmış.Fotoğraflar görüntülensinGörüntüler görüntülensinHizmet sağlayıcı ile hesap aç
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b18023e7d3df..d28fe7946729 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,23 +1,15 @@
-
-
@color/secondary_text_color#000000#ffffff
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index 4e355bc10cde..9432e8aec915 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -121,7 +121,6 @@
80dp21dp-8dp
- 1dp40dp40dp72dp
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8a1185081df4..a2777a201eee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,8 +41,8 @@
Task successfully createdAn error occurred while creating the task
- An error occurred while deleting the task
- Task successfully deleted
+ Task successfully deleted
+ An error occurred while deleting the taskType some text
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4068b9e09bed..52cd241ae873 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -274,7 +274,6 @@
@color/actionbar_shadow11
- @drawable/split_action_bg
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index ae3af70d4889..46a06bc220cc 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,22 +1,12 @@
diff --git a/app/src/main/res/xml/syncadapter_files.xml b/app/src/main/res/xml/syncadapter_files.xml
index 805b53ecb776..62b41d6645b8 100644
--- a/app/src/main/res/xml/syncadapter_files.xml
+++ b/app/src/main/res/xml/syncadapter_files.xml
@@ -1,26 +1,13 @@
-
-
-
- * This program is free software: you can redistribute it and/or modify it 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.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License along with this program. If not, see
- * .
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.owncloud.android.utils;
import android.content.Context;
diff --git a/app/src/qa/java/com/owncloud/android/utils/SecurityUtils.java b/app/src/qa/java/com/owncloud/android/utils/SecurityUtils.java
index f3d6ac234b62..721f0269ba16 100644
--- a/app/src/qa/java/com/owncloud/android/utils/SecurityUtils.java
+++ b/app/src/qa/java/com/owncloud/android/utils/SecurityUtils.java
@@ -1,18 +1,8 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Mario Danic Copyright (C) 2018 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify it 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.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License along with this program. If not, see
- * .
+ * SPDX-FileCopyrightText: 2018 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.utils;
diff --git a/app/src/qa/res/drawable/ic_launcher_foreground.xml b/app/src/qa/res/drawable/ic_launcher_foreground.xml
index a7431eddd360..5250f0fd5e66 100644
--- a/app/src/qa/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/qa/res/drawable/ic_launcher_foreground.xml
@@ -1,22 +1,10 @@
+ ~ Nextcloud - Android Client
+ ~
+ ~ SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH, all rights reserved
+ ~ SPDX-FileCopyrightText: 2023 Andy Scherzinger
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.etm
diff --git a/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt b/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt
index 3bc9c77d665d..a243e8e18b36 100644
--- a/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt
+++ b/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt
@@ -1,21 +1,8 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.jobs
diff --git a/app/src/test/java/com/nextcloud/client/mixins/MixinRegistryTest.kt b/app/src/test/java/com/nextcloud/client/mixins/MixinRegistryTest.kt
index d8be6f8a22e0..20299ecbcec8 100644
--- a/app/src/test/java/com/nextcloud/client/mixins/MixinRegistryTest.kt
+++ b/app/src/test/java/com/nextcloud/client/mixins/MixinRegistryTest.kt
@@ -1,22 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- * Copyright (C) 2020 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.mixins
diff --git a/app/src/test/java/com/nextcloud/client/mixins/SessionMixinTest.kt b/app/src/test/java/com/nextcloud/client/mixins/SessionMixinTest.kt
index 1f1b979cdddc..97c5dac4b1fe 100644
--- a/app/src/test/java/com/nextcloud/client/mixins/SessionMixinTest.kt
+++ b/app/src/test/java/com/nextcloud/client/mixins/SessionMixinTest.kt
@@ -1,22 +1,9 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Chris Narkiewicz
- * Copyright (C) 2020 Chris Narkiewicz
- * Copyright (C) 2020 Nextcloud GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2020 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.mixins
diff --git a/app/src/versionDev/java/com/owncloud/android/utils/PushUtils.java b/app/src/versionDev/java/com/owncloud/android/utils/PushUtils.java
index 8bbea47ab12d..f78017106aa8 100644
--- a/app/src/versionDev/java/com/owncloud/android/utils/PushUtils.java
+++ b/app/src/versionDev/java/com/owncloud/android/utils/PushUtils.java
@@ -1,25 +1,10 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * @author Chris Narkiewicz
- * Copyright (C) 2017 Mario Danic
- * Copyright (C) 2019 Chris Narkiewicz
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2017 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.owncloud.android.utils;
import android.content.Context;
diff --git a/app/src/versionDev/java/com/owncloud/android/utils/SecurityUtils.java b/app/src/versionDev/java/com/owncloud/android/utils/SecurityUtils.java
index 3f25b7cdd1be..721f0269ba16 100644
--- a/app/src/versionDev/java/com/owncloud/android/utils/SecurityUtils.java
+++ b/app/src/versionDev/java/com/owncloud/android/utils/SecurityUtils.java
@@ -1,21 +1,8 @@
-/**
- * Nextcloud Android client application
+/*
+ * Nextcloud - Android Client
*
- * @author Mario Danic
- * Copyright (C) 2018 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * SPDX-FileCopyrightText: 2018 Mario Danic
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.utils;
diff --git a/app/src/versionDev/res/drawable-v26/ic_launcher_foreground.xml b/app/src/versionDev/res/drawable-v26/ic_launcher_foreground.xml
index 4533da459d0a..eb2b299859d5 100644
--- a/app/src/versionDev/res/drawable-v26/ic_launcher_foreground.xml
+++ b/app/src/versionDev/res/drawable-v26/ic_launcher_foreground.xml
@@ -1,22 +1,10 @@
+ ~ Nextcloud - Android Client
+ ~
+ ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH, all rights reserved
+ ~ SPDX-FileCopyrightText: 2017 Andy Scherzinger
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
.
- -->
+ ~ Nextcloud - Android Client
+ ~
+ ~ SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH, all rights reserved
+ ~ SPDX-FileCopyrightText: 2023 Andy Scherzinger
+ ~ SPDX-License-Identifier: AGPL-3.0-or-later
+-->
-
diff --git a/drawable_resources/circles.svg.license b/drawable_resources/circles.svg.license
deleted file mode 100644
index 44627ac066e9..000000000000
--- a/drawable_resources/circles.svg.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH, all rights reserved
-SPDX-License-Identifier: AGPL-3.0-or-later