open_chats.patch - BEEM - Android XMPP - BEEM - Android XMPP Application

     package com.beem.project.beem.service;
     import java.util.ArrayList;
     import java.util.Collections;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
-...
     	IRoster mRoster = mService.getBind().getRoster();
     	for (ChatAdapter chat : mChats.values()) {
     	    if (chat.getMessages().size() > 0) {
     	    if (chat.getMessageCount(Message.MSG_TYPE_CHAT) > 0 ||
     	        chat.getMessageCount(Message.MSG_TYPE_GROUP_CHAT) > 0) {
     		Contact t = mRoster.getContact(chat.getParticipant().getJID());
     		if (t == null)
     		    t = new Contact(chat.getParticipant().getJID());
     		openedChats.add(t);
+    	    }
+    	}
     	Collections.sort(openedChats, new Contact.NameComparator());
     	return openedChats;
+        }

         private final Chat mAdaptee;
         private final Contact mParticipant;
         private String mState;
         private int[] mCounts;
         private boolean mIsOpen;
         private final List<Message> mMessages;
         private final RemoteCallbackList<IMessageListener> mRemoteListeners = new RemoteCallbackList<IMessageListener>();
-...
     	mParticipant = new Contact(chat.getParticipant());
     	mMessages = new LinkedList<Message>();
     	mAdaptee.addMessageListener(mMsgListener);
     	mCounts = new int[4];
+        }
         /**
-...
     	try {
     	    mAdaptee.sendMessage(send);
     	    mMessages.add(message);
     	    updateMessageCount(message, false);
     	} catch (XMPPException e) {
     	    // TODO Auto-generated catch block
     	    e.printStackTrace();
-...
     	return Collections.unmodifiableList(mMessages);
+        }
         public int getMessageCount(int type) {
     	int count = 0;
     	switch (type) {
                 case Message.MSG_TYPE_NORMAL:
                     count = mCounts[0];
                     break;
                 case Message.MSG_TYPE_CHAT:
                     count = mCounts[1];
                     break;
                 case Message.MSG_TYPE_GROUP_CHAT:
                     count = mCounts[2];
                     break;
                 case Message.MSG_TYPE_ERROR:
                     count = mCounts[3];
                     break;
                 default:
+            }
     	return count;
+        }
         /**
          * Add a message in the chat history.
          * @param msg the message to add
          */
         void addMessage(Message msg) {
     	if (mMessages.size() == HISTORY_MAX_SIZE)
     	    mMessages.remove(0);
     	    updateMessageCount(mMessages.remove(0), true);
     	mMessages.add(msg);
             updateMessageCount(msg, false);
+        }
         /**
          * Increment or decrement the message counts in the chat history.
          * @param msg the message to update counts
          */
         private void updateMessageCount(Message msg, Boolean down) {
             int val;
             if (down)
                 val = -1;
             else
                 val = 1;
     	switch (msg.getType()) {
                 case Message.MSG_TYPE_NORMAL:
                     mCounts[0] += val;
                     break;
                 case Message.MSG_TYPE_CHAT:
                     mCounts[1] += val;
                     break;
                 case Message.MSG_TYPE_GROUP_CHAT:
                     mCounts[2] += val;
                     break;
                 case Message.MSG_TYPE_ERROR:
                     mCounts[3] += val;
                     break;
                 default:
+            }
+        }
         /**

     import java.util.ArrayList;
     import java.util.Collection;
     import java.util.Comparator;
     import java.util.List;
     import org.jivesoftware.smack.RosterGroup;
-...
     	return mJID.hashCode();
+        }
         static public class NameComparator implements Comparator {
             public boolean equals(Object a, Object b) {
         	    String sa, sb;
         	    sa = ((Contact)a).getName();
         	    sb = ((Contact)b).getName();
         	    return sa.equalsIgnoreCase(sb);
+            }
             public int compare(Object a, Object b) {
         	    String sa, sb;
         	    sa = ((Contact)a).getName();
         	    sb = ((Contact)b).getName();
         	    return sa.compareToIgnoreCase(sb);
+            }
+        }
+    }

Project

General

Profile

BEEM - Android XMPP

Bug #272 » open_chats.patch