Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xabber-android
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
xabber-android
Commits
ade9d7f4
Commit
ade9d7f4
authored
Jul 10, 2015
by
Grigory Fedorov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'spamfix' of
https://github.com/bostrt/xabber-android
into bostrt-spamfix
parents
6e640ac5
70739f39
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
RoomChat.java
.../java/com/xabber/android/data/extension/muc/RoomChat.java
+5
-1
No files found.
app/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java
View file @
ade9d7f4
...
...
@@ -215,8 +215,12 @@ public class RoomChat extends AbstractChat {
RosterManager
.
getInstance
().
onContactChanged
(
account
,
bareAddress
);
newAction
(
resource
,
subject
,
ChatAction
.
subject
);
}
else
{
boolean
notify
=
true
;
String
packetID
=
message
.
getPacketID
();
Date
delay
=
Delay
.
getDelay
(
message
);
if
(
delay
!=
null
)
{
notify
=
false
;
}
for
(
MessageItem
messageItem
:
messages
)
{
// Search for duplicates
if
(
packetID
!=
null
&&
packetID
.
equals
(
messageItem
.
getPacketID
()))
{
...
...
@@ -232,7 +236,7 @@ public class RoomChat extends AbstractChat {
}
updateThreadId
(
message
.
getThread
());
MessageItem
messageItem
=
newMessage
(
resource
,
text
,
null
,
delay
,
true
,
true
,
false
,
false
,
true
);
delay
,
true
,
notify
,
false
,
false
,
true
);
messageItem
.
setPacketID
(
packetID
);
}
}
else
if
(
packet
instanceof
Presence
)
{
...
...
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