Skip to content

Commit ae18efd

Browse files
committed
Fix OidcView preview
1 parent 5239e5c commit ae18efd

File tree

1 file changed

+13
-9
lines changed
  • libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview

1 file changed

+13
-9
lines changed

libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import androidx.compose.runtime.mutableStateOf
2727
import androidx.compose.runtime.remember
2828
import androidx.compose.runtime.setValue
2929
import androidx.compose.ui.Modifier
30+
import androidx.compose.ui.platform.LocalInspectionMode
3031
import androidx.compose.ui.tooling.preview.PreviewParameter
3132
import androidx.compose.ui.viewinterop.AndroidView
3233
import io.element.android.libraries.core.bool.orFalse
@@ -45,6 +46,7 @@ fun OidcView(
4546
onNavigateBack: () -> Unit,
4647
modifier: Modifier = Modifier,
4748
) {
49+
val isPreview = LocalInspectionMode.current
4850
val oidcUrlParser = remember { OidcUrlParser() }
4951
var webView by remember { mutableStateOf<WebView?>(null) }
5052
fun shouldOverrideUrl(url: String): Boolean {
@@ -86,16 +88,18 @@ fun OidcView(
8688
modifier = Modifier.padding(contentPadding),
8789
factory = { context ->
8890
WebView(context).apply {
89-
webViewClient = oidcWebViewClient
90-
settings.apply {
91-
@SuppressLint("SetJavaScriptEnabled")
92-
javaScriptEnabled = true
93-
allowContentAccess = true
94-
allowFileAccess = true
95-
databaseEnabled = true
96-
domStorageEnabled = true
91+
if (!isPreview) {
92+
webViewClient = oidcWebViewClient
93+
settings.apply {
94+
@SuppressLint("SetJavaScriptEnabled")
95+
javaScriptEnabled = true
96+
allowContentAccess = true
97+
allowFileAccess = true
98+
databaseEnabled = true
99+
domStorageEnabled = true
100+
}
101+
loadUrl(state.oidcDetails.url)
97102
}
98-
loadUrl(state.oidcDetails.url)
99103
}.also {
100104
webView = it
101105
}

0 commit comments

Comments
 (0)