diff --git a/app/src/main/aidl/com/nextcloud/android/sso/aidl/IInputStreamService.aidl b/app/src/main/aidl/com/nextcloud/android/sso/aidl/IInputStreamService.aidl
index fdff85181b..c3a7cb7c9d 100644
--- a/app/src/main/aidl/com/nextcloud/android/sso/aidl/IInputStreamService.aidl
+++ b/app/src/main/aidl/com/nextcloud/android/sso/aidl/IInputStreamService.aidl
@@ -1,20 +1,14 @@
-/***
- Copyright (c) 2008-2011 CommonsWare, LLC
- 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
- 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.
-
- From _The Busy Coder's Guide to Advanced Android Development_
- http://commonsware.com/AdvAndroid
-
-
- More information here: https://github.com/abeluck/android-streams-ipc
-*/
-
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2008-2011 CommonsWare, LLC
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * 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.
@@ -26,7 +20,7 @@ interface IInputStreamService {
ParcelFileDescriptor performNextcloudRequest(in ParcelFileDescriptor input);
ParcelFileDescriptor performNextcloudRequestAndBodyStreamV2(in ParcelFileDescriptor input,
- in ParcelFileDescriptor requestBodyParcelFileDescriptor);
+ in ParcelFileDescriptor requestBodyParcelFileDescriptor);
ParcelFileDescriptor performNextcloudRequestV2(in ParcelFileDescriptor input);
}
diff --git a/app/src/main/java/com/nextcloud/android/sso/Constants.java b/app/src/main/java/com/nextcloud/android/sso/Constants.java
index 5a298de7d8..a752b39052 100644
--- a/app/src/main/java/com/nextcloud/android/sso/Constants.java
+++ b/app/src/main/java/com/nextcloud/android/sso/Constants.java
@@ -1,27 +1,11 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author David Luhmer
- * @author Tobias Kaminsky
- * @author Edvard Holst
- * Copyright (C) 2019 David Luhmer
- * 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 .
+ * SPDX-FileCopyrightText: 2019 David Luhmer
+ * SPDX-FileCopyrightText: 2019 Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2019 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.nextcloud.android.sso;
public final class Constants {
diff --git a/app/src/main/java/com/nextcloud/android/sso/InputStreamBinder.java b/app/src/main/java/com/nextcloud/android/sso/InputStreamBinder.java
index 55002bffbd..11165bdf5f 100644
--- a/app/src/main/java/com/nextcloud/android/sso/InputStreamBinder.java
+++ b/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
*
* 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
diff --git a/app/src/main/java/com/nextcloud/android/sso/aidl/IThreadListener.java b/app/src/main/java/com/nextcloud/android/sso/aidl/IThreadListener.java
index 7e72a4aff0..29bfc419b1 100644
--- a/app/src/main/java/com/nextcloud/android/sso/aidl/IThreadListener.java
+++ b/app/src/main/java/com/nextcloud/android/sso/aidl/IThreadListener.java
@@ -1,7 +1,7 @@
/*
* Nextcloud SingleSignOn
*
- * @author David Luhmer
+ * @author David Luhmer
*
* 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
diff --git a/app/src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java b/app/src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java
index b9c48ce488..2f42f0c000 100644
--- a/app/src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java
+++ b/app/src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java
@@ -9,7 +9,7 @@
/*
* Nextcloud SingleSignOn
*
- * @author David Luhmer
+ * @author David Luhmer
*
* 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
diff --git a/app/src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java b/app/src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java
index 7dcb2d1594..b61074dba4 100644
--- a/app/src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java
+++ b/app/src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java
@@ -1,7 +1,7 @@
/*
* Nextcloud SingleSignOn
*
- * @author David Luhmer
+ * @author David Luhmer
*
* 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
diff --git a/app/src/main/java/com/owncloud/android/services/AccountManagerService.java b/app/src/main/java/com/owncloud/android/services/AccountManagerService.java
index d19d078f07..689c769d51 100644
--- a/app/src/main/java/com/owncloud/android/services/AccountManagerService.java
+++ b/app/src/main/java/com/owncloud/android/services/AccountManagerService.java
@@ -1,7 +1,7 @@
/*
* Nextcloud SingleSignOn
*
- * @author David Luhmer
+ * @author David Luhmer
*
* 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
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java b/app/src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java
index 9efcf95a38..e5bef49201 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities;
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/ActivitiesContract.java b/app/src/main/java/com/owncloud/android/ui/activities/ActivitiesContract.java
index dc1097b9bb..4a0bd19949 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/ActivitiesContract.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities;
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/ActivitiesPresenter.java b/app/src/main/java/com/owncloud/android/ui/activities/ActivitiesPresenter.java
index 04ec80f686..e39ec74211 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/ActivitiesPresenter.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
package com.owncloud.android.ui.activities;
import com.nextcloud.common.NextcloudClient;
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesRepository.java b/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesRepository.java
index e8c54e9e74..688a90d12d 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesRepository.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities.data.activities;
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApi.java b/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApi.java
index 419a5c0ba8..1b561b33f4 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApi.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities.data.activities;
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java b/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java
index 57e9891512..4e81beb566 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java
+++ b/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
- * @author Chris Narkiewicz
- *
- * Copyright (C) 2018 Edvard Holst
- * Copyright (C) 2019 Chris Narkiewicz
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities.data.activities;
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivityRepositories.java b/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivityRepositories.java
index c341875ae1..b393f664fb 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivityRepositories.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities.data.activities;
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepository.java b/app/src/main/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepository.java
index 524c8dbcf7..8812a6f4c2 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepository.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities.data.activities;
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/data/files/FileRepositories.java b/app/src/main/java/com/owncloud/android/ui/activities/data/files/FileRepositories.java
index 073559d99a..4f90cbe069 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/data/files/FileRepositories.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities.data.files;
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesRepository.java b/app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesRepository.java
index 951e59ec85..beaed7b0ad 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesRepository.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities.data.files;
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApi.java b/app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApi.java
index b78bf44dd9..e06a3b793c 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApi.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities.data.files;
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApiImpl.java b/app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApiImpl.java
index 6f5f5d92aa..b569bf8cd4 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApiImpl.java
+++ b/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
- * @author Edvard Holst
- *
- * Copyright (C) 2018 Edvard Holst
- * Copyright (C) 2019 Chris Narkiewicz
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities.data.files;
diff --git a/app/src/main/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepository.java b/app/src/main/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepository.java
index 636cb5771f..1ec23f6150 100644
--- a/app/src/main/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepository.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities.data.files;
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java
index ab45ef63b2..53c210ecbb 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java
+++ b/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
* Copyright (C) 2018 Andy Scherzinger
*
* This program is free software: you can redistribute it and/or modify
diff --git a/app/src/main/java/third_parties/aosp/SQLiteTokenizer.java b/app/src/main/java/third_parties/aosp/SQLiteTokenizer.java
index 4b1728231e..c00a143b2b 100644
--- a/app/src/main/java/third_parties/aosp/SQLiteTokenizer.java
+++ b/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");
- * you may not use this file except in compliance with the License.
- * 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.
+ * SPDX-FileCopyrightText: 2019 The Android Open Source Project
+ * SPDX-License-Identifier: Apache-2.0
*/
-
+package third_parties.aosp;
import java.util.ArrayList;
import java.util.List;
diff --git a/app/src/main/java/third_parties/sufficientlysecure/ProcessVEvent.java b/app/src/main/java/third_parties/sufficientlysecure/ProcessVEvent.java
index 249e62c493..a7d949e351 100644
--- a/app/src/main/java/third_parties/sufficientlysecure/ProcessVEvent.java
+++ b/app/src/main/java/third_parties/sufficientlysecure/ProcessVEvent.java
@@ -1,22 +1,11 @@
/*
- * Copyright (C) 2015 Jon Griffiths (jon_p_griffiths@yahoo.com)
- * Copyright (C) 2013 Dominik Schürmann
- * Copyright (C) 2010-2011 Lukas Aichbauer
+ * Nextcloud - Android Client
*
- * 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 .
+ * SPDX-FileCopyrightText: 2015 Jon Griffiths (jon_p_griffiths@yahoo.com)
+ * SPDX-FileCopyrightText: 2013 Dominik Schürmann
+ * SPDX-FileCopyrightText: 2010-2011 Lukas Aichbauer
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-
package third_parties.sufficientlysecure;
import android.annotation.SuppressLint;
diff --git a/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java b/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java
index 29586740ad..60f9d7a5f6 100644
--- a/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java
+++ b/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java
@@ -1,22 +1,11 @@
/*
- * Copyright (C) 2015 Jon Griffiths (jon_p_griffiths@yahoo.com)
- * Copyright (C) 2013 Dominik Schürmann
- * Copyright (C) 2010-2011 Lukas Aichbauer
+ * Nextcloud - Android Client
*
- * 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 .
+ * SPDX-FileCopyrightText: 2015 Jon Griffiths (jon_p_griffiths@yahoo.com)
+ * SPDX-FileCopyrightText: 2013 Dominik Schürmann
+ * SPDX-FileCopyrightText: 2010-2011 Lukas Aichbauer
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
-
package third_parties.sufficientlysecure;
import android.annotation.SuppressLint;
diff --git a/app/src/test/java/com/owncloud/android/ui/activities/ActivitiesPresenterTest.java b/app/src/test/java/com/owncloud/android/ui/activities/ActivitiesPresenterTest.java
index 48c392e1e8..74201d5b55 100644
--- a/app/src/test/java/com/owncloud/android/ui/activities/ActivitiesPresenterTest.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities;
diff --git a/app/src/test/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepositoryTest.java b/app/src/test/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepositoryTest.java
index c80af66582..de2b12d0be 100644
--- a/app/src/test/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepositoryTest.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities.data.activities;
diff --git a/app/src/test/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepositoryTest.java b/app/src/test/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepositoryTest.java
index 2428544b32..a024ffb421 100644
--- a/app/src/test/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepositoryTest.java
+++ b/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
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.ui.activities.data.files;
diff --git a/app/src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java b/app/src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java
index 7591a7d139..c10836e0e1 100644
--- a/app/src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java
+++ b/app/src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java
@@ -1,23 +1,10 @@
/*
- * Nextcloud Android client application
+ * Nextcloud - Android Client
*
- * @author Tobias Kaminsky
- * Copyright (C) 2019 Tobias Kaminsky
- * Copyright (C) 2019 Edvard Holst
- * Copyright (C) 2019 Nextcloud GmbH
- *
- * 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 .
+ * SPDX-FileCopyrightText: 2019 Tobias Kaminsky
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH
+ * SPDX-FileCopyrightText: 2018 Edvard Holst
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.owncloud.android.utils;