Merge pull request #811 from grote/android14-merge15

Merge changes from Android 15 into Android 14 branch

.cirrus.yml

@@ -1,13 +1,66 @@
-task:
-  name: Build with AOSP
-  only_if: $CIRRUS_PR_LABELS =~ ".*aosp-build.*"
-  timeout_in: 70m
-  container:
-    image: ubuntu:23.04
-    cpu: 8
-    memory: 32G
-  build_script:
-    - ./.github/scripts/build_aosp.sh aosp_arm64 ap1a userdebug android-14.0.0_r29
+container:
+  image: ghcr.io/cirruslabs/android-sdk:34
+  kvm: true
+  cpu: 8
+  memory: 16G
+
+instrumentation_tests_task:
+  name: "Cirrus CI Instrumentation Tests"
+  start_avd_background_script:
+    sdkmanager --install "system-images;android-34;default;x86_64" "emulator";
+    echo no | avdmanager create avd -n seedvault -k "system-images;android-34;default;x86_64";
+    $ANDROID_HOME/emulator/emulator
+    -avd seedvault
+    -no-audio
+    -no-boot-anim
+    -gpu swiftshader_indirect
+    -no-snapshot
+    -no-window
+    -writable-system;
+  provision_avd_background_script:
+    wget https://github.com/seedvault-app/seedvault-test-data/releases/download/3/backup.tar.gz;
+
+    adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;';
+    adb root;
+    sleep 5;
+    adb remount;
+    adb reboot;
+    adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;';
+    adb root;
+    sleep 5;
+    adb remount;
+    sleep 5;
+  assemble_script:
+    ./gradlew :app:assembleRelease :contacts:assembleRelease assembleAndroidTest
+  install_app_script:
+    timeout 180s bash -c 'while [[ -z $(adb shell mount | grep "/system " | grep "(rw,") ]]; do sleep 1; done;';
+    adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;';
+
+    adb shell mkdir -p /sdcard/seedvault_baseline;
+    adb push backup.tar.gz /sdcard/seedvault_baseline/backup.tar.gz;
+    adb shell tar xzf /sdcard/seedvault_baseline/backup.tar.gz --directory=/sdcard/seedvault_baseline;
+
+    adb shell mkdir -p /system/priv-app/Seedvault;
+    adb push app/build/outputs/apk/release/app-release.apk /system/priv-app/Seedvault/Seedvault.apk;
+    adb push permissions_com.stevesoltys.seedvault.xml /system/etc/permissions/privapp-permissions-seedvault.xml;
+    adb push allowlist_com.stevesoltys.seedvault.xml /system/etc/sysconfig/allowlist-seedvault.xml;
+
+    adb shell mkdir -p /system/priv-app/ContactsBackup;
+    adb push contactsbackup/build/outputs/apk/release/contactsbackup-release.apk /system/priv-app/ContactsBackup/contactsbackup.apk;
+    adb push contactsbackup/default-permissions_org.calyxos.backup.contacts.xml /system/etc/default-permissions/default-permissions_org.calyxos.backup.contacts.xml;
+
+    adb shell bmgr enable true;
+    adb reboot;
+    adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;';
+    adb shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport;
+    adb reboot;
+    adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;';
+  run_large_tests_script: ./gradlew -Pandroid.testInstrumentationRunnerArguments.size=large :app:connectedAndroidTest
+  run_other_tests_script: ./gradlew -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.LargeTest connectedAndroidTest
   always:
-    seedvault_artifacts:
-      path: Seedvault.apk
+    pull_screenshots_script:
+      adb pull /sdcard/seedvault_test_results
+    screenshots_artifacts:
+      path: "seedvault_test_results/**/*.mp4"
+    logcat_artifacts:
+      path: "seedvault_test_results/**/*.log"

.github/scripts/run_tests.sh

@@ -10,10 +10,8 @@ echo "Installing Seedvault app..."
 ./gradlew --stacktrace :app:installDebugAndroidTest
 sleep 60
 
-D2D_BACKUP_TEST=$1
-
 large_test_exit_code=0
-./gradlew --stacktrace -Pinstrumented_test_size=large -Pd2d_backup_test="$D2D_BACKUP_TEST" :app:connectedAndroidTest || large_test_exit_code=$?
+./gradlew --stacktrace -Pinstrumented_test_size=large :app:connectedAndroidTest || large_test_exit_code=$?
 
 adb pull /sdcard/seedvault_test_results
 

.github/workflows/test.yml

@@ -20,7 +20,6 @@ jobs:
       matrix:
         android_target: [ 34 ]
         emulator_type: [ aosp_atd ]
-        d2d_backup_test: [ true, false ]
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
@@ -53,7 +52,7 @@ jobs:
             disable-animations: true
             script: |
               ./app/development/scripts/provision_emulator.sh "test" "system-images;android-${{ matrix.android_target }};${{ matrix.emulator_type }};x86_64"
-              ./.github/scripts/run_tests.sh ${{ matrix.d2d_backup_test }}
+              ./.github/scripts/run_tests.sh
 
       - name: Upload test results
         if: always()

Android.bp

@@ -8,12 +8,23 @@ android_app {
     srcs: [
         "app/src/main/java/**/*.kt",
         "app/src/main/java/**/*.java",
+        "app/src/main/proto/*.proto",
+        // as of Android 15, there is no way to pass --kotlin_out to aprotoc compiler
+        "app/build/generated/source/proto/debug/kotlin/com/stevesoltys/seedvault/proto/*.kt",
     ],
     resource_dirs: [
         "app/src/main/res",
     ],
+    asset_dirs: [
+        "app/src/main/assets"
+    ],
+    proto: {
+        type: "lite",
+        local_include_dirs: ["app/src/main/proto"],
+    },
     static_libs: [
         "kotlin-stdlib-jdk8",
+        "libprotobuf-java-lite",
         "androidx.core_core-ktx",
         "androidx.fragment_fragment-ktx",
         "androidx.activity_activity-ktx",
@@ -26,18 +37,23 @@ android_app {
         "com.google.android.material_material",
         "kotlinx-coroutines-android",
         "kotlinx-coroutines-core",
-        // storage backup lib
+        "seedvault-lib-kotlin-logging-jvm",
+        // app backup related libs
+        "seedvault-lib-protobuf-kotlin-lite",
+        "seedvault-logback-android",
+        "seedvault-lib-chunker",
+        "seedvault-lib-zstd-jni",
+        "okio-lib",
+        // our own gradle module libs
+        "seedvault-lib-core",
         "seedvault-lib-storage",
         // koin
         "seedvault-lib-koin-core-jvm", // did not manage to add this as transitive dependency
         "seedvault-lib-koin-android",
         // bip39
         "seedvault-lib-kotlin-bip39",
-        // WebDAV
-        "seedvault-lib-dav4jvm",
-        "seedvault-lib-okhttp",
-        "seedvault-lib-okio",
     ],
+    use_embedded_native_libs: true,
     manifest: "app/src/main/AndroidManifest.xml",
 
     platform_apis: true,

CHANGELOG.md

@@ -1,3 +1,18 @@
+## [14-5.1] - 2024-12-10
+* First Android 15 release
+* New backup format using compression and deduplication
+* Can still restore old backups, but old Seedvault can't restore backups from this version
+* Faster and more reliable backups making snapshots that can individually be restored
+* Auto-cleaning of old backups
+* All backups now mimic device-to-device (allowing backup for all apps)
+* All backups now use a high per-app app quota
+* App backup (for APKs) moved to expert settings
+* Show more information for backups available to restore
+* Fix "Waiting to back up..." showing for apps
+* It is now possible to verify the integrity of app backups, partially or fully
+* The entire WebDAV URL is now shown when in settings
+* A launch button is now shown for apps that are force-stopped so that they can be backed up
+
 ## [14-4.1] - 2024-08-23
 * It is now possible to restore after setting up a profile
 * It is now possible to select what to restore (e.g. apps, files...)

README.md

@@ -2,14 +2,20 @@
 [![Build](https://github.com/seedvault-app/seedvault/actions/workflows/build.yml/badge.svg)](https://github.com/seedvault-app/seedvault/actions/workflows/build.yml)
 
 A backup application for the [Android Open Source Project](https://source.android.com/).
+Needs to be [integrated](https://github.com/seedvault-app/seedvault/wiki/ROM-Integration)
+in your Android ROM and **can not** be installed as a regular app.
 
-If you are having an issue/question, please look at our [FAQ](https://github.com/seedvault-app/seedvault/wiki/FAQ).
+If you are having an issue/question,
+please look at our [FAQ](https://github.com/seedvault-app/seedvault/wiki/FAQ)
+or [ask a new question](https://github.com/seedvault-app/seedvault/discussions).
 
 ## Components
 
 * [Local Contacts Backup](contactsbackup) - an app that backs up local on-device contacts
-* [Storage library](storage) - a library handling efficient backup of files
+* [File backup library](storage) - a library handling efficient backup of files
+  ([documentation](storage/doc/design.md))
 * [Seedvault app](app) - the main app where all functionality comes together
+  ([documentation](doc/README.md))
 
 ## Features
 - Backup application data to a flash drive.
@@ -19,24 +25,27 @@ If you are having an issue/question, please look at our [FAQ](https://github.com
 
 ## Requirements
 
-SeedVault is developed along with AOSP releases
+SeedVault is developed along with AOSP releases.
 
-We update it every time Google releases a new Android version, make any changes required for basic functionality, and any improvements possible through API changes in the OS.
+We update it every time Google releases a new Android version, 
+make any changes required for basic functionality,
+and any improvements possible through API changes in the OS.
 
-This means that for ROMs using SeedVault it's recommended to use the same branch as your android version
+This means that for ROMs using SeedVault it's recommended
+to use the same branch as your android version
 
 - This current branch `android14` is meant for usage with Android 14
-- This is indicated by the version name starting with `14`, and the version code starting with `34` - the Android 14 API version
+- This is indicated by the version name starting with `14`,
+  and the version code starting with `34` - the Android 14 API version
 
-For older versions of Android, check out [the branches](https://github.com/seedvault-app/seedvault/branches).
+For older versions of Android,
+check out [the branches](https://github.com/seedvault-app/seedvault/branches).
 
-Trying to use an older branch on a newer version may lead to issues and is not something we can support.
-
-## Getting Started
-- Check out [the wiki](https://github.com/seedvault-app/seedvault/wiki) for information on building the application with 
-AOSP.
+Trying to use an older branch on a newer version may lead to issues
+and is not something we can support.
 
 ## What makes this different?
+
 This application is compiled with the operating system and does not require a rooted device for use.
 It uses the same internal APIs as `adb backup` which is deprecated and thus needs a replacement.
 
@@ -60,9 +69,14 @@ It uses the same internal APIs as `adb backup` which is deprecated and thus need
 ## Contributing
 Bug reports and pull requests are welcome on GitHub at https://github.com/seedvault-app/seedvault.
 
-See [DEVELOPMENT.md](app/development/DEVELOPMENT.md) for information on developing Seedvault locally.
+See [DEVELOPMENT.md](app/development/DEVELOPMENT.md) for information
+on developing Seedvault locally.
 
-This project aims to adhere to the [official Kotlin coding style](https://developer.android.com/kotlin/style-guide).
+This project aims to adhere to the
+[official Kotlin coding style](https://developer.android.com/kotlin/style-guide).
+
+### Translating
+Seedvault is translated using Weblate. It is currently under the [CalyxOS project.](https://hosted.weblate.org/projects/calyxos/)
 
 ## Third-party tools
 
@@ -78,7 +92,8 @@ allows you to decrypt and inspect your backups from newer versions of Seedvault
 It is currently work-in-progress.
 
 ## 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).
 
 ## Funding
 
@@ -94,3 +109,12 @@ a fund established by [NLnet](https://nlnet.nl)
 with financial support from the European Commission's Next Generation Internet programme,
 under the aegis of DG Communications Networks, Content and Technology
 under grant agreement No 825310.
+
+### NGI0 Entrust Fund
+
+This project was funded through the
+[NGI0 Entrust Fund](https://nlnet.nl/project/SeedVault-Integrity/),
+a fund established by [NLnet](https://nlnet.nl)
+with financial support from the European Commission's Next Generation Internet programme,
+under the aegis of DG Communications Networks, Content and Technology
+under grant agreement No 101069594.