opensourcemirror
/
nextcloud-android
mirror of https://github.com/nextcloud/android.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add SPDX header 

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2024-04-09 11:59:39 +02:00
parent dedef1ef51
commit 7c055f28ca
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
6 changed files with 56 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/com/owncloud/android/services/SyncFolderHandler.java
View File

@ -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 <http://www.gnu.org/licenses/>.
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2020 Chris Narkiewicz <hello@ezaquarii.com>
* SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
* SPDX-FileCopyrightText: 2016-2018 Andy Scherzinger <info@andy-scherzinger.de>
* SPDX-FileCopyrightText: 2016 ownCloud Inc.
* SPDX-FileCopyrightText: 2015 María Asensio Valverde <masensio@solidgear.es>
* SPDX-FileCopyrightText: 2015 David A. Velasco <dvelasco@solidgear.es>
* 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()}.
*/

35
app/src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
View File

@ -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 <http://www.gnu.org/licenses/>.
* SPDX-FileCopyrightText: 2021 Chris Narkiewicz <hello@ezaquarii.com>
* SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
* SPDX-FileCopyrightText: 2019 Andy Scherzinger <info@andy-scherzinger.de>
* SPDX-FileCopyrightText: 2015 ownCloud Inc.
* SPDX-FileCopyrightText: 2015 María Asensio Valverde <masensio@solidgear.es>
* SPDX-FileCopyrightText: 2015 David A. Velasco <dvelasco@solidgear.es>
* SPDX-FileCopyrightText: 2011-2012 Bartosz Przybylski <bart.p.pl@gmail.com>
* SPDX-FileCopyrightText: 2011 Sven Aßmann <sven.assmann@lubico.biz>
* 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

36
app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java
View File

@ -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 <http://www.gnu.org/licenses/>.
/*
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2022 Tobias Kaminsky <tobias@kaminsky.me>
* SPDX-FileCopyrightText: 2021 Chris Narkiewicz <hello@ezaquarii.com>
* SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
* SPDX-FileCopyrightText: 2015 ownCloud Inc.
* SPDX-FileCopyrightText: 2015 María Asensio Valverde <masensio@solidgear.es>
* SPDX-FileCopyrightText: 2013-2015 David A. Velasco <dvelasco@solidgear.es>
* SPDX-FileCopyrightText: 2011-2012 Bartosz Przybylski <bart.p.pl@gmail.com>
* SPDX-FileCopyrightText: 2011 Sven Aßmann <sven.assmann@lubico.biz>
* 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() +

29
app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java
View File

@ -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 <http://www.gnu.org/licenses/>.
* SPDX-FileCopyrightText: 2021 Chris Narkiewicz <hello@ezaquarii.com>
* SPDX-FileCopyrightText: 2019 Andy Scherzinger <info@andy-scherzinger.de>
* SPDX-FileCopyrightText: 2015 ownCloud Inc.
* SPDX-FileCopyrightText: 2013 David A. Velasco <dvelasco@solidgear.es>
* SPDX-FileCopyrightText: 2011-2012 Bartosz Przybylski <bart.p.pl@gmail.com>
* SPDX-FileCopyrightText: 2011 Sven Aßmann <sven.assmann@lubico.biz>
* 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();
}
}

31
app/src/main/java/com/owncloud/android/ui/activity/ComponentsGetter.java
View File

@ -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 <http://www.gnu.org/licenses/>.
/*
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2024 Alper Ozturk <alper_ozturk@proton.me>
* SPDX-FileCopyrightText: 2016 ownCloud Inc.
* SPDX-FileCopyrightText: 2015 María Asensio Valverde <masensio@solidgear.es>
* SPDX-FileCopyrightText: 2014 David A. Velasco <dvelasco@solidgear.es>
* SPDX-FileCopyrightText: 2012 Bartosz Przybylski <bart.p.pl@gmail.com>
* 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();
}

20
app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt
View File

@ -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.
* <p>
* 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.
* <p>
* 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.
* <p/>
* You should have received a copy of the GNU General Public License along with this program. If not, see
* <http://www.gnu.org/licenses/>.
* SPDX-FileCopyrightText: 2024 Jonas Mayer <jonas.a.mayer@gmx.net>
* SPDX-FileCopyrightText: 2024 Alper Ozturk <alper_ozturk@proton.me>
* SPDX-FileCopyrightText: 2019 Alice Gaudon <alice@gaudon.pro>
* SPDX-FileCopyrightText: 2012 Bartosz Przybylski <bart.p.pl@gmail.com>
* 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