From 177049ba91e34270889f0b755a8af74818396895 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Thu, 11 Aug 2022 11:22:14 +0100
Subject: [PATCH] merging with develop

---
 vector-app/build.gradle                                         | 1 +
 vector/build.gradle                                             | 2 --
 .../gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index f752e0bb30..e52d2b6bb9 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -377,3 +377,4 @@ dependencies {
     androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10"
     debugImplementation libs.androidx.fragmentTesting
 }
+
diff --git a/vector/build.gradle b/vector/build.gradle
index 5a2a90d600..c19aee0987 100644
--- a/vector/build.gradle
+++ b/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\""
         }
diff --git a/vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt b/vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
index 11ec2f8580..94a36036b6 100644
--- a/vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
+++ b/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