Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix sort of chat list, now using newest on top

Browse source
This commit is contained in:
Sylvain Berfini 2015-02-13 16:22:10 +01:00
parent 450f759f9f
commit cc2b02f93a
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/org/linphone/ChatStorage.java
View file

@ -19,6 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import org.linphone.core.LinphoneChatMessage; import org.linphone.core.LinphoneChatMessage;
@ -378,20 +380,33 @@ public class ChatStorage {
ArrayList<String> chatList = new ArrayList<String>(); ArrayList<String> chatList = new ArrayList<String>();
if (useNativeAPI) { if (useNativeAPI) {
ArrayList<String> chatListReadMessages = new ArrayList<String>();
LinphoneChatRoom[] chats = LinphoneManager.getLc().getChatRooms(); LinphoneChatRoom[] chats = LinphoneManager.getLc().getChatRooms();
List<LinphoneChatRoom> rooms = new ArrayList<LinphoneChatRoom>();
for (LinphoneChatRoom chatroom : chats) { for (LinphoneChatRoom chatroom : chats) {
if (chatroom.getHistory(1).length > 0) { if (chatroom.getHistory(1).length > 0) {
if (chatroom.getUnreadMessagesCount() > 0) { rooms.add(chatroom);
chatList.add(chatroom.getPeerAddress().asStringUriOnly());
} else {
chatListReadMessages.add(chatroom.getPeerAddress().asStringUriOnly());
} }
} }
}
chatList.addAll(chatListReadMessages);
Collections.sort(rooms, new Comparator<LinphoneChatRoom>() {
@Override
public int compare(LinphoneChatRoom a, LinphoneChatRoom b) {
// /!\ Warning: Have to take the second element because it returns two even when asking for only one...
long atime = a.getHistory(1)[1].getTime();
long btime = b.getHistory(1)[1].getTime();
if (atime > btime)
return -1;
else if (btime > atime)
return 1;
else
return 0;
}
});
for (LinphoneChatRoom chatroom : rooms) {
chatList.add(chatroom.getPeerAddress().asStringUriOnly());
}
} else { } else {
Cursor c = db.query(TABLE_NAME, null, null, null, "remoteContact", null, "id DESC"); Cursor c = db.query(TABLE_NAME, null, null, null, "remoteContact", null, "id DESC");
while (c != null && c.moveToNext()) { while (c != null && c.moveToNext()) {