Merge pull request #16699 from wordpress-mobile/issue/16067-android12…

…-backup-restore-xml

Android 12: Backup and restore - New format for the XML configuration

WordPress/src/main/AndroidManifest.xml

@@ -53,7 +53,8 @@
 
     <application
         android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_scheme"
+        android:fullBackupContent="@xml/legacy_backup_scheme"
+        android:dataExtractionRules="@xml/backup_scheme"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/app_icon"
         android:label="@string/app_name"

WordPress/src/main/res/xml/backup_scheme.xml

@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<full-backup-content>
-  <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"/>
-</full-backup-content>
+<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>

WordPress/src/main/res/xml/legacy_backup_scheme.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+  <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"/>
+</full-backup-content>