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

Unified Push: Ignore the potential SSL error when the custom gateway is testing #8683

Merged
merged 2 commits into from
Nov 15, 2023
Merged

Unified Push: Ignore the potential SSL error when the custom gateway is testing #8683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c58af7
Unified Push: Ignore the potential SSL error when the custom gateway …
giomfo Nov 15, 2023
ee2fd9f
add changelog
giomfo Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/8683.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Unified Push: Ignore the potential SSL error when the custom gateway is testing locally
16 changes: 14 additions & 2 deletions vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ import im.vector.app.core.resources.StringProvider
import im.vector.app.core.utils.getApplicationLabel
import org.matrix.android.sdk.api.Matrix
import org.matrix.android.sdk.api.cache.CacheStrategy
import org.matrix.android.sdk.api.failure.Failure
import org.matrix.android.sdk.api.util.MatrixJsonParser
import org.unifiedpush.android.connector.UnifiedPush
import timber.log.Timber
import java.net.URL
import javax.inject.Inject
import javax.net.ssl.SSLHandshakeException

class UnifiedPushHelper @Inject constructor(
private val context: Context,
Expand Down Expand Up @@ -104,7 +106,11 @@ class UnifiedPushHelper @Inject constructor(
// else, unifiedpush, and pushkey is an endpoint
val gateway = stringProvider.getString(R.string.default_push_gateway_http_url)
val parsed = URL(endpoint)
val port = if (parsed.port != -1) { ":${parsed.port}" } else { "" }
val port = if (parsed.port != -1) {
":${parsed.port}"
} else {
""
}
val custom = "${parsed.protocol}://${parsed.host}${port}/_matrix/push/v1/notify"
Timber.i("Testing $custom")
try {
Expand All @@ -120,7 +126,13 @@ class UnifiedPushHelper @Inject constructor(
}
}
} catch (e: Throwable) {
Timber.d(e, "Cannot try custom gateway")
Timber.e(e, "Cannot try custom gateway")
if (e is Failure.NetworkConnection && e.ioException is SSLHandshakeException) {
Timber.w(e, "SSLHandshakeException, ignore this error")
unifiedPushStore.storePushGateway(custom)
onDoneRunnable?.run()
return
}
}
unifiedPushStore.storePushGateway(gateway)
onDoneRunnable?.run()
Expand Down
Loading