merging with develop

vector-app/build.gradle

@@ -377,3 +377,4 @@ dependencies {
     androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10"
     debugImplementation libs.androidx.fragmentTesting
 }
+

vector/build.gradle

@@ -92,8 +92,6 @@ android {
         fdroid {
             dimension "store"
 
-            versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
-
             buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
             buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
         }

vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt

@@ -32,7 +32,7 @@ class FirebaseNightlyProxy @Inject constructor(
         @DefaultPreferences
         private val sharedPreferences: SharedPreferences,
         private val buildMeta: BuildMeta,
-): NightlyProxy {
+) : NightlyProxy {
 
     override fun onHomeResumed() {
         if (!canDisplayPopup()) return