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

Jump to bottom

fix: network screen is empty on graphene os #2760

Merged
merged 4 commits into from
Mar 4, 2024
Merged

fix: network screen is empty on graphene os #2760

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c08016d
fix: network screen is empty on graphene os
MohamadJaara Mar 2, 2024
6f7ec0d
trigger CI
MohamadJaara Mar 4, 2024
743681d
Merge branch 'release/candidate' into fix/network-settings-screen-is-…
MohamadJaara Mar 4, 2024
8f096f9
Merge branch 'release/candidate' into fix/network-settings-screen-is-…
MohamadJaara Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 23 additions & 12 deletions ...in/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ package com.wire.android.ui.home.settings.appsettings.networkSettings
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import com.wire.android.ui.common.scaffold.WireScaffold
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
Expand All @@ -33,6 +33,7 @@ import com.ramcosta.composedestinations.annotation.Destination
import com.ramcosta.composedestinations.annotation.RootNavGraph
import com.wire.android.R
import com.wire.android.navigation.Navigator
import com.wire.android.ui.common.scaffold.WireScaffold
import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
import com.wire.android.ui.home.conversations.details.options.ArrowType
import com.wire.android.ui.home.conversations.details.options.GroupConversationOptionsItem
Expand Down Expand Up @@ -74,20 +75,30 @@ fun NetworkSettingsScreenContent(
.fillMaxSize()
.padding(internalPadding)
) {
if (!isWebsocketEnabledByDefault(LocalContext.current)) {
GroupConversationOptionsItem(
title = stringResource(R.string.settings_keep_connection_to_websocket),
subtitle = stringResource(
R.string.settings_keep_connection_to_websocket_description,
backendName
),
switchState = SwitchState.Enabled(
val appContext = LocalContext.current.applicationContext
val isWebSocketEnforcedByDefault = remember {
isWebsocketEnabledByDefault(appContext)
}
val switchState = remember {
if (isWebSocketEnforcedByDefault) {
SwitchState.TextOnly(true)
} else {
SwitchState.Enabled(
value = isWebSocketEnabled,
onCheckedChange = setWebSocketState
),
arrowType = ArrowType.NONE
)
)
}
}

GroupConversationOptionsItem(
title = stringResource(R.string.settings_keep_connection_to_websocket),
subtitle = stringResource(
R.string.settings_keep_connection_to_websocket_description,
backendName
),
switchState = switchState,
arrowType = ArrowType.NONE
)
}
}
}
Expand Down