From afa0cb5f0010326a1cad9e58885be8ca9bcab33c Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 8 Apr 2024 14:32:44 +0200 Subject: [PATCH] Add SPDX header Signed-off-by: Andy Scherzinger --- .../uiautomator/InitialTest.java | 2 +- .../ui/dialog/ConfirmationDialogFragment.kt | 18 ++++------ .../ui/dialog/ConflictsResolveDialog.java | 25 ++++--------- .../ui/dialog/RemoveFilesDialogFragment.java | 25 +++++-------- .../ui/dialog/RenameFileDialogFragment.java | 36 +++++-------------- .../android/ui/dialog/ShareLinkToDialog.java | 23 ++++-------- .../ui/dialog/SslUntrustedCertDialog.java | 36 +++++++------------ .../android/ui/dialog/SsoWebView.java | 24 +++---------- .../helpers/SparseBooleanArrayParcelable.java | 25 ++++--------- 9 files changed, 60 insertions(+), 154 deletions(-) diff --git a/app/src/androidTest/disabledTests/uiautomator/InitialTest.java b/app/src/androidTest/disabledTests/uiautomator/InitialTest.java index 500adf74b1..6f285949c1 100644 --- a/app/src/androidTest/disabledTests/uiautomator/InitialTest.java +++ b/app/src/androidTest/disabledTests/uiautomator/InitialTest.java @@ -3,7 +3,7 @@ * * SPDX-FileCopyrightText: 2018 Tobias Kaminsky * SPDX-FileCopyrightText: 2015 ownCloud Inc. - * SPDX-License-Identifier: GPL-2.0-only + * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later */ package com.owncloud.android.uiautomator; diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.kt index d0fd56c1e0..461e0c5aa5 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.kt @@ -1,17 +1,11 @@ /* - * ownCloud Android client application + * Nextcloud - Android Client * - * Copyright (C) 2012 Bartek Przybylski 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: 2023 Alper Ozturk + * SPDX-FileCopyrightText: 2020-2022 Tobias Kaminsky + * SPDX-FileCopyrightText: 2015 ownCloud Inc. + * SPDX-FileCopyrightText: 2012 Bartosz Przybylski + * 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/ConflictsResolveDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java index c23e14478d..56eeeea56f 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java +++ b/app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java @@ -1,24 +1,12 @@ /* - * ownCloud Android client application - * - * @author Bartek Przybylski - * Copyright (C) 2012 Bartek Przybylski - * 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: 2020-2022 Tobias Kaminsky + * SPDX-FileCopyrightText: 2015 ownCloud Inc. + * SPDX-FileCopyrightText: 2012 Bartosz Przybylski + * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later */ - package com.owncloud.android.ui.dialog; import android.app.Dialog; @@ -58,7 +46,6 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; - /** * Dialog which will be displayed to user upon keep-in-sync file conflict. */ diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java index 47012eb708..e8ec640f96 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java @@ -1,22 +1,14 @@ /* - * ownCloud Android client application + * Nextcloud - Android Client * - * @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 . + * SPDX-FileCopyrightText: 2023 Alper Ozturk + * SPDX-FileCopyrightText: 2018 Andy Scherzinger + * SPDX-FileCopyrightText: 2018 Jessie Chatham Spencer + * SPDX-FileCopyrightText: 2016-2022 Tobias Kaminsky + * SPDX-FileCopyrightText: 2015 ownCloud Inc. + * SPDX-FileCopyrightText: 2015 David A. Velasco + * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later */ - package com.owncloud.android.ui.dialog; import android.app.Dialog; @@ -38,7 +30,6 @@ import androidx.appcompat.app.AlertDialog; /** * Dialog requiring confirmation before removing a collection of given OCFiles. - *

* Triggers the removal according to the user response. */ public class RemoveFilesDialogFragment extends ConfirmationDialogFragment implements diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java index 005ce81ae8..8572166cef 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java @@ -1,31 +1,15 @@ /* - * ownCloud Android client application - * - * @author David A. Velasco - * Copyright (C) 2014 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 Andy Scherzinger + * SPDX-FileCopyrightText: 2017-2022 Tobias Kaminsky + * SPDX-FileCopyrightText: 2014 ownCloud Inc. + * SPDX-FileCopyrightText: 2014 David A. Velasco + * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later */ - package com.owncloud.android.ui.dialog; -/* - * Dialog to input a new name for an {@link OCFile} being renamed. - * - * Triggers the rename operation. - */ - import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; @@ -59,11 +43,9 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; - /** - * Dialog to input a new name for a file or folder to rename. - *

- * Triggers the rename operation when name is confirmed. + * Dialog to input a new name for an {@link OCFile} being renamed. + * Triggers the rename operation. */ public class RenameFileDialogFragment extends DialogFragment implements DialogInterface.OnClickListener, TextWatcher, Injectable { diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java index b467f7c2c2..0ed3cf1234 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java +++ b/app/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java @@ -1,23 +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: 2017-2018 Andy Scherzinger + * SPDX-FileCopyrightText: 2017-2018 Tobias Kaminsky + * SPDX-FileCopyrightText: 2015 ownCloud Inc. + * SPDX-FileCopyrightText: 2015 David A. Velasco + * SPDX-License-Identifier: GPL-2.0-only AND 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/SslUntrustedCertDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java index 1fa774010c..f1501d5c6d 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java +++ b/app/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java @@ -1,22 +1,14 @@ -/** - * ownCloud Android client application - * - * @author masensio - * @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: 2022 Álvaro Brey + * SPDX-FileCopyrightText: 2018-2022 Andy Scherzinger + * SPDX-FileCopyrightText: 2020 Stefan Niedermann + * SPDX-FileCopyrightText: 2018 Tobias Kaminsky + * SPDX-FileCopyrightText: 2015 ownCloud Inc. + * SPDX-FileCopyrightText: 2014 David A. Velasco + * SPDX-FileCopyrightText: 2014 Masensio + * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later */ package com.owncloud.android.ui.dialog; @@ -53,11 +45,9 @@ import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; /** - * Dialog to show information about an untrusted certificate and allow the user - * to decide trust on it or not. - * - * Abstract implementation of common functionality for different dialogs that - * get the information about the error and the certificate from different classes. + * Dialog to show information about an untrusted certificate and allow the user to decide trust on it or not. + * Abstract implementation of common functionality for different dialogs that get the information about the error and + * the certificate from different classes. */ public class SslUntrustedCertDialog extends DialogFragment implements Injectable { diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/SsoWebView.java b/app/src/main/java/com/owncloud/android/ui/dialog/SsoWebView.java index dae43f8eeb..7cb8714955 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/SsoWebView.java +++ b/app/src/main/java/com/owncloud/android/ui/dialog/SsoWebView.java @@ -1,22 +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: 2015 ownCloud Inc. + * SPDX-FileCopyrightText: 2013 David A. Velasco + * SPDX-License-Identifier: GPL-2.0-only */ - package com.owncloud.android.ui.dialog; import android.content.Context; @@ -37,6 +25,4 @@ public class SsoWebView extends WebView { public boolean onCheckIsTextEditor () { return false; } - } - diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/SparseBooleanArrayParcelable.java b/app/src/main/java/com/owncloud/android/ui/helpers/SparseBooleanArrayParcelable.java index 00399a6abc..8c3897c55f 100644 --- a/app/src/main/java/com/owncloud/android/ui/helpers/SparseBooleanArrayParcelable.java +++ b/app/src/main/java/com/owncloud/android/ui/helpers/SparseBooleanArrayParcelable.java @@ -1,23 +1,10 @@ -/** - * ownCloud Android client application - * - * @author David A. Velasco - * Copyright (C) 2016 ownCloud 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: 2016 David A. Velasco + * SPDX-FileCopyrightText: 2016 ownCloud GmbH + * SPDX-License-Identifier: GPL-2.0-only */ - package com.owncloud.android.ui.helpers; import android.os.Parcel; @@ -25,7 +12,7 @@ import android.os.Parcelable; import android.util.SparseBooleanArray; /** - * Wraps a SparseBooleanArrayParcelable to allow its serialization and desearialization + * Wraps a SparseBooleanArrayParcelable to allow its serialization and de-searialization * through {@link Parcelable} interface. */ public class SparseBooleanArrayParcelable implements Parcelable {