Merge branch 'android14' of github.com:seedvault-app/seedvault into l…

…ineage-21.0

* 'android14' of github.com:seedvault-app/seedvault: (76 commits)
  fixup! restore: Skip installing APKs if not allowed by policy
  Use absolute link to FAQ in README.md (seedvault-app#660)
  Make Seedvault almost REUSE compliant
  misc: Add SPDX copyright headers
  app: Add SPDX copyright headers 5/5
  app: Add SPDX copyright headers 4/5
  app: Add SPDX copyright headers 3/5
  app: Add SPDX copyright headers 2/5
  app: Add SPDX copyright headers 1/5
  Add missing newlines at the end of the files
  Import translations from Weblate
  Fix scheduling for removable drive users
  Import translations from Weblate
  Import translations from Weblate
  restore: Skip installing APKs if not allowed by policy
  Catch out 507 HTTP error when using WebDAV
  Catch out of space exception during FullBackup
  Don't retry backup on removable storage
  Don't do backup, if space is already low, warn instead
  Catch out of space errors and show error notification
  ...

Change-Id: Ibe04d350fc2354422365d6a65b4928043fa2c9c2

.github/scripts/build_aosp.sh

@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
+#
+# SPDX-FileCopyrightText: 2023 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
 
 export DEBIAN_FRONTEND=noninteractive
 

.github/scripts/run_tests.sh

@@ -1,3 +1,8 @@
+#
+# SPDX-FileCopyrightText: 2023 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
 adb root
 sleep 5
 adb remount

.github/workflows/build.yml

@@ -35,6 +35,10 @@ jobs:
           cache: 'gradle'
 
       - name: Build
+        env:
+          NEXTCLOUD_URL: ${{ vars.NEXTCLOUD_URL }}
+          NEXTCLOUD_USER: ${{ secrets.NEXTCLOUD_USER }}
+          NEXTCLOUD_PASS: ${{ secrets.NEXTCLOUD_PASS }}
         run: ./gradlew compileDebugAndroidTestSources check assemble ktlintCheck
 
       - name: Upload APKs

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android_target: [ 33, 34 ]
+        android_target: [ 34 ]
         emulator_type: [ aosp_atd ]
         d2d_backup_test: [ true, false ]
     steps:
@@ -40,7 +40,7 @@ jobs:
       - name: Run tests
         uses: Wandalen/[email protected]
         with:
-          attempt_limit: 3
+          attempt_limit: 1
           action: reactivecircus/android-emulator-runner@v2
           with: |
             api-level: ${{ matrix.android_target }}

.reuse/dep5

@@ -3,6 +3,39 @@ Upstream-Name: Seedvault
 Upstream-Contact: The Calyx Institute
 Source: https://github.com/seedvault-app/seedvault
 
+Files: .github/workflows/build.yml
+       .github/workflows/client.yml
+       .github/workflows/test.yml
+       .gitignore
+       CHANGELOG.md README.md app/development/DEVELOPMENT.md
+Copyright: 2017-2020 Steve Soltys
+           2020 The Calyx Institute
+License: Apache-2.0
+
+Files: .cirrus.yml .editorconfig .idea/*
+       app/platform.jks app/development/platform.jks
+       app/src/main/res/values-*/strings.xml
+Copyright: 2020 The Calyx Institute
+License: Apache-2.0
+
+Files: libs/dav4jvm/dav4jvm-2.2.1.jar
+Copyright: 2024 bitfire web engineering
+License: MPL-2.0
+
+Files: libs/dav4jvm/okhttp-4.11.0.jar
+       libs/dav4jvm/okio-jvm-3.7.0.jar
+Copyright: 2024 Square, Inc.
+License: Apache-2.0
+
+Files: libs/koin-android/koin-android-3.2.0.aar
+       libs/koin-android/koin-core-jvm-3.2.0.jar
+Copyright: 2022 insert-koin.io
+License: Apache-2.0
+
+Files: libs/kotlin-bip39-jvm-1.0.6.jar
+Copyright: 2020 Zcash
+License: MIT
+
 Files: contactsbackup/*.gitignore contactsbackup/*.md
        contactsbackup/src/main/res/values-*/strings.xml
 Copyright: 2020 The Calyx Institute
@@ -18,7 +51,7 @@ Files: storage/*.gitignore storage/*.md
 Copyright: 2021 The Calyx Institute
 License: Apache-2.0
 
-Files: storage/lib/libs/tink-android-1.7.0.jar
+Files: storage/lib/libs/tink-android-1.10.0.jar
 Copyright: 2022 Google LLC
 License: Apache-2.0
 
@@ -29,3 +62,11 @@ License: CC-BY-SA-3.0
 Files: storage/demo/src/main/ic_launcher-playstore.png
 Copyright: Material Design Authors / Google LLC
 License: Apache-2.0
+
+Files: gradle/wrapper/*
+Copyright: 2007-2023 Gradle, Inc.
+License: Apache-2.0
+
+Files: gradlew*
+Copyright: 2007-2023 Gradle, Inc.
+License: Apache-2.0

Android.bp

@@ -1,17 +1,6 @@
 //
-// 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 The Calyx Institute
+// SPDX-License-Identifier: Apache-2.0
 //
 
 android_app {
@@ -44,6 +33,10 @@ android_app {
         "seedvault-lib-koin-android",
         // bip39
         "seedvault-lib-kotlin-bip39",
+        // WebDAV
+        "seedvault-lib-dav4jvm",
+        "seedvault-lib-okhttp",
+        "seedvault-lib-okio",
     ],
     manifest: "app/src/main/AndroidManifest.xml",