Skip to content

Commit b28e928

Browse files
committed
Removed JETPACK_CP FF
1 parent 1f98ef0 commit b28e928

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/sitepicker/SitePickerViewModel.kt

+3-10
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitePickerEvent
2727
import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.Header
2828
import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.NonWooSiteUiModel
2929
import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.WooSiteUiModel
30-
import com.woocommerce.android.util.FeatureFlag
3130
import com.woocommerce.android.util.WooLog
3231
import com.woocommerce.android.viewmodel.LiveDataDelegate
3332
import com.woocommerce.android.viewmodel.MultiLiveEvent
@@ -160,9 +159,7 @@ class SitePickerViewModel @Inject constructor(
160159

161160
private suspend fun getSitesFromDb(): List<SiteModel> {
162161
val sitesInDb = repository.getSites()
163-
return if (!FeatureFlag.JETPACK_CP.isEnabled() ||
164-
sitesInDb.none { it.isJetpackCPConnected }
165-
) {
162+
return if (sitesInDb.none { it.isJetpackCPConnected }) {
166163
sitesInDb
167164
} else {
168165
emptyList()
@@ -190,9 +187,7 @@ class SitePickerViewModel @Inject constructor(
190187
}
191188

192189
private fun onSitesLoaded(sites: List<SiteModel>) {
193-
val filteredSites = sites.filter {
194-
FeatureFlag.JETPACK_CP.isEnabled() || !it.isJetpackCPConnected
195-
}
190+
val filteredSites = sites.filter { !it.isJetpackCPConnected }
196191

197192
if (filteredSites.isEmpty()) {
198193
when {
@@ -268,9 +263,7 @@ class SitePickerViewModel @Inject constructor(
268263
* - Has WooCommerce installed
269264
*/
270265
private fun processLoginSiteAddress(url: String) {
271-
val site = repository.getSiteBySiteUrl(url)?.takeIf {
272-
FeatureFlag.JETPACK_CP.isEnabled() || !it.isJetpackCPConnected
273-
}
266+
val site = repository.getSiteBySiteUrl(url)?.takeIf { !it.isJetpackCPConnected }
274267
when {
275268
site == null -> {
276269
// The url doesn't match any sites for this account.

WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import android.content.Context
77
*/
88
enum class FeatureFlag {
99
DB_DOWNGRADE,
10-
JETPACK_CP,
1110
MORE_MENU_INBOX,
1211
WC_SHIPPING_BANNER,
1312
UNIFIED_ORDER_EDITING,
@@ -34,7 +33,6 @@ enum class FeatureFlag {
3433
PackageUtils.isDebugBuild() || context != null && PackageUtils.isBetaBuild(context)
3534
}
3635

37-
JETPACK_CP,
3836
UNIFIED_ORDER_EDITING,
3937
STORE_CREATION_ONBOARDING,
4038
REST_API_I2,

0 commit comments

Comments
 (0)