From 833e4343e3862070e6ee8701ff776ff17569f6f2 Mon Sep 17 00:00:00 2001 From: Lina Ceballos Date: Thu, 3 Dec 2020 15:41:45 +0100 Subject: [PATCH] adding license and copyright headers --- .editorconfig | 5 + .github/workflows/client.yml | 5 +- .gitignore | 5 + .idea/codeStyles/Project.xml | 8 +- .idea/codeStyles/codeStyleConfig.xml | 7 +- .idea/inspectionProfiles/Project_Default.xml | 7 +- .idea/runConfigurations.xml | 8 +- .../Instrumentation_Tests.xml | 7 +- .idea/runConfigurations/Unit_Tests.xml | 7 +- Android.bp | 17 +- CHANGELOG.md | 6 + LICENSE | 202 ------------------ README.md | 8 +- app/build.gradle | 4 + .../seedvault/CipherUniqueNonceTest.kt | 3 + .../com/stevesoltys/seedvault/PluginTest.kt | 3 + .../plugins/saf/DocumentsStorageTest.kt | 3 + .../transport/backup/PackageServiceTest.kt | 3 + app/src/main/res/drawable/nextcloud.xml | 7 + .../res/drawable/nextcloud_background.xml | 7 + .../res/drawable/nextcloud_foreground.xml | 5 + .../com/stevesoltys/seedvault/TestUtils.kt | 3 + .../seedvault/crypto/KeyManagerTestImpl.kt | 3 + build.gradle | 4 + contactsbackup/.gitignore | 5 +- contactsbackup/Android.bp | 6 + contactsbackup/README.md | 4 + contactsbackup/build.gradle | 4 + gradle/dependencies.gradle | 4 + gradle/wrapper/gradle-wrapper.properties | 3 + gradlew | 4 + gradlew.bat | 5 + libs/koin-android/Android.bp | 7 + logcat-verbose.sh | 4 + permissions_com.stevesoltys.seedvault.xml | 8 +- settings.gradle | 3 + whitelist_com.stevesoltys.seedvault.xml | 6 + 37 files changed, 173 insertions(+), 227 deletions(-) delete mode 100644 LICENSE diff --git a/.editorconfig b/.editorconfig index d2aef5ea..91fc3946 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,8 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + + + [*.{kt,kts}] indent_size=4 insert_final_newline=true diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml index 40fa9fc4..d05af191 100644 --- a/.github/workflows/client.yml +++ b/.github/workflows/client.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2020, Torsten Grote +# SPDX-License-Identifier: Apache-2.0 + name: Build on: [push, pull_request] @@ -32,4 +35,4 @@ jobs: java-version: 11 - name: Build - run: ./gradlew compileDebugAndroidTestSources check assemble ktlintCheck \ No newline at end of file + run: ./gradlew compileDebugAndroidTestSources check assemble ktlintCheck diff --git a/.gitignore b/.gitignore index ec605697..aa099615 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: CC0-1.0 + + + ## Java *.class *.war diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 35a40e4e..8ef1c98d 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,3 +1,9 @@ + + + @@ -146,4 +152,4 @@ - \ No newline at end of file + diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml index 79ee123c..15c4fb25 100644 --- a/.idea/codeStyles/codeStyleConfig.xml +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -1,5 +1,10 @@ + + - \ No newline at end of file + diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index d467c379..dda73758 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,3 +1,8 @@ + + - \ No newline at end of file + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml index 7f68460d..b30ad306 100644 --- a/.idea/runConfigurations.xml +++ b/.idea/runConfigurations.xml @@ -1,3 +1,9 @@ + + + @@ -9,4 +15,4 @@ - \ No newline at end of file + diff --git a/.idea/runConfigurations/Instrumentation_Tests.xml b/.idea/runConfigurations/Instrumentation_Tests.xml index 60200c14..178d7ffc 100644 --- a/.idea/runConfigurations/Instrumentation_Tests.xml +++ b/.idea/runConfigurations/Instrumentation_Tests.xml @@ -1,3 +1,8 @@ + + @@ -48,4 +53,4 @@ - \ No newline at end of file + diff --git a/.idea/runConfigurations/Unit_Tests.xml b/.idea/runConfigurations/Unit_Tests.xml index 0a2becf3..9aace47f 100644 --- a/.idea/runConfigurations/Unit_Tests.xml +++ b/.idea/runConfigurations/Unit_Tests.xml @@ -1,3 +1,8 @@ + + @@ -14,4 +19,4 @@ - \ No newline at end of file + diff --git a/Android.bp b/Android.bp index 258391b7..d7306c6f 100644 --- a/Android.bp +++ b/Android.bp @@ -1,18 +1,5 @@ -// -// Copyright (C) 2018 The Android Open Source Project -// -// 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: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 android_app { name: "Seedvault", diff --git a/CHANGELOG.md b/CHANGELOG.md index aed03720..d656d3b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ + + + ## [1.0.0] - 2020-03-07 ## Added diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 1b294844..00000000 --- a/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [2019] [Steve Soltys] - - 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. \ No newline at end of file diff --git a/README.md b/README.md index 21e15945..24e9c4e6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ + + + # Seedvault [![Build](https://github.com/seedvault-app/seedvault/workflows/Build/badge.svg?branch=master)](https://github.com/seedvault-app/seedvault/actions?query=branch%3Amaster+workflow%3ABuild) @@ -44,4 +50,4 @@ allows you to decrypt and inspect your backups. It can also re-encrypt them. ## License -This application is available as open source under the terms of the [Apache-2.0 License](https://opensource.org/licenses/Apache-2.0). +This application is available as open source under the terms of the [Apache-2.0 License](https://opensource.org/licenses/Apache-2.0). However, some elements are being licensed under AGPL-3.0-or-later and CC0-1.0. For accurate information, please check individual files. diff --git a/app/build.gradle b/app/build.gradle index 9b5b5c24..cd230a9d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + + import groovy.xml.XmlUtil plugins { diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/CipherUniqueNonceTest.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/CipherUniqueNonceTest.kt index 66687348..fb17007b 100644 --- a/app/src/androidTest/java/com/stevesoltys/seedvault/CipherUniqueNonceTest.kt +++ b/app/src/androidTest/java/com/stevesoltys/seedvault/CipherUniqueNonceTest.kt @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + package com.stevesoltys.seedvault import android.util.Log diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/PluginTest.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/PluginTest.kt index 95836c53..dc8c5999 100644 --- a/app/src/androidTest/java/com/stevesoltys/seedvault/PluginTest.kt +++ b/app/src/androidTest/java/com/stevesoltys/seedvault/PluginTest.kt @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + package com.stevesoltys.seedvault import androidx.test.core.content.pm.PackageInfoBuilder diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/plugins/saf/DocumentsStorageTest.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/plugins/saf/DocumentsStorageTest.kt index 8068aed4..011dec6b 100644 --- a/app/src/androidTest/java/com/stevesoltys/seedvault/plugins/saf/DocumentsStorageTest.kt +++ b/app/src/androidTest/java/com/stevesoltys/seedvault/plugins/saf/DocumentsStorageTest.kt @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + package com.stevesoltys.seedvault.plugins.saf import android.database.ContentObserver diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/transport/backup/PackageServiceTest.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/transport/backup/PackageServiceTest.kt index 4d5ecc21..2073d794 100644 --- a/app/src/androidTest/java/com/stevesoltys/seedvault/transport/backup/PackageServiceTest.kt +++ b/app/src/androidTest/java/com/stevesoltys/seedvault/transport/backup/PackageServiceTest.kt @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + package com.stevesoltys.seedvault.transport.backup import android.util.Log diff --git a/app/src/main/res/drawable/nextcloud.xml b/app/src/main/res/drawable/nextcloud.xml index ea599210..0732f3c8 100644 --- a/app/src/main/res/drawable/nextcloud.xml +++ b/app/src/main/res/drawable/nextcloud.xml @@ -1,3 +1,10 @@ + + + + + + + + + + android_app { name: "LocalContactsBackup", srcs: [ diff --git a/contactsbackup/README.md b/contactsbackup/README.md index 28246f0c..35862b41 100644 --- a/contactsbackup/README.md +++ b/contactsbackup/README.md @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + + # Local Contacts Backup A backup application that backs up local on-device contacts via the system's backup API. diff --git a/contactsbackup/build.gradle b/contactsbackup/build.gradle index 9fcec7c5..06258552 100644 --- a/contactsbackup/build.gradle +++ b/contactsbackup/build.gradle @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 103beeba..e7eb2d5a 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + + // To produce these binaries, in latest AOSP source tree, run // $ m def aospDeps = fileTree(include: [ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9ff0d9fc..140fbd5a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + #Tue Aug 04 14:40:48 BRT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists diff --git a/gradlew b/gradlew index 9d82f789..0982fae8 100755 --- a/gradlew +++ b/gradlew @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + + #!/usr/bin/env bash ############################################################################## diff --git a/gradlew.bat b/gradlew.bat index aec99730..39d60ce6 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,8 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + + + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem diff --git a/libs/koin-android/Android.bp b/libs/koin-android/Android.bp index a57460ef..63956b98 100644 --- a/libs/koin-android/Android.bp +++ b/libs/koin-android/Android.bp @@ -1,3 +1,10 @@ + + + + android_library_import { name: "seedvault-lib-koin-androidx-viewmodel", aars: ["koin-androidx-viewmodel-2.1.1.aar"], diff --git a/logcat-verbose.sh b/logcat-verbose.sh index 0099a2e5..d2a782c4 100755 --- a/logcat-verbose.sh +++ b/logcat-verbose.sh @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2020, Torsten Grote +# SPDX-License-Identifier: Apache-2.0 + + #!/usr/bin/env bash set -ex diff --git a/permissions_com.stevesoltys.seedvault.xml b/permissions_com.stevesoltys.seedvault.xml index da36b245..0e9e5e3d 100644 --- a/permissions_com.stevesoltys.seedvault.xml +++ b/permissions_com.stevesoltys.seedvault.xml @@ -1,3 +1,9 @@ + + + @@ -6,4 +12,4 @@ - \ No newline at end of file + diff --git a/settings.gradle b/settings.gradle index 717326dd..39ee8765 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,5 @@ +// SPDX-FileCopyrightText: 2020, Torsten Grote +// SPDX-License-Identifier: Apache-2.0 + include ':app' include ':contactsbackup' diff --git a/whitelist_com.stevesoltys.seedvault.xml b/whitelist_com.stevesoltys.seedvault.xml index c3c2877b..41bd9c40 100644 --- a/whitelist_com.stevesoltys.seedvault.xml +++ b/whitelist_com.stevesoltys.seedvault.xml @@ -1,3 +1,9 @@ + + +