Refactor code

Author: singhashmeet

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

@@ -17,13 +17,6 @@ public interface Channel {
      */
     String getName();
 
-    /**
-     * Gets the current subscription count of the subscribed channel.
-     * 
-     * @return Count of subscriptions
-     */
-    Integer getCount();
-
     /**
      * Binds a {@link SubscriptionEventListener} to an event. The
      * {@link SubscriptionEventListener} will be notified whenever the specified

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

@@ -2,7 +2,6 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -11,19 +10,22 @@
 import com.google.gson.GsonBuilder;
 import com.pusher.client.channel.*;
 import com.pusher.client.channel.impl.message.SubscribeMessage;
+import com.pusher.client.channel.impl.message.SubscriptionCountData;
 import com.pusher.client.channel.impl.message.UnsubscribeMessage;
 import com.pusher.client.util.Factory;
 
 public abstract class BaseChannel implements InternalChannel {
     protected final Gson GSON;
     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";
     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;
     private ChannelEventListener eventListener;
     private final Factory factory;
     private final Object lock = new Object();
+    private Integer subscriptionCount;
 
     public BaseChannel(final Factory factory) {
         GsonBuilder gsonBuilder = new GsonBuilder();
@@ -37,6 +39,11 @@ public BaseChannel(final Factory factory) {
     @Override
     abstract public String getName();
 
+    @Override
+    public Integer getCount() {
+        return subscriptionCount;
+    }
+
     @Override
     public void bind(final String eventName, final SubscriptionEventListener listener) {
         validateArguments(eventName, listener);
@@ -112,6 +119,8 @@ public PusherEvent prepareEvent(String event, String message) {
     public void onMessage(String event, String message) {
         if (event.equals(SUBSCRIPTION_SUCCESS_EVENT)) {
             updateState(ChannelState.SUBSCRIBED);
+        }else if (event.equals(SUBSCRIPTION_COUNT_EVENT)) {
+            handleSubscriptionCountEvent(message);
         } else {
             final Set<SubscriptionEventListener> listeners = getInterestedListeners(event);
             if (listeners != null) {
@@ -184,6 +193,20 @@ private void validateArguments(final String eventName, final SubscriptionEventLi
         }
     }
 
+    private void handleSubscriptionCountEvent(final String message) {
+        String channelName = this.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());
+                }
+            });
+        }
+    }
+
     protected Set<SubscriptionEventListener> getInterestedListeners(String event) {
         synchronized (lock) {
             Set<SubscriptionEventListener> listeners = new HashSet<SubscriptionEventListener>();

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

@@ -11,6 +11,8 @@ public interface InternalChannel extends Channel, Comparable<InternalChannel> {
 
     String toUnsubscribeMessage();
 
+    Integer getCount();
+
     PusherEvent prepareEvent(String event, String message);
 
     void onMessage(String event, String message);