Merge pull request #3 from JoaoCaixinha/master

Added unsubscribe channel

Author: João Parreira

RTMChat/app/src/main/java/handlers/OrtcHandler.java

@@ -16,6 +16,7 @@
 import ibt.ortc.extensibility.OrtcFactory;
 import interfaces.InterfaceRefresher;
 import preferences.PreferencesManager;
+import rtmchat.realtime.co.rtmchat.activities.MessageActivity;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -50,6 +51,12 @@ public void run(OrtcClient sender, String channel, String message) {
             ;
         });
 	}
+
+
+	public static void unsubscribeChannel(String channel)
+	{
+		client.unsubscribe(channel);
+	}
 
 	public static void prepareClient(Context context, InterfaceRefresher rootView){
 		selfHandler = new OrtcHandler();
@@ -143,7 +150,7 @@ public void handleMessage(String msg, String channel){
 		list.setUnRead(list.getUnRead() + 1);
 		list.addMessage(newMsg);
 
-		if(messagesView != null)
+		if(messagesView != null && ((MessageActivity)messagesView).getChannel().equals(channel))
 			messagesView.refreshData(newMsg);
 
 		if(chatRoom != null)

RTMChat/app/src/main/java/rtmchat/realtime/co/rtmchat/activities/ChatRoomActivity.java

@@ -97,8 +97,10 @@ public void addChat(String chatName) {
 	}
 
 	public void delChat(String chatName) {
+		OrtcHandler.unsubscribeChannel(chatName);
 		int index = this.channels.indexOf(chatName);
 		channels.remove(index);
+
 		clearChannelsList();
 		setChannels();
 	}

RTMChat/app/src/main/java/rtmchat/realtime/co/rtmchat/activities/MessageActivity.java

@@ -25,6 +25,11 @@ public class MessageActivity extends ActionBarActivity implements InterfaceRefre
 	private boolean pause;
     private static boolean mIsInForegroundMode;
 
+
+	public String getChannel(){
+		return channel;
+	}
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);