From 54a2b28219c3622a487c7639030077152dce1378 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Mon, 26 May 2025 20:36:36 +0800
Subject: [PATCH] Auto backup improvements

- Fix backup data size quota exceed
- Backup cookies and preferences on Android 9+ (require E2EE)
---
 app/src/main/res/xml-v28/backup_scheme.xml     | 14 ++++++++++++++
 app/src/main/res/xml/backup_scheme.xml         |  7 +------
 app/src/main/res/xml/data_extraction_rules.xml | 14 +++++++++++---
 3 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/xml-v28/backup_scheme.xml

diff --git a/app/src/main/res/xml-v28/backup_scheme.xml b/app/src/main/res/xml-v28/backup_scheme.xml
new file mode 100644
index 000000000..789bc2ef1
--- /dev/null
+++ b/app/src/main/res/xml-v28/backup_scheme.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <include
+        domain="database"
+        path="." />
+    <include
+        domain="file"
+        path="datastore"
+        requireFlags="clientSideEncryption" />
+    <include
+        domain="root"
+        path="app_webview/Default/Cookies"
+        requireFlags="clientSideEncryption" />
+</full-backup-content>
diff --git a/app/src/main/res/xml/backup_scheme.xml b/app/src/main/res/xml/backup_scheme.xml
index 8bc7f1605..8147f3764 100644
--- a/app/src/main/res/xml/backup_scheme.xml
+++ b/app/src/main/res/xml/backup_scheme.xml
@@ -15,12 +15,7 @@
   -->
 
 <full-backup-content>
-
     <include
         domain="database"
-        path="eh.db" />
-    <include
-        domain="database"
-        path="search_database.db" />
-
+        path="." />
 </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 cf0ea86ae..0de31c51b 100644
--- a/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -15,7 +15,15 @@
   -->
 
 <data-extraction-rules>
-    <cloud-backup>
-
+    <cloud-backup disableIfNoEncryptionCapabilities="true">
+        <include
+            domain="database"
+            path="." />
+        <include
+            domain="file"
+            path="datastore" />
+        <include
+            domain="root"
+            path="app_webview/Default/Cookies" />
     </cloud-backup>
-</data-extraction-rules>
\ No newline at end of file
+</data-extraction-rules>