mobile/element-android
mobile/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-07-21 01:54:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

merging with develop

Browse source
This commit is contained in:
Adam Brown 2022-08-11 11:22:14 +01:00
parent 244aa094ef
commit 177049ba91
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
vector-app/build.gradle
View file

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

2
vector/build.gradle
View file

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

2
vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
View file

@ -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