Added attachOnSubscribe check before implicit attach on channel subsc…

…ribe
ably · Sep 16, 2024 · 630c70d · 630c70d
1 parent 935ff90
commit 630c70d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java
@@ -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();
+        }
     }
 
     /**
@@ -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();
+        }
     }
 
     /**
@@ -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();
+        }
     }
 
     /**

diff --git a/lib/src/main/java/io/ably/lib/realtime/Presence.java b/lib/src/main/java/io/ably/lib/realtime/Presence.java
@@ -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);