Skip to content
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

Update Settings: Update VPN settings item #5394

Merged
merged 20 commits into from
Dec 19, 2024
Merged

Update Settings: Update VPN settings item #5394

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a68b692
rename current vpn to legacy
mikescamell Dec 13, 2024
b755ce6
add new vpn item
mikescamell Dec 13, 2024
fb190ad
update vpn item to SettingsListItem
mikescamell Dec 13, 2024
7fae0be
create legacy state for netp
mikescamell Dec 13, 2024
2506140
add new VPNStatus mapping for new settings
mikescamell Dec 13, 2024
3672c5f
add new NetPAvailabilityState logic
mikescamell Dec 13, 2024
a10a921
hook up new NetPVisibilityState to new VPN item
mikescamell Dec 13, 2024
b98a0c3
update VpnTileStateProvider
mikescamell Dec 13, 2024
3454133
copy tests
mikescamell Dec 16, 2024
0df196d
fix and add new tests
mikescamell Dec 16, 2024
973841c
formatting
mikescamell Dec 16, 2024
6659685
Rollback changes to NetworkProtectionAccessState
mikescamell Dec 18, 2024
5702262
Add new NetworkProtectionSettingsState
mikescamell Dec 18, 2024
cd26218
move to return statement
mikescamell Dec 18, 2024
a731b97
rename function
mikescamell Dec 18, 2024
50e7b4d
revert back to original screen opening behaviour
mikescamell Dec 18, 2024
c611873
formatting
mikescamell Dec 18, 2024
9d70526
fix line length...again
mikescamell Dec 18, 2024
aaf9519
fix ProSettingNetPViewModelTest
mikescamell Dec 18, 2024
da4e853
add NetworkProtectionSettingsStateImplTest
mikescamell Dec 18, 2024
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
Prev Previous commit
Next Next commit
fix line length...again
  • Loading branch information
@mikescamell
mikescamell committed Dec 18, 2024
commit 9d70526eed14693541afc80c8334bb8632b85922
5 changes: 4 additions & 1 deletion ...va/com/duckduckgo/networkprotection/impl/subscription/settings/ProSettingNetPViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ class ProSettingNetPViewModel(
super.onStart(owner)

viewModelScope.launch {
combine(networkProtectionSettingsState.getNetPSettingsStateFlow(), networkProtectionState.getConnectionStateFlow()) { accessState, connectionState ->
combine(
networkProtectionSettingsState.getNetPSettingsStateFlow(),
networkProtectionState.getConnectionStateFlow(),
) { accessState, connectionState ->
_viewState.emit(
viewState.value.copy(
networkProtectionEntryState = getNetworkProtectionEntryState(accessState, connectionState),
Expand Down