rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moving build flavor information to the build meta

Browse Source
This commit is contained in:
Adam Brown 2022-07-08 16:53:08 +01:00
parent 18943e3453
commit cceac66504
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
View File

@ -221,6 +221,8 @@ object VectorStaticModule {
gitRevisionDate = BuildConfig.GIT_REVISION_DATE, gitRevisionDate = BuildConfig.GIT_REVISION_DATE,
gitBranchName = BuildConfig.GIT_BRANCH_NAME, gitBranchName = BuildConfig.GIT_BRANCH_NAME,
buildNumber = BuildConfig.BUILD_NUMBER, buildNumber = BuildConfig.BUILD_NUMBER,
flavorDescription = BuildConfig.FLAVOR_DESCRIPTION,
flavorShortDescription = BuildConfig.SHORT_FLAVOR_DESCRIPTION,
) )
@Provides @Provides

2
vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt
View File

@ -27,4 +27,6 @@ data class BuildMeta(
val gitRevisionDate: String, val gitRevisionDate: String,
val gitBranchName: String, val gitBranchName: String,
val buildNumber: String, val buildNumber: String,
val flavorDescription: String,
val flavorShortDescription: String,
) )

3
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
View File

@ -25,7 +25,6 @@ import android.view.View
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import com.squareup.moshi.Types import com.squareup.moshi.Types
import im.vector.app.BuildConfig
import im.vector.app.R import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.extensions.getAllChildFragments import im.vector.app.core.extensions.getAllChildFragments
@ -342,7 +341,7 @@ class BugReporter @Inject constructor(
// add some github labels // add some github labels
builder.addFormDataPart("label", buildMeta.versionName) builder.addFormDataPart("label", buildMeta.versionName)
builder.addFormDataPart("label", BuildConfig.FLAVOR_DESCRIPTION) builder.addFormDataPart("label", buildMeta.flavorDescription)
builder.addFormDataPart("label", buildMeta.gitBranchName) builder.addFormDataPart("label", buildMeta.gitBranchName)
// Special for Element // Special for Element

2
vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
View File

@ -68,7 +68,7 @@ data class E2EWellKnownConfig(
val secureBackupSetupMethods: List<String>? = null, val secureBackupSetupMethods: List<String>? = null,
/** /**
* Configuration for sharing keys strategy which should be used instead of [im.vector.app.BuildConfig.outboundSessionKeySharingStrategy]. * Configuration for sharing keys strategy which should be used instead of [im.vector.app.config.Config.KEY_SHARING_STRATEGY].
* One of on_room_opening, on_typing or disabled. * One of on_room_opening, on_typing or disabled.
*/ */
@Json(name = "outbound_keys_pre_sharing_mode") @Json(name = "outbound_keys_pre_sharing_mode")

5
vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
View File

@ -16,7 +16,6 @@
package im.vector.app.features.version package im.vector.app.features.version
import im.vector.app.BuildConfig
import im.vector.app.core.resources.BuildMeta import im.vector.app.core.resources.BuildMeta
import im.vector.app.core.resources.VersionCodeProvider import im.vector.app.core.resources.VersionCodeProvider
import javax.inject.Inject import javax.inject.Inject
@ -27,9 +26,9 @@ class VersionProvider @Inject constructor(
) { ) {
fun getVersion(longFormat: Boolean, useBuildNumber: Boolean): String { fun getVersion(longFormat: Boolean, useBuildNumber: Boolean): String {
var result = "${BuildConfig.VERSION_NAME} [${versionCodeProvider.getVersionCode()}]" var result = "${buildMeta.versionName} [${versionCodeProvider.getVersionCode()}]"
var flavor = BuildConfig.SHORT_FLAVOR_DESCRIPTION var flavor = buildMeta.flavorShortDescription
if (flavor.isNotBlank()) { if (flavor.isNotBlank()) {
flavor += "-" flavor += "-"

2
vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt vendored
View File

@ -30,4 +30,6 @@ fun aBuildMeta() = BuildMeta(
gitRevisionDate = "01-01-01", gitRevisionDate = "01-01-01",
gitBranchName = "a-branch-name", gitBranchName = "a-branch-name",
buildNumber = "100", buildNumber = "100",
flavorDescription = "Gplay",
flavorShortDescription = "",
) )