From 59f55beab1487aaa0f80d049830ad43518f9f052 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Sep 2022 17:49:42 +0200
Subject: [PATCH] Moving manifest `manifest.application$name` attribute to the
 main manifest, to make it available for both fdroid and gplay variant. Fixes
 #6995.

---
 vector-app/src/gplay/AndroidManifest.xml | 2 +-
 vector-app/src/main/AndroidManifest.xml  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector-app/src/gplay/AndroidManifest.xml b/vector-app/src/gplay/AndroidManifest.xml
index bc74b9bb52..a5f0eae6be 100755
--- a/vector-app/src/gplay/AndroidManifest.xml
+++ b/vector-app/src/gplay/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application android:name="im.vector.app.VectorApplication">
+    <application>
 
         <!-- Firebase components -->
         <meta-data
diff --git a/vector-app/src/main/AndroidManifest.xml b/vector-app/src/main/AndroidManifest.xml
index 774fc43d48..84607cf3d7 100644
--- a/vector-app/src/main/AndroidManifest.xml
+++ b/vector-app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
     package="im.vector.application">
 
     <application
+        android:name="im.vector.app.VectorApplication"
         android:allowBackup="false"
         android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"