From cf65c5eefce6a2eb9d76c6aabdffa31ac491b094 Mon Sep 17 00:00:00 2001
From: ashiagr <agr.ash@gmail.com>
Date: Thu, 2 Jun 2022 17:11:54 +0530
Subject: [PATCH 1/2] Rename old backup schema

---
 WordPress/src/main/AndroidManifest.xml                          | 2 +-
 .../res/xml/{backup_scheme.xml => legacy_backup_scheme.xml}     | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename WordPress/src/main/res/xml/{backup_scheme.xml => legacy_backup_scheme.xml} (100%)

diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
index cc0f75ef2de8..3eb524f90dbe 100644
--- a/WordPress/src/main/AndroidManifest.xml
+++ b/WordPress/src/main/AndroidManifest.xml
@@ -56,7 +56,7 @@
 
     <application
         android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_scheme"
+        android:fullBackupContent="@xml/legacy_backup_scheme"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/app_icon"
         android:label="@string/app_name"
diff --git a/WordPress/src/main/res/xml/backup_scheme.xml b/WordPress/src/main/res/xml/legacy_backup_scheme.xml
similarity index 100%
rename from WordPress/src/main/res/xml/backup_scheme.xml
rename to WordPress/src/main/res/xml/legacy_backup_scheme.xml

From 423bdabe04f54b05e51479debb4191d390167bcb Mon Sep 17 00:00:00 2001
From: ashiagr <agr.ash@gmail.com>
Date: Thu, 2 Jun 2022 17:12:40 +0530
Subject: [PATCH 2/2] Add backup schema in new format for Android 12

---
 WordPress/src/main/AndroidManifest.xml       |  1 +
 WordPress/src/main/res/xml/backup_scheme.xml | 31 ++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 WordPress/src/main/res/xml/backup_scheme.xml

diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
index 3eb524f90dbe..77409ee5ceba 100644
--- a/WordPress/src/main/AndroidManifest.xml
+++ b/WordPress/src/main/AndroidManifest.xml
@@ -57,6 +57,7 @@
     <application
         android:allowBackup="true"
         android:fullBackupContent="@xml/legacy_backup_scheme"
+        android:dataExtractionRules="@xml/backup_scheme"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/app_icon"
         android:label="@string/app_name"
diff --git a/WordPress/src/main/res/xml/backup_scheme.xml b/WordPress/src/main/res/xml/backup_scheme.xml
new file mode 100644
index 000000000000..1f9c296928a1
--- /dev/null
+++ b/WordPress/src/main/res/xml/backup_scheme.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <include
+            domain="database"
+            path="wordpress" />
+        <include
+            domain="database"
+            path="persistentedittext.db" />
+        <include
+            domain="sharedpref"
+            path="self_signed_certs_truststore.bks" />
+        <include
+            domain="sharedpref"
+            path="org.wordpress.android_preferences.xml" />
+    </cloud-backup>
+    <device-transfer>
+        <include
+            domain="database"
+            path="wordpress" />
+        <include
+            domain="database"
+            path="persistentedittext.db" />
+        <include
+            domain="sharedpref"
+            path="self_signed_certs_truststore.bks" />
+        <include
+            domain="sharedpref"
+            path="org.wordpress.android_preferences.xml" />
+    </device-transfer>
+</data-extraction-rules>