From 52b07021a77b1b67a46fcca36d8b32e7d06dfe3f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 30 Jun 2022 14:19:04 +0200
Subject: [PATCH 1/3] Add android:hasFragileUserData="true" to the manifest.
 See details in #2352

---
 vector/src/main/AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 1e7a40cef2..c08e89f6a5 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
     <application
         android:name=".VectorApplication"
         android:allowBackup="false"
+        android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
@@ -85,6 +86,7 @@
         android:supportsRtl="true"
         android:taskAffinity="${applicationId}.${appTaskAffinitySuffix}"
         android:theme="@style/Theme.Vector.Light"
+        tools:ignore="UnusedAttribute"
         tools:replace="android:allowBackup">
 
         <!-- No limit for screen ratio: avoid black strips -->

From 2118eaea906eef871fd2f8929600d1146132fdcb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 30 Jun 2022 14:19:20 +0200
Subject: [PATCH 2/3] Format file

---
 vector/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index c08e89f6a5..032e256bfa 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -415,9 +415,9 @@
 
         <!-- UnifiedPush -->
         <receiver
-            android:exported="true"
+            android:name=".core.pushers.VectorMessagingReceiver"
             android:enabled="true"
-            android:name=".core.pushers.VectorMessagingReceiver">
+            android:exported="true">
             <intent-filter>
                 <action android:name="org.unifiedpush.android.connector.MESSAGE" />
                 <action android:name="org.unifiedpush.android.connector.UNREGISTERED" />

From 0c98a2f81fb84b86acf79307027c865de6c171e3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 30 Jun 2022 14:20:45 +0200
Subject: [PATCH 3/3] Changelog

---
 changelog.d/6429.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/6429.misc

diff --git a/changelog.d/6429.misc b/changelog.d/6429.misc
new file mode 100644
index 0000000000..4c748f652c
--- /dev/null
+++ b/changelog.d/6429.misc
@@ -0,0 +1 @@
+Add `android:hasFragileUserData="true"` in the manifest