summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-10-09 13:43:50 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2024-11-22 17:42:38 +0100
commit848ddea38dcd93a1cf1575f87f8fada316dff590 (patch)
tree855e9ef69fbd3f1e9e3943cb2c15502190f76cca /android
parent734abdd7fcafa3d1b4553460de1b2199d4043b51 (diff)
downloadmullvadvpn-848ddea38dcd93a1cf1575f87f8fada316dff590.tar.xz
mullvadvpn-848ddea38dcd93a1cf1575f87f8fada316dff590.zip
Add initial multihop config on Android
- Add some minor wireguard go changes
Diffstat (limited to 'android')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt2
1 files changed, 2 insertions, 0 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
index c36f10212e..c63da68471 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
@@ -66,6 +66,7 @@ import com.ramcosta.composedestinations.result.NavResult
import com.ramcosta.composedestinations.result.ResultBackNavigator
import com.ramcosta.composedestinations.result.ResultRecipient
import com.ramcosta.composedestinations.spec.DestinationSpec
+import java.io.FileDescriptor
import kotlinx.coroutines.launch
import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.compose.cell.FilterRow
@@ -753,6 +754,7 @@ private fun EditCustomListBottomSheet(
onDeleteCustomList: (item: RelayItem.CustomList) -> Unit,
closeBottomSheet: (animate: Boolean) -> Unit,
) {
+ FileDescriptor.out.
MullvadModalBottomSheet(
backgroundColor = backgroundColor,
onBackgroundColor = onBackgroundColor,