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

…into HEAD

* 'android14' of https://github.com/seedvault-app/seedvault: (32 commits)
  Try to recover from corrupt metadata cache
  Tolerate unexpected exceptions in DocumentsStorage and ApkRestore
  Properly handle exception while writing zip chunk entries
  Improve error reporting when reading snapshot version
  Don't include empty dirs in media backup
  Use own notification ID for success notification
  Fix flaky metadata decoding test
  Remove warning from d2d expert setting as we now disable system scheduling for d2d
  Remove logWorkInfo as some part of it isn't in AOSP version of workmanger
  Show success notification in a separate notification channel
  Use our own scheduling when doing d2d backups (experimental)
  Import translations from Weblate
  Bump version to 14-4.0 - D2D <3
  Add '/build' folders to .gitignore
  Stop backing up excluded app APKs
  Show size of app backups in Backup Status screen
  Store size of app backups in metadata
  Add experimental support for forcing D2D transfer backups
  Bump version and set property for testing
  colors: Switch to public APIs for colors
  ...

Change-Id: I26f7c3e688ecadedc3fd0a3c6203ed8891435a71

.github/scripts/run_tests.sh

@@ -14,8 +14,10 @@ echo "Setting Seedvault transport..."
 sleep 10
 adb shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport
 
+D2D_BACKUP_TEST=$1
+
 large_test_exit_code=0
-./gradlew --stacktrace -Pinstrumented_test_size=large :app:connectedAndroidTest || large_test_exit_code=$?
+./gradlew --stacktrace -Pinstrumented_test_size=large -Pd2d_backup_test="$D2D_BACKUP_TEST" :app:connectedAndroidTest || large_test_exit_code=$?
 
 adb pull /sdcard/seedvault_test_results
 

.github/workflows/build.yml

@@ -1,10 +1,15 @@
 name: Build
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+  actions: read
+  checks: write
+
 jobs:
   build:
     name: Build
@@ -40,3 +45,10 @@ jobs:
             app/build/outputs/apk/debug/app-debug.apk
             contactsbackup/build/outputs/apk/debug/contactsbackup-debug.apk
             storage/demo/build/outputs/apk/debug/demo-debug.apk
+
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v4
+        if: success() || failure()
+        with:
+          report_paths: '**/build/test-results/**/TEST-*.xml'
+

.github/workflows/test.yml

@@ -20,6 +20,7 @@ jobs:
       matrix:
         android_target: [ 33, 34 ]
         emulator_type: [ default ]
+        d2d_backup_test: [ true, false ]
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
@@ -52,7 +53,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
+              ./.github/scripts/run_tests.sh ${{ matrix.d2d_backup_test }}
 
       - name: Upload test results
         if: always()

.gitignore

@@ -6,6 +6,9 @@ hs_err_pid*
 
 ## Intellij
 out/
+build/
+storage/build/
+contactsbackup/build/
 /lib/
 .idea/*
 !.idea/runConfigurations*

Android.bp

@@ -30,6 +30,7 @@ android_app {
         "androidx.activity_activity-ktx",
         "androidx.preference_preference",
         "androidx.documentfile_documentfile",
+        "androidx.work_work-runtime-ktx",
         "androidx.lifecycle_lifecycle-viewmodel-ktx",
         "androidx.lifecycle_lifecycle-livedata-ktx",
         "androidx-constraintlayout_constraintlayout",

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [14-4.0] - 2024-01-24
+* Add experimental support for forcing "D2D" transfer backups
+* Pretend to be a device-to-device transfer to allow backing up many apps which prevent backup
+* Stop backing up excluded app APKs
+* Show size of app backups in Backup Status screen
+* Slight improvements to color scheme
+* Development: Improve CI testing setup
+
 ## [14-3.3] - 2023-10-06
 * Android 14