Skip to content

Fix implicit attach on subscribe #1028

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
sacOO7 merged 6 commits into from
Sep 18, 2024
Merged

Fix implicit attach on subscribe #1028

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
935ff90
Added attachOnSubscribe option to ChannelOptions
sacOO7 Sep 16, 2024
630c70d
Added attachOnSubscribe check before implicit attach on channel subsc…
sacOO7 Sep 16, 2024
e7fe76e
Added extra null channelOptions check while checking for attachOnSubs…
sacOO7 Sep 16, 2024
d83d3ae
Fixed spec annotations for the attachOnSubscribe usecases
sacOO7 Sep 17, 2024
d8181e8
Added tests for channel/presence subscribe without implicit attach
sacOO7 Sep 17, 2024
3ecab48
Refactored attachOnSubscribe code, spec and related tests as per rabb…
sacOO7 Sep 17, 2024
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
Prev Previous commit
Next Next commit
Added attachOnSubscribe check before implicit attach on channel subsc… 
…ribe
  • Loading branch information
@sacOO7
sacOO7 committed Sep 16, 2024
commit 630c70dc238f399a2c78844fef84cccb6d5bed47
12 changes: 9 additions & 3 deletions lib/src/main/java/io/ably/lib/realtime/ChannelBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,9 @@ public synchronized void unsubscribe() {
public synchronized void subscribe(MessageListener listener) throws AblyException {
Log.v(TAG, "subscribe(); channel = " + this.name);
listeners.add(listener);
attach();
if (options.attachOnSubscribe) {
attach();
}
}

/**
Expand Down Expand Up @@ -739,7 +741,9 @@ public synchronized void unsubscribe(MessageListener listener) {
public synchronized void subscribe(String name, MessageListener listener) throws AblyException {
Log.v(TAG, "subscribe(); channel = " + this.name + "; event = " + name);
subscribeImpl(name, listener);
attach();
if (options.attachOnSubscribe) {
attach();
}
}

/**
Expand Down Expand Up @@ -773,7 +777,9 @@ public synchronized void subscribe(String[] names, MessageListener listener) thr
Log.v(TAG, "subscribe(); channel = " + this.name + "; (multiple events)");
for(String name : names)
subscribeImpl(name, listener);
attach();
if (options.attachOnSubscribe) {
attach();
}
}

/**
Expand Down
4 changes: 4 additions & 0 deletions lib/src/main/java/io/ably/lib/realtime/Presence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,10 @@ public void unsubscribe() {
* @throws AblyException
*/
private void implicitAttachOnSubscribe(CompletionListener completionListener) throws AblyException {
if (!channel.options.attachOnSubscribe) {
completionListener.onSuccess();
return;
}
if (channel.state == ChannelState.failed) {
String errorString = String.format(Locale.ROOT, "Channel %s: subscribe in FAILED channel state", channel.name);
Log.v(TAG, errorString);
Expand Down