filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests 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" androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10"
debugImplementation libs.androidx.fragmentTesting debugImplementation libs.androidx.fragmentTesting
} }

2
vector/build.gradle
View File

@ -92,8 +92,6 @@ android {
fdroid { fdroid {
dimension "store" dimension "store"
versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\"" buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\"" 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 @DefaultPreferences
private val sharedPreferences: SharedPreferences, private val sharedPreferences: SharedPreferences,
private val buildMeta: BuildMeta, private val buildMeta: BuildMeta,
): NightlyProxy { ) : NightlyProxy {
override fun onHomeResumed() { override fun onHomeResumed() {
if (!canDisplayPopup()) return if (!canDisplayPopup()) return