diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/LinkPreviews.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/LinkPreviews.kt index d4b2915297..d2a98ae101 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/LinkPreviews.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/LinkPreviews.kt @@ -48,7 +48,6 @@ private val previewMutex = Mutex() suspend fun getLinkPreview(url: String): LinkPreview? { return withContext(Dispatchers.IO) { previewMutex.withLock { - val previousAuthenticator = Authenticator.getDefault() try { try { val title: String? @@ -121,6 +120,8 @@ suspend fun getLinkPreview(url: String): LinkPreview? { imageUri = normalizeImageUri(u, imageUri) try { val conn = URL(imageUri).openConnection(proxy ?: Proxy.NO_PROXY) + conn.connectTimeout = 20_000 + conn.readTimeout = 20_000 val stream = conn.getInputStream() val image = resizeImageToStrSize(stream.use(::loadImageBitmap), maxDataSize = 14000) // TODO add once supported in iOS @@ -139,7 +140,7 @@ suspend fun getLinkPreview(url: String): LinkPreview? { } return@withLock null } finally { - Authenticator.setDefault(previousAuthenticator) + Authenticator.setDefault(null) } } } diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml index 8d654b5af8..c9ed86af11 100644 --- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml +++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml @@ -2646,7 +2646,7 @@ Easier to invite your friends 👋 We made connecting simpler for new users. Safe web links - - opt-in to send link previews.\n- prevent hyperlink phishing.\n- remove link tracking. + - opt-in to send link previews.\n- use SOCKS proxy if enabled.\n- prevent hyperlink phishing.\n- remove link tracking. Non-profit governance To make SimpleX Network last. View updated conditions