Skip to content

Commit

Permalink
Rename setEnabled to setRawStoredState (#5090)
Browse files Browse the repository at this point in the history
Task/Issue URL:
https://app.asana.com/0/1202552961248957/1208452736654214/f

### Description
Rename setEnable(state: Toggle.State) to setRawStoredState(state:
Toggle.State)

### Steps to test this PR
Just renaming, build and test pass
  • Loading branch information
aitorvs authored Oct 2, 2024
1 parent b6181ba commit 0fd0bb0
Show file tree
Hide file tree
Showing 71 changed files with 1,218 additions and 1,064 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
exceptionStore.insertAll(exceptions)
val isEnabled = (feature.state == "enabled") || (appBuildConfig.flavor == %T && feature.state == "internal")
this.feature.get().invokeMethod("self").setEnabled(
this.feature.get().invokeMethod("self").setRawStoredState(
Toggle.State(
remoteEnableState = isEnabled,
enable = isEnabled,
Expand All @@ -514,7 +514,7 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
variantKey = target.variantKey,
)
} ?: emptyList()
this.feature.get().invokeMethod(subfeature.key).setEnabled(
this.feature.get().invokeMethod(subfeature.key).setRawStoredState(
Toggle.State(
remoteEnableState = newStateValue,
enable = previousStateValue,
Expand Down
26 changes: 13 additions & 13 deletions app-tracking-protection/vpn-impl/lint-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
id="BadPeriodicWorkRequestEnqueue"
message="Use `enqueueUniquePeriodicWork()` instead of `enqueue()`">
<location
file="$GRADLE_USER_HOME/caches/8.8/transforms/60bb49271848f44d88e12b0552723246/transformed/work-runtime-2.9.0/jars/classes.jar!/androidx/work/WorkManager.class"/>
file="$GRADLE_USER_HOME/caches/8.8/transforms/d14625ee55ebfba3972ab06f22b2b3b9/transformed/work-runtime-2.9.1/jars/classes.jar!/androidx/work/WorkManager.class"/>
</issue>

<issue
Expand Down Expand Up @@ -55,8 +55,8 @@
<issue
id="DenyListedApi"
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
errorLine1=" appTpRemoteFeatures.restartOnConnectivityLoss().setEnabled(Toggle.State(enable = false))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
errorLine1=" appTpRemoteFeatures.restartOnConnectivityLoss().setRawStoredState(Toggle.State(enable = false))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/test/java/com/duckduckgo/mobile/android/app/tracking/AppTPVpnConnectivityLossListenerTest.kt"
line="89"
Expand All @@ -66,8 +66,8 @@
<issue
id="DenyListedApi"
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
errorLine1=" setting.self().setEnabled(State(enabled))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
errorLine1=" setting.self().setRawStoredState(State(enabled))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionNewTabSettingsViewModel.kt"
line="61"
Expand All @@ -77,8 +77,8 @@
<issue
id="DenyListedApi"
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
errorLine1=" setting.self().setEnabled(State(enable = true))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
errorLine1=" setting.self().setRawStoredState(State(enable = true))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/test/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionNewTabSettingsViewModelTest.kt"
line="55"
Expand All @@ -88,8 +88,8 @@
<issue
id="DenyListedApi"
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
errorLine1=" setting.self().setEnabled(State(enable = false))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
errorLine1=" setting.self().setRawStoredState(State(enable = false))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/test/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionNewTabSettingsViewModelTest.kt"
line="66"
Expand All @@ -99,8 +99,8 @@
<issue
id="DenyListedApi"
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
errorLine1=" setting.self().setEnabled(State(enable = false))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
errorLine1=" setting.self().setRawStoredState(State(enable = false))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/test/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionNewTabSettingsViewModelTest.kt"
line="78"
Expand All @@ -110,8 +110,8 @@
<issue
id="DenyListedApi"
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
errorLine1=" setting.self().setEnabled(State(enable = false))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
errorLine1=" setting.self().setRawStoredState(State(enable = false))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/test/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionNewTabSettingsViewModelTest.kt"
line="86"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class AppTrackingProtectionNewTabSettingsViewModel @Inject constructor(
}

fun onSettingEnabled(enabled: Boolean) {
setting.self().setEnabled(State(enabled))
setting.self().setRawStoredState(State(enabled))
pixel.reportNewTabSectionToggled(enabled)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class AppTPVpnConnectivityLossListenerTest {
fun whenRestartOnConnectivityLossIsDisabledThenNoop() = runTest {
whenever(networkProtectionState.isEnabled()).thenReturn(false)
whenever(appTrackingProtection.isEnabled()).thenReturn(true)
appTpRemoteFeatures.restartOnConnectivityLoss().setEnabled(Toggle.State(enable = false))
appTpRemoteFeatures.restartOnConnectivityLoss().setRawStoredState(Toggle.State(enable = false))

listener.onVpnConnectivityLoss(coroutinesTestRule.testScope)
listener.onVpnConnectivityLoss(coroutinesTestRule.testScope)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class AppTrackingProtectionNewTabSettingsViewModelTest {

@Test
fun whenViewCreatedAndSettingEnabledThenViewStateUpdated() = runTest {
setting.self().setEnabled(State(enable = true))
setting.self().setRawStoredState(State(enable = true))
testee.onCreate(lifecycleOwner)
testee.viewState.test {
expectMostRecentItem().also {
Expand All @@ -63,7 +63,7 @@ class AppTrackingProtectionNewTabSettingsViewModelTest {

@Test
fun whenViewCreatedAndSettingDisabledThenViewStateUpdated() = runTest {
setting.self().setEnabled(State(enable = false))
setting.self().setRawStoredState(State(enable = false))

testee.onCreate(lifecycleOwner)
testee.viewState.test {
Expand All @@ -75,15 +75,15 @@ class AppTrackingProtectionNewTabSettingsViewModelTest {

@Test
fun whenSettingEnabledThenPixelFired() = runTest {
setting.self().setEnabled(State(enable = false))
setting.self().setRawStoredState(State(enable = false))

testee.onSettingEnabled(true)
verify(pixels).reportNewTabSectionToggled(true)
}

@Test
fun whenSettingDisabledThenPixelFired() = runTest {
setting.self().setEnabled(State(enable = false))
setting.self().setRawStoredState(State(enable = false))
testee.onSettingEnabled(false)
verify(pixels).reportNewTabSectionToggled(false)
}
Expand Down
8 changes: 4 additions & 4 deletions app-tracking-protection/vpn-internal/lint-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<issue
id="DenyListedApi"
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
errorLine1=" appTpLocalFeature.verboseLogging().setEnabled(Toggle.State(enable = true))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
errorLine1=" appTpLocalFeature.verboseLogging().setRawStoredState(Toggle.State(enable = true))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/com/duckduckgo/vpn/internal/feature/logs/DebugLoggingReceiver.kt"
line="80"
Expand All @@ -15,8 +15,8 @@
<issue
id="DenyListedApi"
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
errorLine1=" appTpLocalFeature.verboseLogging().setEnabled(Toggle.State(enable = false))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
errorLine1=" appTpLocalFeature.verboseLogging().setRawStoredState(Toggle.State(enable = false))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/com/duckduckgo/vpn/internal/feature/logs/DebugLoggingReceiver.kt"
line="91"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class DebugLoggingReceiverRegister @Inject constructor(
receiver = DebugLoggingReceiver(context) { intent ->
when {
DebugLoggingReceiver.isLoggingOnIntent(intent) -> {
appTpLocalFeature.verboseLogging().setEnabled(Toggle.State(enable = true))
appTpLocalFeature.verboseLogging().setRawStoredState(Toggle.State(enable = true))
TimberExtensions.enableLogging()

// To propagate changes to NetGuard, reconfigure the VPN
Expand All @@ -88,7 +88,7 @@ class DebugLoggingReceiverRegister @Inject constructor(
}
}
DebugLoggingReceiver.isLoggingOffIntent(intent) -> {
appTpLocalFeature.verboseLogging().setEnabled(Toggle.State(enable = false))
appTpLocalFeature.verboseLogging().setRawStoredState(Toggle.State(enable = false))
TimberExtensions.disableLogging()

// To propagate changes to NetGuard, reconfigure the VPN
Expand Down
Loading

0 comments on commit 0fd0bb0

Please sign in to comment.