Skip to content

Handle null return from ExtendedSSLSession.getRequestedServerNames on Android SDK 27/28 #9525

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

Open
tsushanth wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −1
Open

Handle null return from ExtendedSSLSession.getRequestedServerNames on Android SDK 27/28 #9525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion okhttp/src/commonJvmAndroid/kotlin/okhttp3/internal/platform/Platform.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ open class Platform {
open fun getHandshakeServerNames(sslSocket: SSLSocket): List<String> {
val session = sslSocket.session as? ExtendedSSLSession ?: return listOf()
return try {
session.requestedServerNames.mapNotNull { (it as? SNIHostName)?.asciiName }
(session.requestedServerNames ?: emptyList()).mapNotNull { (it as? SNIHostName)?.asciiName }
} catch (_: UnsupportedOperationException) {
// UnsupportedOperationException – if the underlying provider does not implement the operation
// https://github.com/bcgit/bc-java/issues/1773
Expand Down
Loading