Merge pull request #7014 from vector-im/feature/bma/fix_fdroid_crash

Feature/bma/fix fdroid crash

vector-app/build.gradle

@@ -340,10 +340,6 @@ android {
                 "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
         ]
     }
-
-    buildFeatures {
-        viewBinding true
-    }
 }
 
 dependencies {

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

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"

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\""
         }
     }