From 6d4df646afaf11106f1a5c2cdae62d367eebb965 Mon Sep 17 00:00:00 2001
From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com>
Date: Mon, 15 Apr 2024 20:18:48 -0400
Subject: [PATCH] Allow backup & restore to cloud and device transfer (#32)

---
 app/src/main/AndroidManifest.xml              |  2 +-
 app/src/main/res/xml/backup_rules.xml         | 20 ++++---------
 .../main/res/xml/data_extraction_rules.xml    | 28 +++++++++----------
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 955449cf56..6f38ab8166 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
 
     <application
         android:name=".AuthenticatorApplication"
-        android:allowBackup="false"
+        android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
index 07a6161e3c..eae8d08e6b 100644
--- a/app/src/main/res/xml/backup_rules.xml
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<full-backup-content>
-    <exclude
+<full-backup-content xmlns:tools="http://schemas.android.com/tools">
+    <include
         domain="sharedpref"
-        path="." />
-    <exclude
-        domain="file"
-        path="." />
+        path="com.x8bit.bitwarden.authenticator_preferences.xml" />
     <exclude
         domain="database"
-        path="." />
-    <exclude
-        domain="external"
-        path="." />
-    <exclude
-        domain="root"
-        path="." />
-</full-backup-content>
\ No newline at end of file
+        path="."
+        tools:ignore="FullBackupContent" />
+</full-backup-content>
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
index 9ee9997b0b..7cc1a27822 100644
--- a/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample data extraction rules file; uncomment and customize as necessary.
-   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
-   for details.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <data-extraction-rules>
     <cloud-backup>
-        <!-- TODO: Use <include> and <exclude> to control what is backed up.
-        <include .../>
-        <exclude .../>
-        -->
+        <include
+            domain="sharedpref"
+            path="com.x8bit.bitwarden.authenticator_preferences.xml" />
+        <include
+            domain="database"
+            path="." />
     </cloud-backup>
-    <!--
     <device-transfer>
-        <include .../>
-        <exclude .../>
+        <include
+            domain="sharedpref"
+            path="com.x8bit.bitwarden.authenticator_preferences.xml" />
+        <include
+            domain="database"
+            path="." />
     </device-transfer>
-    -->
-</data-extraction-rules>
\ No newline at end of file
+</data-extraction-rules>