Skip to content

[Fix] [Shared login] Add feature flag to SharedLoginProvider #17285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RenanLukas merged 1 commit into from
Oct 10, 2022
Merged

[Fix] [Shared login] Add feature flag to SharedLoginProvider #17285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ android {
buildConfigField "boolean", "JETPACK_POWERED_BOTTOM_SHEET", "false"
buildConfigField "boolean", "JETPACK_SHARED_LOGIN", "false"
buildConfigField "boolean", "JETPACK_LOCAL_USER_FLAGS", "false"
buildConfigField "boolean", "JETPACK_PROVIDER_SYNC", "false"

// Override these constants in jetpack product flavor to enable/ disable features
buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
Expand Down
5 changes: 5 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/sharedlogin/provider/SharedLoginProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import org.wordpress.android.fluxc.store.AccountStore
import org.wordpress.android.provider.query.QueryContentProvider
import org.wordpress.android.provider.query.QueryResult
import org.wordpress.android.sharedlogin.data.JetpackPublicData
import org.wordpress.android.util.config.JetpackProviderSyncFeatureConfig
import org.wordpress.android.util.signature.SignatureNotFoundException
import org.wordpress.android.util.signature.SignatureUtils
import javax.inject.Inject
Expand All @@ -16,6 +17,7 @@ class SharedLoginProvider : QueryContentProvider() {
@Inject lateinit var signatureUtils: SignatureUtils
@Inject lateinit var queryResult: QueryResult
@Inject lateinit var jetpackPublicData: JetpackPublicData
@Inject lateinit var jetpackProviderSyncFeatureConfig: JetpackProviderSyncFeatureConfig

override fun onCreate(): Boolean {
return true
Expand All @@ -30,6 +32,9 @@ class SharedLoginProvider : QueryContentProvider() {
sortOrder: String?
): Cursor? {
inject()
if (!jetpackProviderSyncFeatureConfig.isEnabled()) {
return null
}
return context?.let {
try {
val callerPackageId = callingPackage
Expand Down
21 changes: 21 additions & 0 deletions ...Press/src/main/java/org/wordpress/android/util/config/JetpackProviderSyncFeatureConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.wordpress.android.util.config

import org.wordpress.android.BuildConfig
import org.wordpress.android.annotation.Feature
import org.wordpress.android.util.config.JetpackProviderSyncFeatureConfig.Companion.JETPACK_PROVIDER_SYNC_REMOTE_FIELD
import javax.inject.Inject

@Feature(JETPACK_PROVIDER_SYNC_REMOTE_FIELD, false)
class JetpackProviderSyncFeatureConfig
@Inject constructor(
appConfig: AppConfig
) : FeatureConfig(
appConfig,
BuildConfig.JETPACK_PROVIDER_SYNC,
JETPACK_PROVIDER_SYNC_REMOTE_FIELD
) {
companion object {
const val JETPACK_PROVIDER_SYNC_REMOTE_FIELD = "provider_sync_remote_field"
}
}