From 7d5cdc8eddf8f22370717c0dda0088cb4ef38e65 Mon Sep 17 00:00:00 2001
From: Rob Emery <git@mintsoft.net>
Date: Mon, 16 Sep 2024 15:50:44 +0100
Subject: [PATCH 1/2] Enabling backup when the ClientSideEncryption is enabled

Signed-off-by: Rob Emery <git@mintsoft.net>
---
 ui/src/main/AndroidManifest.xml | 3 ++-
 ui/src/main/res/xml/backup.xml  | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 ui/src/main/res/xml/backup.xml

diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index 754992d5d..338c8cb86 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -37,7 +37,8 @@
 
     <application
         android:name=".Application"
-        android:allowBackup="false"
+        android:allowBackup="true"
+        android:fullBackupContent="@xml/backup"
         android:banner="@mipmap/banner"
         android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/ui/src/main/res/xml/backup.xml b/ui/src/main/res/xml/backup.xml
new file mode 100644
index 000000000..fa1dcb1d3
--- /dev/null
+++ b/ui/src/main/res/xml/backup.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <include domain="sharedpref" path="." requireFlags="clientSideEncryption" />
+    <include domain="database" path="." requireFlags="clientSideEncryption" />
+    <include domain="file" path="." requireFlags="clientSideEncryption" />
+</full-backup-content>
\ No newline at end of file

From 98a050dc1c85735d3dc2c99641073b3aa9ef1dac Mon Sep 17 00:00:00 2001
From: Rob Emery <git@mintsoft.net>
Date: Sun, 13 Oct 2024 16:25:01 +0100
Subject: [PATCH 2/2] Bumping to Android 6/SDK 23 so that client encryption is
 enforced as Android 5 just ignores it

Signed-off-by: Rob Emery <git@mintsoft.net>
---
 tunnel/build.gradle.kts | 2 +-
 ui/build.gradle.kts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tunnel/build.gradle.kts b/tunnel/build.gradle.kts
index 589d72dac..f834dce25 100644
--- a/tunnel/build.gradle.kts
+++ b/tunnel/build.gradle.kts
@@ -18,7 +18,7 @@ android {
     }
     namespace = "${pkg}.tunnel"
     defaultConfig {
-        minSdk = 21
+        minSdk = 23
     }
     externalNativeBuild {
         cmake {
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
index 5cdcb6a1c..f46fa5065 100644
--- a/ui/build.gradle.kts
+++ b/ui/build.gradle.kts
@@ -21,7 +21,7 @@ android {
     namespace = pkg
     defaultConfig {
         applicationId = pkg
-        minSdk = 21
+        minSdk = 23
         targetSdk = 34
         versionCode = providers.gradleProperty("wireguardVersionCode").get().toInt()
         versionName = providers.gradleProperty("wireguardVersionName").get()