Updated subscription count to be handled by renaming

Author: singhashmeet

README.md

@@ -257,16 +257,16 @@ Channel channel = pusher.subscribe("my-channel", new ChannelEventListener() {
     // Other ChannelEventListener methods
 });
 ```
-If you wish to be informed for subscription count events, pass an implementation of the `ChannelEventListener` interface:
+If you wish to be informed for subscription count events, use the `bind` function to listen to event type `pusher:subscription_count`:
 
 ```java
-Channel channel = pusher.subscribe("my-channel", new ChannelEventListener() {
+Channel channel = pusher.subscribe("my-channel");
+channel.bind("pusher:subscription_count", new SubscriptionEventListener() {
     @Override
-    public void onSubscriptionCountChanged(String channelName, int count) {
-        System.out.println("Members in channel: " + channelName + " are: " + count);
+    public void onEvent(PusherEvent event) {
+        System.out.println("Received event with data: " + event.toString());
+        System.out.println("Subscription Count is: " + channel.getCount());
     }
-
-    // Other ChannelEventListener methods
 });
 
 ```

src/main/java/com/pusher/client/channel/ChannelEventListener.java

@@ -40,19 +40,4 @@ public interface ChannelEventListener extends SubscriptionEventListener {
      *            The name of the channel that was successfully subscribed.
      */
     void onSubscriptionSucceeded(String channelName);
-
-    /**
-     * <p>
-     * Callback fired when a subscription success count
-     * of a channel changes
-     * </p>
-     *
-     *
-     * @param channelName
-     *            The name of the channel for which the count changed.
-     * 
-     * @param count
-     *            The latest count of subscribers on the channel.
-     */
-    void onSubscriptionCountChanged(String channelName, int count);
 }

src/main/java/com/pusher/client/channel/impl/BaseChannel.java

@@ -19,6 +19,7 @@ public abstract class BaseChannel implements InternalChannel {
     private static final String INTERNAL_EVENT_PREFIX = "pusher_internal:";
     protected static final String SUBSCRIPTION_SUCCESS_EVENT = "pusher_internal:subscription_succeeded";
     protected static final String SUBSCRIPTION_COUNT_EVENT = "pusher_internal:subscription_count";
+    protected static final String PUBLIC_SUBSCRIPTION_COUNT_EVENT = "pusher:subscription_count";
     private Set<SubscriptionEventListener> globalListeners = new HashSet<SubscriptionEventListener>();
     private final Map<String, Set<SubscriptionEventListener>> eventNameToListenerMap = new HashMap<String, Set<SubscriptionEventListener>>();
     protected volatile ChannelState state = ChannelState.INITIAL;
@@ -194,17 +195,9 @@ private void validateArguments(final String eventName, final SubscriptionEventLi
     }
 
     private void handleSubscriptionCountEvent(final String message) {
-        String channelName = getName();
         final SubscriptionCountData subscriptionCountMessage = GSON.fromJson(message, SubscriptionCountData.class);
         subscriptionCount = subscriptionCountMessage.getCount();
-        if (eventListener != null ) {
-            factory.queueOnEventThread(new Runnable() {
-                @Override
-                public void run() {
-                    eventListener.onSubscriptionCountChanged(channelName, subscriptionCountMessage.getCount());
-                }
-            });
-        }
+        onMessage(PUBLIC_SUBSCRIPTION_COUNT_EVENT, message);
     }
 
     protected Set<SubscriptionEventListener> getInterestedListeners(String event) {

src/main/java/com/pusher/client/example/ExampleApp.java

@@ -78,12 +78,6 @@ public void onEvent(PusherEvent event) {
                 System.out.println(String.format(
                         "Received event [%s]", event.toString()));
             }
-
-            @Override
-            public void onSubscriptionCountChanged(String channelName, int count) {
-                System.out.println(String.format(
-                        "Count for channel [%s], changed to [%d]", channelName, count));
-            }
         };
 
         // subscribe to the channel and with the event listener for the event name

src/main/java/com/pusher/client/example/PresenceChannelExampleApp.java

@@ -115,12 +115,6 @@ public void userUnsubscribed(String channelName, User user) {
                 System.out.println(String.format("A user has left channel [%s]: %s", channelName, user));
                 printCurrentlySubscribedUsers();
             }
-
-            @Override
-            public void onSubscriptionCountChanged(String channelName, int count) {
-                System.out.println(String.format(
-                        "Count for channel [%s], changed to [%d]", channelName, count));
-            }
         };
 
         // subscribe to the channel and with the event listener for the event name

src/main/java/com/pusher/client/example/PrivateChannelExampleApp.java

@@ -94,12 +94,6 @@ public void onAuthenticationFailure(String message, Exception e) {
                 System.out.println(String.format(
                         "Authorization failure due to [%s], exception was [%s]", message, e));
             }
-
-            @Override
-            public void onSubscriptionCountChanged(String channelName, int count) {
-                System.out.println(String.format(
-                        "Count for channel [%s], changed to [%d]", channelName, count));
-            }
         };
 
         // subscribe to the channel and with the event listener for the event name

src/main/java/com/pusher/client/example/PrivateEncryptedChannelExampleApp.java

@@ -106,12 +106,6 @@ public void onDecryptionFailure(String event, String reason) {
                 System.out.println(String.format(
                         "An error was received decrypting message for event:[%s] - reason: [%s]", event, reason));
             }
-
-            @Override
-            public void onSubscriptionCountChanged(String channelName, int count) {
-                System.out.println(String.format(
-                        "Count for channel [%s], changed to [%d]", channelName, count));
-            }
         };
 
         // subscribe to the channel and with the event listener for the event name