Commit f759ce5a authored by DrKLO's avatar DrKLO

Bug fixes

parent a484ab0d
...@@ -82,7 +82,7 @@ android { ...@@ -82,7 +82,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8
targetSdkVersion 22 targetSdkVersion 22
versionCode 468 versionCode 469
versionName "2.6.0" versionName "2.6.0"
} }
} }
...@@ -687,17 +687,21 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -687,17 +687,21 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
protected void processNewDifferenceParams(int seq, int pts, int date, int pts_count) { protected void processNewDifferenceParams(int seq, int pts, int date, int pts_count) {
FileLog.e("tmessages", "processNewDifferenceParams seq = " + seq + " pts = " + pts + " date = " + date + " pts_count = " + pts_count);
if (pts != -1) { if (pts != -1) {
if (MessagesStorage.lastPtsValue + pts_count == pts) { if (MessagesStorage.lastPtsValue + pts_count == pts) {
FileLog.e("tmessages", "APPLY PTS");
MessagesStorage.lastPtsValue = pts; MessagesStorage.lastPtsValue = pts;
MessagesStorage.getInstance().saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); MessagesStorage.getInstance().saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue);
} else if (MessagesStorage.lastPtsValue == pts) { } else if (MessagesStorage.lastPtsValue != pts) {
if (gettingDifference || updatesStartWaitTimePts == 0 || updatesStartWaitTimePts != 0 && updatesStartWaitTimePts + 1500 > System.currentTimeMillis()) { if (gettingDifference || updatesStartWaitTimePts == 0 || updatesStartWaitTimePts != 0 && updatesStartWaitTimePts + 1500 > System.currentTimeMillis()) {
FileLog.e("tmessages", "ADD UPDATE TO QUEUE pts = " + pts + " pts_count = " + pts_count);
if (updatesStartWaitTimePts == 0) { if (updatesStartWaitTimePts == 0) {
updatesStartWaitTimePts = System.currentTimeMillis(); updatesStartWaitTimePts = System.currentTimeMillis();
} }
UserActionUpdatesPts updates = new UserActionUpdatesPts(); UserActionUpdatesPts updates = new UserActionUpdatesPts();
updates.seq = seq; updates.pts = pts;
updates.pts_count = pts_count;
updatesQueuePts.add(updates); updatesQueuePts.add(updates);
} else { } else {
getDifference(); getDifference();
...@@ -706,6 +710,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -706,6 +710,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
if (seq != -1) { if (seq != -1) {
if (MessagesStorage.lastSeqValue + 1 == seq) { if (MessagesStorage.lastSeqValue + 1 == seq) {
FileLog.e("tmessages", "APPLY SEQ");
MessagesStorage.lastSeqValue = seq; MessagesStorage.lastSeqValue = seq;
if (date != -1) { if (date != -1) {
MessagesStorage.lastDateValue = date; MessagesStorage.lastDateValue = date;
...@@ -713,6 +718,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ...@@ -713,6 +718,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
MessagesStorage.getInstance().saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); MessagesStorage.getInstance().saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue);
} else if (MessagesStorage.lastSeqValue != seq) { } else if (MessagesStorage.lastSeqValue != seq) {
if (gettingDifference || updatesStartWaitTimeSeq == 0 || updatesStartWaitTimeSeq != 0 && updatesStartWaitTimeSeq + 1500 > System.currentTimeMillis()) { if (gettingDifference || updatesStartWaitTimeSeq == 0 || updatesStartWaitTimeSeq != 0 && updatesStartWaitTimeSeq + 1500 > System.currentTimeMillis()) {
FileLog.e("tmessages", "ADD UPDATE TO QUEUE seq = " + seq);
if (updatesStartWaitTimeSeq == 0) { if (updatesStartWaitTimeSeq == 0) {
updatesStartWaitTimeSeq = System.currentTimeMillis(); updatesStartWaitTimeSeq = System.currentTimeMillis();
} }
......
...@@ -1895,10 +1895,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1895,10 +1895,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (arrayList == null || arrayList.isEmpty()) { if (arrayList == null || arrayList.isEmpty()) {
return; return;
} }
for (MessageObject object : arrayList) { if (!fromMyName) {
if (!fromMyName) { SendMessagesHelper.getInstance().sendMessage(arrayList, dialog_id);
SendMessagesHelper.getInstance().sendMessage(object, dialog_id); } else {
} else { for (MessageObject object : arrayList) {
SendMessagesHelper.getInstance().processForwardFromMyName(object, dialog_id); SendMessagesHelper.getInstance().processForwardFromMyName(object, dialog_id);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment