Skip to content

Commit

Permalink
Merge pull request #12848 from nextcloud/chore/noid/spdxHeaderFinal
Browse files Browse the repository at this point in the history
Add missing SPDX header and check
  • Loading branch information
AndyScherzinger authored Apr 9, 2024
2 parents dedef1e + 9b085e5 commit 177ffc9
Show file tree
Hide file tree
Showing 49 changed files with 331 additions and 968 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/reuse.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# synced from @nextcloud/android-config

# SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. <https://fsfe.org>
#
# SPDX-License-Identifier: CC0-1.0

name: REUSE Compliance Check

on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: REUSE Compliance Check
uses: fsfe/reuse-action@a46482ca367aef4454a87620aa37c2be4b2f8106 # v3.0.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-->
# [Nextcloud](https://nextcloud.com) Android app :iphone:

[![Build Status](https://drone.nextcloud.com/api/badges/nextcloud/android/status.svg)](https://drone.nextcloud.com/nextcloud/android) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/80401cb343854343b4d94acbfb72d3ec)](https://www.codacy.com/app/Nextcloud/android?utm_source=github.com\&utm_medium=referral\&utm_content=nextcloud/android\&utm_campaign=Badge_Grade) [![Releases](https://img.shields.io/github/release/nextcloud/android.svg)](https://github.com/nextcloud/android/releases/latest)
[![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/android)](https://api.reuse.software/info/github.com/nextcloud/android) [![Build Status](https://drone.nextcloud.com/api/badges/nextcloud/android/status.svg)](https://drone.nextcloud.com/nextcloud/android) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/80401cb343854343b4d94acbfb72d3ec)](https://www.codacy.com/app/Nextcloud/android?utm_source=github.com\&utm_medium=referral\&utm_content=nextcloud/android\&utm_campaign=Badge_Grade) [![Releases](https://img.shields.io/github/release/nextcloud/android.svg)](https://github.com/nextcloud/android/releases/latest)

[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
alt="Download from Google Play"
Expand Down
56 changes: 0 additions & 56 deletions THIRD_PARTY.txt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-FileCopyrightText: 2019-2020 Tobias Kaminsky <[email protected]>
* SPDX-FileCopyrightText: 2019 Chris Narkiewicz <[email protected]>
* SPDX-FileCopyrightText: 2015 ownCloud Inc.
* SPDX-FileCopyrightText: 2016 Juan Carlos González Cabrero <[email protected]
* SPDX-FileCopyrightText: 2016 Juan Carlos González Cabrero <[email protected]>
* SPDX-FileCopyrightText: 2015 David A. Velasco <[email protected]>
* SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
* SPDX-FileCopyrightText: 2019 Tobias Kaminsky <[email protected]>
* SPDX-FileCopyrightText: 2016-2018 Andy Scherzinger <[email protected]>
* SPDX-FileCopyrightText: 2016 ownCloud Inc.
* SPDX-FileCopyrightText: 2015 María Asensio Valverde <[email protected]>
* SPDX-FileCopyrightText: 2015 David A. Velasco <[email protected]>
* SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/

package com.owncloud.android.services;

import android.accounts.Account;
Expand Down Expand Up @@ -44,7 +36,6 @@

/**
* 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()}.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
* SPDX-FileCopyrightText: 2020 Tobias Kaminsky <[email protected]>
* SPDX-FileCopyrightText: 2019 Andy Scherzinger <[email protected]>
* SPDX-FileCopyrightText: 2015 ownCloud Inc.
* SPDX-FileCopyrightText: 2015 María Asensio Valverde <[email protected]>
* SPDX-FileCopyrightText: 2015 David A. Velasco <[email protected]>
* SPDX-FileCopyrightText: 2011-2012 Bartosz Przybylski <[email protected]>
* SPDX-FileCopyrightText: 2011 Sven Aßmann <[email protected]>
* SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/

package com.owncloud.android.syncadapter;

import android.accounts.Account;
Expand All @@ -42,9 +32,8 @@
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
* SPDX-FileCopyrightText: 2021 Chris Narkiewicz <[email protected]>
* SPDX-FileCopyrightText: 2018 Andy Scherzinger <[email protected]>
* SPDX-FileCopyrightText: 2015 ownCloud Inc.
* SPDX-FileCopyrightText: 2015 María Asensio Valverde <[email protected]>
* SPDX-FileCopyrightText: 2013-2015 David A. Velasco <[email protected]>
* SPDX-FileCopyrightText: 2011-2012 Bartosz Przybylski <[email protected]>
* SPDX-FileCopyrightText: 2011 Sven Aßmann <[email protected]>
* SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/

package com.owncloud.android.syncadapter;

import android.accounts.Account;
Expand Down Expand Up @@ -63,9 +54,7 @@
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)}.
*/
Expand All @@ -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() +
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
* SPDX-FileCopyrightText: 2019 Andy Scherzinger <[email protected]>
* SPDX-FileCopyrightText: 2015 ownCloud Inc.
* SPDX-FileCopyrightText: 2013 David A. Velasco <[email protected]>
* SPDX-FileCopyrightText: 2011-2012 Bartosz Przybylski <[email protected]>
* SPDX-FileCopyrightText: 2011 Sven Aßmann <[email protected]>
* SPDX-License-Identifier: GPL-2.0-only AND AGPL-3.0-or-later
*/
package com.owncloud.android.syncadapter;

Expand All @@ -37,7 +28,7 @@
* 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
Expand All @@ -64,6 +55,6 @@ public void onCreate() {
*/
@Override
public IBinder onBind(Intent intent) {
return syncAdapter.getSyncAdapterBinder();
return syncAdapter.getSyncAdapterBinder();
}
}

This file was deleted.

Loading

0 comments on commit 177ffc9

Please sign in to comment.