From 7c055f28ca3ec9c7db6935059953f8772c643f95 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 9 Apr 2024 11:59:39 +0200 Subject: [PATCH] Add SPDX header Signed-off-by: Andy Scherzinger --- .../android/services/SyncFolderHandler.java | 25 +++++-------- .../AbstractOwnCloudSyncAdapter.java | 35 +++++++----------- .../android/syncadapter/FileSyncAdapter.java | 36 +++++++------------ .../android/syncadapter/FileSyncService.java | 29 ++++++--------- .../android/ui/activity/ComponentsGetter.java | 31 +++++----------- .../ui/activity/ConflictsResolveActivity.kt | 20 ++++------- 6 files changed, 56 insertions(+), 120 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/services/SyncFolderHandler.java b/app/src/main/java/com/owncloud/android/services/SyncFolderHandler.java index 32ef8f656a..917b79a3ed 100644 --- a/app/src/main/java/com/owncloud/android/services/SyncFolderHandler.java +++ b/app/src/main/java/com/owncloud/android/services/SyncFolderHandler.java @@ -1,22 +1,14 @@ /* - * ownCloud Android client application - * - * 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: 2020 Chris Narkiewicz + * SPDX-FileCopyrightText: 2019 Tobias Kaminsky + * SPDX-FileCopyrightText: 2016-2018 Andy Scherzinger + * SPDX-FileCopyrightText: 2016 ownCloud Inc. + * SPDX-FileCopyrightText: 2015 María Asensio Valverde + * SPDX-FileCopyrightText: 2015 David A. Velasco + * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later */ - package com.owncloud.android.services; import android.accounts.Account; @@ -44,7 +36,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager; /** * SyncFolder worker. Performs the pending operations in the order they were requested. - * * Created with the Looper of a new thread, started in * {@link com.owncloud.android.services.OperationsService#onCreate()}. */ diff --git a/app/src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/app/src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java index 56ba67d90f..3956b84b7a 100644 --- a/app/src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java +++ b/app/src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java @@ -1,26 +1,16 @@ /* - * ownCloud Android client application + * Nextcloud - Android Client * - * @author sassman - * @author David A. Velasco - * @author Andy Scherzinger - * Copyright (C) 2011 Bartek Przybylski - * Copyright (C) 2015 ownCloud Inc. - * Copyright (C) 2019 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: 2021 Chris Narkiewicz + * SPDX-FileCopyrightText: 2020 Tobias Kaminsky + * SPDX-FileCopyrightText: 2019 Andy Scherzinger + * SPDX-FileCopyrightText: 2015 ownCloud Inc. + * SPDX-FileCopyrightText: 2015 María Asensio Valverde + * SPDX-FileCopyrightText: 2015 David A. Velasco + * SPDX-FileCopyrightText: 2011-2012 Bartosz Przybylski + * SPDX-FileCopyrightText: 2011 Sven Aßmann + * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later */ - package com.owncloud.android.syncadapter; import android.accounts.Account; @@ -42,9 +32,8 @@ import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundExce import java.io.IOException; /** - * Base synchronization adapter for ownCloud designed to be subclassed for different - * resource types, like FileSync, ConcatsSync, CalendarSync, etc.. - * + * Base synchronization adapter for Nextcloud designed to be subclassed for different + * resource types, like FileSync, ContactsSync, CalendarSync, etc. * Implements the standard {@link AbstractThreadedSyncAdapter}. */ abstract class AbstractOwnCloudSyncAdapter extends diff --git a/app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java b/app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java index 69917018f6..1dc10c93d8 100644 --- a/app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java +++ b/app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java @@ -1,25 +1,16 @@ -/** - * ownCloud Android client application - * - * @author Bartek Przybylski - * @author David A. Velasco - * Copyright (C) 2011 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: 2022 Tobias Kaminsky + * SPDX-FileCopyrightText: 2021 Chris Narkiewicz + * SPDX-FileCopyrightText: 2018 Andy Scherzinger + * SPDX-FileCopyrightText: 2015 ownCloud Inc. + * SPDX-FileCopyrightText: 2015 María Asensio Valverde + * SPDX-FileCopyrightText: 2013-2015 David A. Velasco + * SPDX-FileCopyrightText: 2011-2012 Bartosz Przybylski + * SPDX-FileCopyrightText: 2011 Sven Aßmann + * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later */ - package com.owncloud.android.syncadapter; import android.accounts.Account; @@ -63,9 +54,7 @@ import androidx.core.app.NotificationCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; /** - * Implementation of {@link AbstractThreadedSyncAdapter} responsible for synchronizing - * ownCloud files. - * + * Implementation of {@link AbstractThreadedSyncAdapter} responsible for synchronizing Nextcloud files. * Performs a full synchronization of the account received in {@link #onPerformSync(Account, Bundle, * String, ContentProviderClient, SyncResult)}. */ @@ -77,7 +66,6 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { * the synchronization operation */ private static final int MAX_FAILED_RESULTS = 3; - public static final String EVENT_FULL_SYNC_START = FileSyncAdapter.class.getName() + ".EVENT_FULL_SYNC_START"; public static final String EVENT_FULL_SYNC_END = FileSyncAdapter.class.getName() + diff --git a/app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java b/app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java index 35477bc584..030c6c3ea4 100644 --- a/app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java +++ b/app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java @@ -1,22 +1,13 @@ /* - * ownCloud Android client application + * Nextcloud - Android Client * - * @author Bartek Przybylski - * @author David A. Velasco - * Copyright (C) 2011 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: 2021 Chris Narkiewicz + * SPDX-FileCopyrightText: 2019 Andy Scherzinger + * SPDX-FileCopyrightText: 2015 ownCloud Inc. + * SPDX-FileCopyrightText: 2013 David A. Velasco + * SPDX-FileCopyrightText: 2011-2012 Bartosz Przybylski + * SPDX-FileCopyrightText: 2011 Sven Aßmann + * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later */ package com.owncloud.android.syncadapter; @@ -37,7 +28,7 @@ import dagger.android.AndroidInjection; * Serves as a connector to an instance of {@link FileSyncAdapter}, as required by standard Android APIs. */ public class FileSyncService extends Service { - + // Storage for an instance of the sync adapter private static FileSyncAdapter syncAdapter; // Object to use as a thread-safe lock @@ -64,6 +55,6 @@ public class FileSyncService extends Service { */ @Override public IBinder onBind(Intent intent) { - return syncAdapter.getSyncAdapterBinder(); + return syncAdapter.getSyncAdapterBinder(); } } diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ComponentsGetter.java b/app/src/main/java/com/owncloud/android/ui/activity/ComponentsGetter.java index 6cc7c6209c..05ebeae9f6 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/ComponentsGetter.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/ComponentsGetter.java @@ -1,23 +1,13 @@ -/** - * ownCloud Android client application - * - * Copyright (C) 2012 Bartek Przybylski - * 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: 2024 Alper Ozturk + * SPDX-FileCopyrightText: 2016 ownCloud Inc. + * SPDX-FileCopyrightText: 2015 María Asensio Valverde + * SPDX-FileCopyrightText: 2014 David A. Velasco + * SPDX-FileCopyrightText: 2012 Bartosz Przybylski + * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later */ - package com.owncloud.android.ui.activity; import com.nextcloud.client.jobs.download.FileDownloadWorker; @@ -34,24 +24,19 @@ public interface ComponentsGetter { */ public FileDownloadWorker.FileDownloadProgressListener getFileDownloadProgressListener(); - /** * To be invoked when the parent activity is fully created to get a reference * to the FileUploader service API. */ public FileUploadHelper getFileUploaderHelper(); - /** * To be invoked when the parent activity is fully created to get a reference * to the OperationsService service API. */ public OperationsServiceBinder getOperationsServiceBinder(); - public FileDataStorageManager getStorageManager(); public FileOperationsHelper getFileOperationsHelper(); - - } diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt index 0b55719087..31a85c9eeb 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt @@ -1,18 +1,11 @@ /* - * ownCloud Android client application + * Nextcloud - Android Client * - * @author Bartek Przybylski - * @author David A. Velasco Copyright (C) 2012 Bartek Przybylski 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 - * . + * SPDX-FileCopyrightText: 2024 Jonas Mayer + * SPDX-FileCopyrightText: 2024 Alper Ozturk + * SPDX-FileCopyrightText: 2019 Alice Gaudon + * SPDX-FileCopyrightText: 2012 Bartosz Przybylski + * SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later */ package com.owncloud.android.ui.activity @@ -45,7 +38,6 @@ import javax.inject.Inject * Wrapper activity which will be launched if keep-in-sync file will be modified by external application. */ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener { - @JvmField @Inject var uploadsStorageManager: UploadsStorageManager? = null