From 88a250ff5c46c2cf28e603a262713cf45eba438f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 6 Dec 2019 12:33:50 -0300
Subject: [PATCH] Use separate dev config and document existing config

Attention: This also changes the action to launch restore activity
---
 app/src/debug/res/values/config.xml                  | 10 ++++++++++
 app/src/main/AndroidManifest.xml                     |  2 +-
 .../seedvault/ui/RequireProvisioningActivity.kt      |  2 +-
 app/src/main/res/values/config.xml                   | 12 ++++++++++--
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 app/src/debug/res/values/config.xml

diff --git a/app/src/debug/res/values/config.xml b/app/src/debug/res/values/config.xml
new file mode 100644
index 00000000..31da4368
--- /dev/null
+++ b/app/src/debug/res/values/config.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="show_restore_in_settings">true</bool>
+
+    <string-array name="storage_authority_whitelist">
+        <item>com.android.externalstorage.documents</item>
+        <item>org.nextcloud.documents</item>
+        <item>org.nextcloud.beta.documents</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c2a7187c..88fb2c03 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -58,7 +58,7 @@
             android:label="@string/restore_title"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="com.stevesoltys.seedvault.restore.RESTORE_BACKUP" />
+                <action android:name="com.stevesoltys.seedvault.RESTORE_BACKUP" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt
index 9410c931..cffe2bfc 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt
@@ -14,7 +14,7 @@ const val REQUEST_CODE_RECOVERY_CODE = 3
 const val INTENT_EXTRA_IS_RESTORE = "isRestore"
 const val INTENT_EXTRA_IS_SETUP_WIZARD = "isSetupWizard"
 
-private const val ACTION_SETUP_WIZARD = "com.stevesoltys.seedvault.restore.RESTORE_BACKUP"
+private const val ACTION_SETUP_WIZARD = "com.stevesoltys.seedvault.RESTORE_BACKUP"
 
 private val TAG = RequireProvisioningActivity::class.java.name
 
diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml
index be0bbc9e..b2a26e1d 100644
--- a/app/src/main/res/values/config.xml
+++ b/app/src/main/res/values/config.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="show_restore_in_settings">true</bool>
+    <!--
+    Normally, restoring from backup is only available during initial device setup.
+    You can make it always available at your own risk.
+    Keep in mind that the Auto-Restore feature works independently from this.
 
+    Launch an intent with the action "com.stevesoltys.seedvault.RESTORE_BACKUP"
+    to trigger restore during device setup.
+    -->
+    <bool name="show_restore_in_settings">false</bool>
+
+    <!-- Add only storage that is also available when restoring from backup (e.g. initial device setup) -->
     <string-array name="storage_authority_whitelist">
         <item>com.android.externalstorage.documents</item>
         <item>org.nextcloud.documents</item>
-        <item>org.nextcloud.beta.documents</item>
     </string-array>
 
 </resources>