From 836ca1cc6bbe24bd95732d4c9b2d23a78ece1466 Mon Sep 17 00:00:00 2001
From: albexk <albexk@proton.me>
Date: Thu, 14 Dec 2023 17:59:03 +0300
Subject: [PATCH] Switch to Qt fileprovider introduced in 6.6

---
 client/android/AndroidManifest.xml          | 6 ++----
 client/android/res/xml/fileprovider.xml     | 4 ----
 client/android/res/xml/qtprovider_paths.xml | 4 ++++
 3 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 client/android/res/xml/fileprovider.xml
 create mode 100644 client/android/res/xml/qtprovider_paths.xml

diff --git a/client/android/AndroidManifest.xml b/client/android/AndroidManifest.xml
index 5765167ae..ca6ce99aa 100644
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -113,14 +113,12 @@
             <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="vpn" />
         </service>
 
-        <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="org.amnezia.vpn.fileprovider"
+            android:authorities="org.amnezia.vpn.qtprovider"
             android:exported="false"
             android:grantUriPermissions="true">
-            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/fileprovider" />
+        <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/qtprovider_paths" />
         </provider>
     </application>
-
 </manifest>
diff --git a/client/android/res/xml/fileprovider.xml b/client/android/res/xml/fileprovider.xml
deleted file mode 100644
index 426348c00..000000000
--- a/client/android/res/xml/fileprovider.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <cache-path name="cache" path="/" />
-</paths>
\ No newline at end of file
diff --git a/client/android/res/xml/qtprovider_paths.xml b/client/android/res/xml/qtprovider_paths.xml
new file mode 100644
index 000000000..9f35fe988
--- /dev/null
+++ b/client/android/res/xml/qtprovider_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <files-path name="files_path" path="/"/>
+</paths>