From 0938d3688a840a7f61bbcb0be3a258648897cd02 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Thu, 17 Feb 2022 12:20:02 +0100
Subject: [PATCH] Set dataExtractionRules in AndroidManifest for Android 12+

---
 app/src/main/AndroidManifest.xml          |  3 ++-
 app/src/main/res/xml/backup_rules.xml     | 14 ++++++++++----
 app/src/main/res/xml/backup_rules_old.xml |  5 +++++
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/xml/backup_rules_old.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 729ce17f..f0f38942 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,8 @@
         android:name=".AegisApplication"
         android:allowBackup="true"
         android:fullBackupOnly="true"
-        android:fullBackupContent="@xml/backup_rules"
+        android:fullBackupContent="@xml/backup_rules_old"
+        android:dataExtractionRules="@xml/backup_rules"
         android:backupAgent=".AegisBackupAgent"
         android:icon="@mipmap/${iconName}"
         android:label="Aegis"
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
index 617fec3d..42973478 100644
--- a/app/src/main/res/xml/backup_rules.xml
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<full-backup-content>
-    <include domain="sharedpref" path="."/>
-    <include domain="file" path="backup/aegis.json"/>
-</full-backup-content>
+<data-extraction-rules>
+    <cloud-backup>
+        <include domain="sharedpref" path="."/>
+        <include domain="file" path="backup/aegis.json"/>
+    </cloud-backup>
+    <device-transfer>
+        <include domain="sharedpref" path="."/>
+        <include domain="file" path="backup/aegis.json"/>
+    </device-transfer>
+</data-extraction-rules>
diff --git a/app/src/main/res/xml/backup_rules_old.xml b/app/src/main/res/xml/backup_rules_old.xml
new file mode 100644
index 00000000..617fec3d
--- /dev/null
+++ b/app/src/main/res/xml/backup_rules_old.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <include domain="sharedpref" path="."/>
+    <include domain="file" path="backup/aegis.json"/>
+</full-backup-content>