Merge pull request #12803 from nextcloud/chore/noid/spdxHeader15

Add SPDX header

app/src/main/aidl/com/nextcloud/android/sso/aidl/IInputStreamService.aidl

@@ -1,20 +1,14 @@
-/***
+/*
-	Copyright (c) 2008-2011 CommonsWare, LLC
+ * Nextcloud - Android Client
-	Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ *
-	use this file except in compliance with the License. You may obtain	a copy
+ * SPDX-FileCopyrightText: 2008-2011 CommonsWare, LLC
-	of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless required
+ * SPDX-License-Identifier: Apache-2.0
-	by applicable law or agreed to in writing, software distributed under the
+ *
-	License is distributed on an "AS IS" BASIS,	WITHOUT	WARRANTIES OR CONDITIONS
+ * From _The Busy Coder's Guide to Advanced Android Development_
-	OF ANY KIND, either express or implied. See the License for the specific
+ * http://commonsware.com/AdvAndroid
-	language governing permissions and limitations under the License.
+ *
-
+ * More information here: https://github.com/abeluck/android-streams-ipc
-	From _The Busy Coder's Guide to Advanced Android Development_
-		http://commonsware.com/AdvAndroid
-
-
-	More information here: https://github.com/abeluck/android-streams-ipc
  */
-
 package com.nextcloud.android.sso.aidl;
 
 // Declare the interface.

app/src/main/java/com/nextcloud/android/sso/Constants.java

@@ -1,27 +1,11 @@
 /*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- * @author David Luhmer
+ * SPDX-FileCopyrightText: 2019 David Luhmer <david-dev@live.de>
- * @author Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
- * @author Edvard Holst
+ * SPDX-FileCopyrightText: 2019 Edvard Holst <edvard.holst@gmail.com>
- * Copyright (C) 2019 David Luhmer
+ * SPDX-License-Identifier: AGPL-3.0-or-later
- * Copyright (C) 2019 Tobias Kaminsky
- * Copyright (C) 2019 Edvard Holst
- *
- * 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 <http://www.gnu.org/licenses/>.
  */
-
 package com.nextcloud.android.sso;
 
 public final class Constants {

app/src/main/java/com/nextcloud/android/sso/InputStreamBinder.java

@@ -2,7 +2,7 @@
  * Nextcloud SingleSignOn
  *
  * @author David Luhmer
- * Copyright (C) 2019 David Luhmer
+ * Copyright (C) 2019 David Luhmer <david-dev@live.de>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

app/src/main/java/com/nextcloud/android/sso/aidl/IThreadListener.java

@@ -1,7 +1,7 @@
 /*
  *  Nextcloud SingleSignOn
  *
- *  @author David Luhmer
+ *  @author David Luhmer <david-dev@live.de>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

app/src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java

@@ -9,7 +9,7 @@
 /*
  *  Nextcloud SingleSignOn
  *
- *  @author David Luhmer
+ *  @author David Luhmer <david-dev@live.de>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

app/src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java

@@ -1,7 +1,7 @@
 /*
  *  Nextcloud SingleSignOn
  *
- *  @author David Luhmer
+ *  @author David Luhmer <david-dev@live.de>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

app/src/main/java/com/owncloud/android/services/AccountManagerService.java

@@ -1,7 +1,7 @@
 /*
  *  Nextcloud SingleSignOn
  *
- *  @author David Luhmer
+ *  @author David Luhmer <david-dev@live.de>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

app/src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java

@@ -1,20 +1,8 @@
 /*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities;
 

app/src/main/java/com/owncloud/android/ui/activities/ActivitiesContract.java

@@ -1,20 +1,8 @@
 /*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities;
 

app/src/main/java/com/owncloud/android/ui/activities/ActivitiesPresenter.java

@@ -1,22 +1,9 @@
 /*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- * Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- * 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 <http://www.gnu.org/licenses/>.
  */
-
 package com.owncloud.android.ui.activities;
 
 import com.nextcloud.common.NextcloudClient;

app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesRepository.java

@@ -1,20 +1,8 @@
-/**
+/*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities.data.activities;
 

app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApi.java

@@ -1,20 +1,8 @@
 /*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities.data.activities;
 

app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java

@@ -1,24 +1,9 @@
 /*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   @author Edvard Holst
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
- *   @author Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
- *   Copyright (C) 2018 Edvard Holst
- *   Copyright (C) 2019 Chris Narkiewicz <hello@ezaquarii.com>
- *
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities.data.activities;
 

app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivityRepositories.java

@@ -1,20 +1,8 @@
 /*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities.data.activities;
 

app/src/main/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepository.java

@@ -1,20 +1,8 @@
-/**
+/*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities.data.activities;
 

app/src/main/java/com/owncloud/android/ui/activities/data/files/FileRepositories.java

@@ -1,20 +1,8 @@
 /*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities.data.files;
 

app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesRepository.java

@@ -1,20 +1,8 @@
-/**
+/*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities.data.files;
 

app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApi.java

@@ -1,20 +1,8 @@
-/**
+/*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities.data.files;
 

app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApiImpl.java

@@ -1,24 +1,9 @@
 /*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   @author Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
- *   @author Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
- *   Copyright (C) 2018 Edvard Holst
- *   Copyright (C) 2019 Chris Narkiewicz <hello@ezaquarii.com>
- *
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities.data.files;
 

app/src/main/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepository.java

@@ -1,20 +1,8 @@
-/**
+/*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities.data.files;
 

app/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java

@@ -3,7 +3,7 @@
  *
  * @author David Luhmer
  * @author Andy Scherzinger
- * Copyright (C) 2018 David Luhmer
+ * Copyright (C) 2018 David Luhmer <david-dev@live.de>
  * Copyright (C) 2018 Andy Scherzinger
  *
  * This program is free software: you can redistribute it and/or modify

app/src/main/java/third_parties/aosp/SQLiteTokenizer.java

@@ -1,21 +1,10 @@
-package third_parties.aosp;
-
 /*
- * Copyright (C) 2019 The Android Open Source Project
+ * Nextcloud - Android Client
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * SPDX-FileCopyrightText: 2019 The Android Open Source Project
- * you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
-
+package third_parties.aosp;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/third_parties/sufficientlysecure/ProcessVEvent.java

@@ -1,22 +1,11 @@
 /*
- *  Copyright (C) 2015  Jon Griffiths (jon_p_griffiths@yahoo.com)
+ * Nextcloud - Android Client
- *  Copyright (C) 2013  Dominik Schürmann <dominik@dominikschuermann.de>
- *  Copyright (C) 2010-2011  Lukas Aichbauer
  *
- *  This program is free software: you can redistribute it and/or modify
+ * SPDX-FileCopyrightText: 2015 Jon Griffiths (jon_p_griffiths@yahoo.com)
- *  it under the terms of the GNU General Public License as published by
+ * SPDX-FileCopyrightText: 2013 Dominik Schürmann <dominik@dominikschuermann.de>
- *  the Free Software Foundation, either version 3 of the License, or
+ * SPDX-FileCopyrightText: 2010-2011 Lukas Aichbauer
- *  (at your option) any later version.
+ * SPDX-License-Identifier: GPL-3.0-or-later
- *
- *  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/>.
  */
-
 package third_parties.sufficientlysecure;
 
 import android.annotation.SuppressLint;

app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java

@@ -1,22 +1,11 @@
 /*
- *  Copyright (C) 2015  Jon Griffiths (jon_p_griffiths@yahoo.com)
+ * Nextcloud - Android Client
- *  Copyright (C) 2013  Dominik Schürmann <dominik@dominikschuermann.de>
- *  Copyright (C) 2010-2011  Lukas Aichbauer
  *
- *  This program is free software: you can redistribute it and/or modify
+ * SPDX-FileCopyrightText: 2015 Jon Griffiths (jon_p_griffiths@yahoo.com)
- *  it under the terms of the GNU General Public License as published by
+ * SPDX-FileCopyrightText: 2013 Dominik Schürmann <dominik@dominikschuermann.de>
- *  the Free Software Foundation, either version 3 of the License, or
+ * SPDX-FileCopyrightText: 2010-2011 Lukas Aichbauer
- *  (at your option) any later version.
+ * SPDX-License-Identifier: GPL-3.0-or-later
- *
- *  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/>.
  */
-
 package third_parties.sufficientlysecure;
 
 import android.annotation.SuppressLint;

app/src/test/java/com/owncloud/android/ui/activities/ActivitiesPresenterTest.java

@@ -1,20 +1,8 @@
 /*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities;
 

app/src/test/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepositoryTest.java

@@ -1,20 +1,8 @@
 /*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities.data.activities;
 

app/src/test/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepositoryTest.java

@@ -1,20 +1,8 @@
 /*
- *   Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- *   Copyright (C) 2018 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- *
+ * 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
- *   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 <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activities.data.files;
 

app/src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java

@@ -1,23 +1,10 @@
 /*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
  *
- * @author Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
- * Copyright (C) 2019 Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
- * Copyright (C) 2019 Edvard Holst
+ * SPDX-FileCopyrightText: 2018 Edvard Holst <edvard.holst@gmail.com>
- * Copyright (C) 2019 Nextcloud GmbH
+ * 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 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 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 <https://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.utils;