diff options
| author | Albin <albin@mullvad.net> | 2023-04-21 10:21:04 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-04-21 10:21:04 +0200 |
| commit | 0e49c0bf8b4230d371fa358290faf6a55078c0ee (patch) | |
| tree | 83a4cc3a2dc01820a8ea1b477512413016905319 | |
| parent | 20dc23d27b12d381f819839ff6fb1ae27cc2fc9e (diff) | |
| parent | 7070188540be4854b09f17292c9252c7b32cb54f (diff) | |
| download | mullvadvpn-0e49c0bf8b4230d371fa358290faf6a55078c0ee.tar.xz mullvadvpn-0e49c0bf8b4230d371fa358290faf6a55078c0ee.zip | |
Merge branch 'remember-content-blockers-expansion-droid-100'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d8ff3ecf0..7c98cfa6e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ Line wrap the file at 100 chars. Th #### Android - Fix adaptive app icon which previously had a displaced nose and some other oddities. - Fix app version sometimes missing in the settings menu. +- Fix content blockers expand state not being kept when returning from split tunneling. #### macOS - Fix tray window behaviour when opening mission control and switching between full-screen workspaces. diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt index ecbcfe5d23..c85fa54cce 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt @@ -19,7 +19,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -156,7 +156,7 @@ fun AdvancedSettingScreen( } val lazyListState = rememberLazyListState() - var expandContentBlockersState by remember { mutableStateOf(false) } + var expandContentBlockersState by rememberSaveable { mutableStateOf(false) } val biggerPadding = 54.dp val topPadding = 6.dp CollapsingToolbarTheme { |