Skip to content

Commit 0fd0bb0

Browse files
aitorvsaitorvs
authored
Rename setEnabled to setRawStoredState (#5090)
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
1 parent b6181ba commit 0fd0bb0

File tree

71 files changed

+1218
-1064
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1218
-1064
lines changed

‎anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesRemoteFeatureCodeGenerator.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
487487
exceptionStore.insertAll(exceptions)
488488
489489
val isEnabled = (feature.state == "enabled") || (appBuildConfig.flavor == %T && feature.state == "internal")
490-
this.feature.get().invokeMethod("self").setEnabled(
490+
this.feature.get().invokeMethod("self").setRawStoredState(
491491
Toggle.State(
492492
remoteEnableState = isEnabled,
493493
enable = isEnabled,
@@ -514,7 +514,7 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
514514
variantKey = target.variantKey,
515515
)
516516
} ?: emptyList()
517-
this.feature.get().invokeMethod(subfeature.key).setEnabled(
517+
this.feature.get().invokeMethod(subfeature.key).setRawStoredState(
518518
Toggle.State(
519519
remoteEnableState = newStateValue,
520520
enable = previousStateValue,

‎app-tracking-protection/vpn-impl/lint-baseline.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
id="BadPeriodicWorkRequestEnqueue"
2828
message="Use `enqueueUniquePeriodicWork()` instead of `enqueue()`">
2929
<location
30-
file="$GRADLE_USER_HOME/caches/8.8/transforms/60bb49271848f44d88e12b0552723246/transformed/work-runtime-2.9.0/jars/classes.jar!/androidx/work/WorkManager.class"/>
30+
file="$GRADLE_USER_HOME/caches/8.8/transforms/d14625ee55ebfba3972ab06f22b2b3b9/transformed/work-runtime-2.9.1/jars/classes.jar!/androidx/work/WorkManager.class"/>
3131
</issue>
3232

3333
<issue
@@ -55,8 +55,8 @@
5555
<issue
5656
id="DenyListedApi"
5757
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
58-
errorLine1=" appTpRemoteFeatures.restartOnConnectivityLoss().setEnabled(Toggle.State(enable = false))"
59-
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
58+
errorLine1=" appTpRemoteFeatures.restartOnConnectivityLoss().setRawStoredState(Toggle.State(enable = false))"
59+
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
6060
<location
6161
file="src/test/java/com/duckduckgo/mobile/android/app/tracking/AppTPVpnConnectivityLossListenerTest.kt"
6262
line="89"
@@ -66,8 +66,8 @@
6666
<issue
6767
id="DenyListedApi"
6868
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
69-
errorLine1=" setting.self().setEnabled(State(enabled))"
70-
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
69+
errorLine1=" setting.self().setRawStoredState(State(enabled))"
70+
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
7171
<location
7272
file="src/main/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionNewTabSettingsViewModel.kt"
7373
line="61"
@@ -77,8 +77,8 @@
7777
<issue
7878
id="DenyListedApi"
7979
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
80-
errorLine1=" setting.self().setEnabled(State(enable = true))"
81-
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
80+
errorLine1=" setting.self().setRawStoredState(State(enable = true))"
81+
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
8282
<location
8383
file="src/test/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionNewTabSettingsViewModelTest.kt"
8484
line="55"
@@ -88,8 +88,8 @@
8888
<issue
8989
id="DenyListedApi"
9090
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
91-
errorLine1=" setting.self().setEnabled(State(enable = false))"
92-
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
91+
errorLine1=" setting.self().setRawStoredState(State(enable = false))"
92+
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
9393
<location
9494
file="src/test/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionNewTabSettingsViewModelTest.kt"
9595
line="66"
@@ -99,8 +99,8 @@
9999
<issue
100100
id="DenyListedApi"
101101
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
102-
errorLine1=" setting.self().setEnabled(State(enable = false))"
103-
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
102+
errorLine1=" setting.self().setRawStoredState(State(enable = false))"
103+
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
104104
<location
105105
file="src/test/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionNewTabSettingsViewModelTest.kt"
106106
line="78"
@@ -110,8 +110,8 @@
110110
<issue
111111
id="DenyListedApi"
112112
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
113-
errorLine1=" setting.self().setEnabled(State(enable = false))"
114-
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
113+
errorLine1=" setting.self().setRawStoredState(State(enable = false))"
114+
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
115115
<location
116116
file="src/test/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionNewTabSettingsViewModelTest.kt"
117117
line="86"

‎app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionNewTabSettingsViewModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class AppTrackingProtectionNewTabSettingsViewModel @Inject constructor(
5858
}
5959

6060
fun onSettingEnabled(enabled: Boolean) {
61-
setting.self().setEnabled(State(enabled))
61+
setting.self().setRawStoredState(State(enabled))
6262
pixel.reportNewTabSectionToggled(enabled)
6363
}
6464
}

‎app-tracking-protection/vpn-impl/src/test/java/com/duckduckgo/mobile/android/app/tracking/AppTPVpnConnectivityLossListenerTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class AppTPVpnConnectivityLossListenerTest {
8686
fun whenRestartOnConnectivityLossIsDisabledThenNoop() = runTest {
8787
whenever(networkProtectionState.isEnabled()).thenReturn(false)
8888
whenever(appTrackingProtection.isEnabled()).thenReturn(true)
89-
appTpRemoteFeatures.restartOnConnectivityLoss().setEnabled(Toggle.State(enable = false))
89+
appTpRemoteFeatures.restartOnConnectivityLoss().setRawStoredState(Toggle.State(enable = false))
9090

9191
listener.onVpnConnectivityLoss(coroutinesTestRule.testScope)
9292
listener.onVpnConnectivityLoss(coroutinesTestRule.testScope)

‎app-tracking-protection/vpn-impl/src/test/java/com/duckduckgo/mobile/android/vpn/ui/newtab/AppTrackingProtectionNewTabSettingsViewModelTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class AppTrackingProtectionNewTabSettingsViewModelTest {
5252

5353
@Test
5454
fun whenViewCreatedAndSettingEnabledThenViewStateUpdated() = runTest {
55-
setting.self().setEnabled(State(enable = true))
55+
setting.self().setRawStoredState(State(enable = true))
5656
testee.onCreate(lifecycleOwner)
5757
testee.viewState.test {
5858
expectMostRecentItem().also {
@@ -63,7 +63,7 @@ class AppTrackingProtectionNewTabSettingsViewModelTest {
6363

6464
@Test
6565
fun whenViewCreatedAndSettingDisabledThenViewStateUpdated() = runTest {
66-
setting.self().setEnabled(State(enable = false))
66+
setting.self().setRawStoredState(State(enable = false))
6767

6868
testee.onCreate(lifecycleOwner)
6969
testee.viewState.test {
@@ -75,15 +75,15 @@ class AppTrackingProtectionNewTabSettingsViewModelTest {
7575

7676
@Test
7777
fun whenSettingEnabledThenPixelFired() = runTest {
78-
setting.self().setEnabled(State(enable = false))
78+
setting.self().setRawStoredState(State(enable = false))
7979

8080
testee.onSettingEnabled(true)
8181
verify(pixels).reportNewTabSectionToggled(true)
8282
}
8383

8484
@Test
8585
fun whenSettingDisabledThenPixelFired() = runTest {
86-
setting.self().setEnabled(State(enable = false))
86+
setting.self().setRawStoredState(State(enable = false))
8787
testee.onSettingEnabled(false)
8888
verify(pixels).reportNewTabSectionToggled(false)
8989
}

‎app-tracking-protection/vpn-internal/lint-baseline.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<issue
55
id="DenyListedApi"
66
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
7-
errorLine1=" appTpLocalFeature.verboseLogging().setEnabled(Toggle.State(enable = true))"
8-
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
7+
errorLine1=" appTpLocalFeature.verboseLogging().setRawStoredState(Toggle.State(enable = true))"
8+
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
99
<location
1010
file="src/main/java/com/duckduckgo/vpn/internal/feature/logs/DebugLoggingReceiver.kt"
1111
line="80"
@@ -15,8 +15,8 @@
1515
<issue
1616
id="DenyListedApi"
1717
message="If you find yourself using this API in production, you&apos;re doing something wrong!!"
18-
errorLine1=" appTpLocalFeature.verboseLogging().setEnabled(Toggle.State(enable = false))"
19-
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
18+
errorLine1=" appTpLocalFeature.verboseLogging().setRawStoredState(Toggle.State(enable = false))"
19+
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
2020
<location
2121
file="src/main/java/com/duckduckgo/vpn/internal/feature/logs/DebugLoggingReceiver.kt"
2222
line="91"

‎app-tracking-protection/vpn-internal/src/main/java/com/duckduckgo/vpn/internal/feature/logs/DebugLoggingReceiver.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class DebugLoggingReceiverRegister @Inject constructor(
7777
receiver = DebugLoggingReceiver(context) { intent ->
7878
when {
7979
DebugLoggingReceiver.isLoggingOnIntent(intent) -> {
80-
appTpLocalFeature.verboseLogging().setEnabled(Toggle.State(enable = true))
80+
appTpLocalFeature.verboseLogging().setRawStoredState(Toggle.State(enable = true))
8181
TimberExtensions.enableLogging()
8282

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

9494
// To propagate changes to NetGuard, reconfigure the VPN

0 commit comments

Comments
 (0)