Skip to content

Commit 3ac74dc

Browse files
committed
Removed unused FFs with dead code
1 parent 2403aff commit 3ac74dc

File tree

5 files changed

+4
-26
lines changed

5 files changed

+4
-26
lines changed

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderDetailViewModel.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ import com.woocommerce.android.ui.payments.tracking.PaymentsFlowTracker
7070
import com.woocommerce.android.ui.products.addons.AddonRepository
7171
import com.woocommerce.android.ui.products.details.ProductDetailRepository
7272
import com.woocommerce.android.ui.shipping.InstallWCShippingViewModel
73-
import com.woocommerce.android.util.FeatureFlag
7473
import com.woocommerce.android.util.WooLog
7574
import com.woocommerce.android.util.WooLog.T
7675
import com.woocommerce.android.viewmodel.LiveDataDelegate
@@ -220,8 +219,7 @@ class OrderDetailViewModel @Inject constructor(
220219
private var pluginsInformation: Map<String, WooPlugin> = HashMap()
221220

222221
private val isRevampWooShippingEnabled: Boolean
223-
get() = FeatureFlag.REVAMP_WOO_SHIPPING.isEnabled() &&
224-
shippingLabelOnboardingRepository.shippingPluginSupport.isWooShippingSupported()
222+
get() = shippingLabelOnboardingRepository.shippingPluginSupport.isWooShippingSupported()
225223

226224
init {
227225
productImageMap.subscribeToOnProductFetchedEvents(this)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/ShippingLabelOnboardingRepository.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import com.woocommerce.android.AppPrefsWrapper
44
import com.woocommerce.android.extensions.semverCompareTo
55
import com.woocommerce.android.model.Order
66
import com.woocommerce.android.tools.SelectedSite
7-
import com.woocommerce.android.util.FeatureFlag
87
import javax.inject.Inject
98

109
class ShippingLabelOnboardingRepository @Inject constructor(
@@ -52,11 +51,7 @@ class ShippingLabelOnboardingRepository @Inject constructor(
5251
it.isOperational &&
5352
pluginVersion.semverCompareTo(SUPPORTED_WC_SHIPPING_VERSION) >= 0
5453
}?.let {
55-
return if (FeatureFlag.REVAMP_WOO_SHIPPING.isEnabled()) {
56-
ShippingLabelSupport.WC_SHIPPING_SUPPORTED
57-
} else {
58-
ShippingLabelSupport.WCS_SUPPORTED
59-
}
54+
return ShippingLabelSupport.WC_SHIPPING_SUPPORTED
6055
}
6156

6257
orderDetailRepository.getWooServicesPluginInfo()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.
7272
import com.woocommerce.android.ui.products.MutableMultipleSelectionPredicate
7373
import com.woocommerce.android.util.ChromeCustomTabUtils
7474
import com.woocommerce.android.util.CurrencyFormatter
75-
import com.woocommerce.android.util.FeatureFlag
7675
import com.woocommerce.android.util.StringUtils
7776
import com.woocommerce.android.viewmodel.MultiLiveEvent
7877
import com.woocommerce.android.widgets.WCEmptyView.EmptyViewType
@@ -244,10 +243,7 @@ class OrderListFragment :
244243
binding.orderFiltersCard.setClickListener { viewModel.onFiltersButtonTapped() }
245244
initCreateOrderFAB(binding.createOrderButton)
246245
initSwipeBehaviour()
247-
248-
if (FeatureFlag.BULK_UPDATE_ORDERS_STATUS.isEnabled()) {
249-
addSelectionTracker()
250-
}
246+
addSelectionTracker()
251247
}
252248

253249
private fun addSelectionTracker() {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.H
3131
import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.NonWooSiteUiModel
3232
import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.WooSiteUiModel
3333
import com.woocommerce.android.ui.sitepicker.sitevisibility.GetWooVisibleSites
34-
import com.woocommerce.android.util.FeatureFlag
3534
import com.woocommerce.android.util.WooLog
3635
import com.woocommerce.android.viewmodel.LiveDataDelegate
3736
import com.woocommerce.android.viewmodel.MultiLiveEvent
@@ -233,8 +232,7 @@ class SitePickerViewModel @Inject constructor(
233232
val isSelectedSiteVisible = getWooVisibleSites().any { it.id == selectedSiteId }
234233
_sites.value = buildSitesList(wooSites, selectedSiteId, nonWooSites)
235234

236-
val isEditListEnabled = FeatureFlag.HIDE_SITES_FROM_SITE_PICKER.isEnabled() &&
237-
!navArgs.openedFromLogin &&
235+
val isEditListEnabled = !navArgs.openedFromLogin &&
238236
wooSites.size > 1
239237
if (isEditListEnabled && sitePickerViewState.editStoreListEnabled.not()) {
240238
analyticsTrackerWrapper.track(stat = AnalyticsEvent.SITE_PICKER_EDIT_BUTTON_SHOWN)

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,8 @@ enum class FeatureFlag {
1010
WC_SHIPPING_BANNER,
1111
BETTER_CUSTOMER_SEARCH_M2,
1212
ORDER_CREATION_AUTO_TAX_RATE,
13-
NEW_SHIPPING_SUPPORT,
14-
REVAMP_WOO_SHIPPING,
15-
BULK_UPDATE_ORDERS_STATUS,
1613
WOO_POS_HISTORICAL_ORDERS_M1,
1714
WOO_POS_LOCAL_CATALOG_M1,
18-
HIDE_SITES_FROM_SITE_PICKER,
1915
AI_PRODUCT_IMAGE_BACKGROUND_REMOVAL;
2016

2117
fun isEnabled(context: Context? = null): Boolean {
@@ -30,11 +26,6 @@ enum class FeatureFlag {
3026
ORDER_CREATION_AUTO_TAX_RATE,
3127
AI_PRODUCT_IMAGE_BACKGROUND_REMOVAL,
3228
WOO_POS_LOCAL_CATALOG_M1 -> PackageUtils.isDebugBuild()
33-
34-
NEW_SHIPPING_SUPPORT,
35-
BULK_UPDATE_ORDERS_STATUS,
36-
HIDE_SITES_FROM_SITE_PICKER,
37-
REVAMP_WOO_SHIPPING -> true
3829
}
3930
}
4031
}

0 commit comments

Comments
 (0)