From 7879289877d64fcde40787b5c1d6831746b44dcd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Sep 2022 17:35:03 +0200
Subject: [PATCH 1/3] Remove useless field. They are defined in `vector-app`
 now.

---
 vector/build.gradle | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index ee549fc4b6..4f8db05e73 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -78,17 +78,10 @@ android {
     productFlavors {
         gplay {
             dimension "store"
-            isDefault = true
-
-            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\""
-            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
         }
 
         fdroid {
             dimension "store"
-
-            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
-            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
         }
     }
 

From bf25ef436979762324bbc9d56c07031f4c68c702 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Sep 2022 17:40:34 +0200
Subject: [PATCH 2/3] There are no views to bind in this module.

---
 vector-app/build.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 2368586bfb..a8262fde40 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -340,10 +340,6 @@ android {
                 "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
         ]
     }
-
-    buildFeatures {
-        viewBinding true
-    }
 }
 
 dependencies {

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 3/3] 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"