Use different allow-lists for backup and restore

Author: grote

CHANGELOG.md

@@ -2,6 +2,7 @@
 * Added support for user CA certificates
 * Fixed issue where many Go server implementations of WebDAV did not work with the WebDAV client in Seedvault
 * Bumped the app data quota from 1GB to 3GB
+* Nextcloud app is no longer allowed for backup (Use built-in WebDAV Cloud support!)
 * Improved handling of metered networks, if disallowed, the backup process will be aborted
 * Fixed backup errors with USB when file and app backup are both on
 * Fixed overdue backups not automatically starting when USB drives are plugged in

app/src/debug/res/values/config.xml

@@ -4,7 +4,14 @@
   SPDX-License-Identifier: Apache-2.0
   -->
 <resources>
-    <string-array name="storage_authority_whitelist">
+    <string-array name="storage_authority_backup_allow_list">
+        <item>com.android.externalstorage.documents</item>
+        <item>org.nextcloud.documents</item>
+        <item>org.nextcloud.beta.documents</item>
+        <item>at.bitfire.davdroid.webdav</item>
+        <item>de.felixnuesse.extract.vcp</item>
+    </string-array>
+    <string-array name="storage_authority_restore_allow_list">
         <item>com.android.externalstorage.documents</item>
         <item>org.nextcloud.documents</item>
         <item>org.nextcloud.beta.documents</item>

app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageOptionFetcher.kt

@@ -41,8 +41,11 @@ internal class StorageOptionFetcher(private val context: Context, private val is
 
     private val packageManager = context.packageManager
     private val contentResolver = context.contentResolver
-    private val whitelistedAuthorities =
-        context.resources.getStringArray(R.array.storage_authority_whitelist)
+    private val whitelistedAuthorities = if (isRestore) {
+        context.resources.getStringArray(R.array.storage_authority_restore_allow_list)
+    } else {
+        context.resources.getStringArray(R.array.storage_authority_backup_allow_list)
+    }
     private val safStorageOptions = SafStorageOptions(context, isRestore, whitelistedAuthorities)
 
     private var listener: RemovableStorageListener? = null

app/src/main/res/values/config.xml

@@ -1,14 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   SPDX-FileCopyrightText: 2020 The Calyx Institute
   SPDX-License-Identifier: Apache-2.0
   -->
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!--
-    Add only storage here that is also available
-    when restoring from backup (e.g. initial device setup)
+    Storage Access Framework authorities listed here are allowed to be used as a backup location.
+    Add only authorities here that are also listed in storage_authority_restore_allow_list
+    and available when restoring from backup (e.g. initial device setup).
     -->
-    <string-array name="storage_authority_whitelist" tools:ignore="InconsistentArrays">
+    <string-array name="storage_authority_backup_allow_list">
+        <item>com.android.externalstorage.documents</item>
+        <item>at.bitfire.davdroid.webdav</item>
+        <item>de.felixnuesse.extract.vcp</item>
+    </string-array>
+
+    <!--
+    Storage Access Framework authorities listed here are allowed to be used for restore.
+    These should include all authorities from storage_authority_backup_allow_list
+    and potentially more.
+    -->
+    <string-array name="storage_authority_restore_allow_list">
         <item>com.android.externalstorage.documents</item>
         <item>org.nextcloud.documents</item>
         <item>at.bitfire.davdroid.webdav</item>