Dispatch better disconnect events #39
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
March 28, 2017 16:02
That lets us distinguish between an expected and unexpected disconnect.
jhansche
commented
Mar 28, 2017
| @@ -29,7 +29,7 @@ public WebSocketClient createInstance(WebSocketClient.WebSocketClientCallback we | |||
| return new OkHttp3WebSocketClient(mClient, webSocketClientCallback, hostUrl); | |||
| } | |||
|
|
|||
| class OkHttp3WebSocketClient implements WebSocketClient { | |||
| static class OkHttp3WebSocketClient implements WebSocketClient { | |||
There was a problem hiding this comment.
This was otherwise being linked to the outer class at runtime, leading to a possible memory leak. The Factory and Client do not need to be tied together for any reason, so this should be declared static.
rogerhu
reviewed
Mar 28, 2017
| callbacks.transcript.assertEventsSoFar("onLiveQueryClientDisconnected: false"); | ||
| } | ||
|
|
||
|
|
rogerhu
reviewed
Mar 28, 2017
|
|
||
|
|
||
| @Test | ||
| public void testCallbackNotifiedOnDisconnect_expected() throws Exception { |
There was a problem hiding this comment.
Hmm, ok - I've typically used _ to delineate a related test with different expectations or states.
Looking at the Parse-SDK-Android repo though, I see that does not appear to be the case. Will rename.
added 2 commits
March 28, 2017 16:42
A socket failure implies that the socket also died, so it makes sense to also dispatch a disconnected event.
rogerhu
approved these changes
Mar 28, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
First, the close() call was wrong, because the RFC expects a close reason in the 1000-1999 range, but we were passing 200.
I confirmed that changing to
1000properly closes the socket, and cleans up the connection (which was otherwise causing a memory leak because it didn't close properly).This also adds the
userInitiatedboolean to theonLiveQueryClientDisconnected()callback, so that listeners can choose how to respond based on if it was expected or not (an error disconnect may mean it needs to be reconnected; while an expected disconnect() close should not auto-reconnect)