Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apk
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
apk
Commits
f759ce5a
Commit
f759ce5a
authored
Mar 20, 2015
by
DrKLO
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fixes
parent
a484ab0d
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
73 additions
and
57 deletions
+73
-57
build.gradle
TMessagesProj/build.gradle
+1
-1
MessagesController.java
...rc/main/java/org/telegram/android/MessagesController.java
+8
-2
SendMessagesHelper.java
...rc/main/java/org/telegram/android/SendMessagesHelper.java
+60
-50
ChatActivity.java
...sagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+4
-4
No files found.
TMessagesProj/build.gradle
View file @
f759ce5a
...
...
@@ -82,7 +82,7 @@ android {
defaultConfig
{
minSdkVersion
8
targetSdkVersion
22
versionCode
46
8
versionCode
46
9
versionName
"2.6.0"
}
}
TMessagesProj/src/main/java/org/telegram/android/MessagesController.java
View file @
f759ce5a
...
...
@@ -687,17 +687,21 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}
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
(
MessagesStorage
.
lastPtsValue
+
pts_count
==
pts
)
{
FileLog
.
e
(
"tmessages"
,
"APPLY PTS"
);
MessagesStorage
.
lastPtsValue
=
pts
;
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
())
{
FileLog
.
e
(
"tmessages"
,
"ADD UPDATE TO QUEUE pts = "
+
pts
+
" pts_count = "
+
pts_count
);
if
(
updatesStartWaitTimePts
==
0
)
{
updatesStartWaitTimePts
=
System
.
currentTimeMillis
();
}
UserActionUpdatesPts
updates
=
new
UserActionUpdatesPts
();
updates
.
seq
=
seq
;
updates
.
pts
=
pts
;
updates
.
pts_count
=
pts_count
;
updatesQueuePts
.
add
(
updates
);
}
else
{
getDifference
();
...
...
@@ -706,6 +710,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}
if
(
seq
!=
-
1
)
{
if
(
MessagesStorage
.
lastSeqValue
+
1
==
seq
)
{
FileLog
.
e
(
"tmessages"
,
"APPLY SEQ"
);
MessagesStorage
.
lastSeqValue
=
seq
;
if
(
date
!=
-
1
)
{
MessagesStorage
.
lastDateValue
=
date
;
...
...
@@ -713,6 +718,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
MessagesStorage
.
getInstance
().
saveDiffParams
(
MessagesStorage
.
lastSeqValue
,
MessagesStorage
.
lastPtsValue
,
MessagesStorage
.
lastDateValue
,
MessagesStorage
.
lastQtsValue
);
}
else
if
(
MessagesStorage
.
lastSeqValue
!=
seq
)
{
if
(
gettingDifference
||
updatesStartWaitTimeSeq
==
0
||
updatesStartWaitTimeSeq
!=
0
&&
updatesStartWaitTimeSeq
+
1500
>
System
.
currentTimeMillis
())
{
FileLog
.
e
(
"tmessages"
,
"ADD UPDATE TO QUEUE seq = "
+
seq
);
if
(
updatesStartWaitTimeSeq
==
0
)
{
updatesStartWaitTimeSeq
=
System
.
currentTimeMillis
();
}
...
...
TMessagesProj/src/main/java/org/telegram/android/SendMessagesHelper.java
View file @
f759ce5a
This diff is collapsed.
Click to expand it.
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View file @
f759ce5a
...
...
@@ -1895,10 +1895,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if
(
arrayList
==
null
||
arrayList
.
isEmpty
())
{
return
;
}
for
(
MessageObject
object
:
arrayList
)
{
if
(!
fromMyName
)
{
SendMessagesHelper
.
getInstance
().
sendMessage
(
object
,
dialog_id
);
}
else
{
if
(!
fromMyName
)
{
SendMessagesHelper
.
getInstance
().
sendMessage
(
arrayList
,
dialog_id
);
}
else
{
for
(
MessageObject
object
:
arrayList
)
{
SendMessagesHelper
.
getInstance
().
processForwardFromMyName
(
object
,
dialog_id
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment