mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-02 00:17:41 +01:00
Update internal and local backup access.
This commit is contained in:
committed by
Greyson Parrelli
parent
bd4ce1788c
commit
95c0bc6052
@@ -13,6 +13,11 @@ object Environment {
|
||||
const val IS_WEBSITE: Boolean = BuildConfig.BUILD_DISTRIBUTION_TYPE == "website"
|
||||
const val IS_INSTRUMENTATION: Boolean = BuildConfig.BUILD_VARIANT_TYPE == "Instrumentation" || BuildConfig.BUILD_VARIANT_TYPE == "Benchmark"
|
||||
const val IS_BENCHMARK: Boolean = BuildConfig.BUILD_VARIANT_TYPE == "Benchmark"
|
||||
const val IS_PERF: Boolean = BuildConfig.BUILD_VARIANT_TYPE == "Perf"
|
||||
|
||||
fun isInternal(): Boolean {
|
||||
return !IS_INSTRUMENTATION && (BuildConfig.DEBUG || IS_NIGHTLY || IS_PERF || IS_STAGING)
|
||||
}
|
||||
|
||||
object Backups {
|
||||
@JvmStatic
|
||||
@@ -22,7 +27,7 @@ object Environment {
|
||||
|
||||
@JvmStatic
|
||||
fun isNewFormatSupportedForLocalBackup(): Boolean {
|
||||
return BuildConfig.DEBUG || IS_NIGHTLY
|
||||
return isInternal()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -590,7 +590,7 @@ object RemoteConfig {
|
||||
key = "android.internalUser",
|
||||
hotSwappable = true
|
||||
) { value ->
|
||||
value.asBoolean(false) || Environment.IS_NIGHTLY || Environment.IS_STAGING
|
||||
value.asBoolean(false) || Environment.isInternal()
|
||||
}
|
||||
|
||||
/** The raw client expiration JSON string. */
|
||||
|
||||
@@ -8,6 +8,7 @@ import assertk.assertions.isNull
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import io.mockk.mockkObject
|
||||
import io.mockk.mockkStatic
|
||||
import io.mockk.slot
|
||||
import io.mockk.unmockkAll
|
||||
import io.mockk.verify
|
||||
@@ -80,6 +81,7 @@ class GroupManagerV2Test_edit {
|
||||
@Before
|
||||
fun setUp() {
|
||||
mockkObject(RemoteConfig)
|
||||
mockkStatic(RemoteConfig::class)
|
||||
mockkObject(SignalStore)
|
||||
every { RemoteConfig.internalUser } returns false
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ tasks.register("qa") {
|
||||
|
||||
// Wire up QA dependencies after all projects are evaluated
|
||||
gradle.projectsEvaluated {
|
||||
val appTestTask = tasks.findByPath(":Signal-Android:testPlayProdPerfUnitTest")
|
||||
val appTestTask = tasks.findByPath(":Signal-Android:testPlayProdReleaseUnitTest")
|
||||
val appLintTask = tasks.findByPath(":Signal-Android:lintPlayProdRelease")
|
||||
|
||||
tasks.named("qa") {
|
||||
|
||||
Reference in New Issue
Block a user