Skip to content

Fix websocket issue with pre android sdk 24 devices #284

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

Merged
merged 3 commits into from
Aug 11, 2020
Merged

Fix websocket issue with pre android sdk 24 devices #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b65869
Override onSetSSLParameters to not call setEndpointIdentificationAlgo…
daniellevass Aug 5, 2020
0bd5356
add a try for the onSetSSLParamters for devices that do have access t…
daniellevass Aug 5, 2020
2b96533
fix bug in encrypted channel where replace doesn't exist on maps
daniellevass Aug 5, 2020
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 src/main/java/com/pusher/client/channel/impl/PrivateEncryptedChannelImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ private PusherEvent decryptMessage(String message) {
encryptedReceivedData.getCiphertext(),
encryptedReceivedData.getNonce());

receivedMessage.replace("data", decryptedData);
receivedMessage.put("data", decryptedData);

return new PusherEvent(receivedMessage);
}
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/com/pusher/client/connection/websocket/WebSocketClientWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLSocketFactory;

import org.java_websocket.client.WebSocketClient;
Expand Down Expand Up @@ -89,4 +90,14 @@ public void onError(final Exception ex) {
public void removeWebSocketListener() {
webSocketListener = null;
}

@Override
protected void onSetSSLParameters(SSLParameters sslParameters) {
// https://github.com/TooTallNate/Java-WebSocket/wiki/No-such-method-error-setEndpointIdentificationAlgorithm
try {
super.onSetSSLParameters(sslParameters);
} catch (NoSuchMethodError error) {
// if this is being called on an android device pre-24 this api isn't available
}
}
}