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

ChatStorage.java: getHistory(1) returns a single message, remove unneeded security (#2091)

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-04-28 13:54:22 +02:00
parent d62252ed22
commit e86833a9a1
1 changed files with 66 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -395,10 +395,9 @@ public class ChatStorage {
public int compare(LinphoneChatRoom a, LinphoneChatRoom b) { public int compare(LinphoneChatRoom a, LinphoneChatRoom b) {
LinphoneChatMessage[] messagesA = a.getHistory(1); LinphoneChatMessage[] messagesA = a.getHistory(1);
LinphoneChatMessage[] messagesB = b.getHistory(1); LinphoneChatMessage[] messagesB = b.getHistory(1);
long atime, btime; long atime = messagesA[0].getTime();
// /!\ Warning: Have to take the second element because it returns two even when asking for only one... long btime = messagesB[0].getTime();
atime = messagesA.length > 1 ? messagesA[1].getTime() : messagesA[0].getTime();
btime = messagesA.length > 1 ? messagesB[1].getTime() : messagesB[0].getTime();
if (atime > btime) if (atime > btime)
return -1; return -1;
else if (btime > atime) else if (btime > atime)