Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-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
AloqaIM-Android
Commits
855cc652
Commit
855cc652
authored
Oct 20, 2017
by
Leonardo Aramaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Null check message stack for the specific id before effectively replying the message
parent
015da5c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
16 deletions
+17
-16
PushManager.kt
app/src/main/java/chat/rocket/android/push/PushManager.kt
+17
-16
No files found.
app/src/main/java/chat/rocket/android/push/PushManager.kt
View file @
855cc652
...
@@ -441,24 +441,25 @@ object PushManager {
...
@@ -441,24 +441,25 @@ object PushManager {
val
message
:
CharSequence
?
=
extractMessage
(
intent
)
val
message
:
CharSequence
?
=
extractMessage
(
intent
)
val
pushMessage
=
intent
?.
extras
?.
getSerializable
(
"push"
)
as
PushMessage
?
val
pushMessage
=
intent
?.
extras
?.
getSerializable
(
"push"
)
as
PushMessage
?
if
(
pushMessage
!=
null
)
{
pushMessage
?.
let
{
val
single
NotId
=
pushMessage
.
notificationId
.
toInt
()
val
user
NotId
=
pushMessage
.
notificationId
.
toInt
()
val
groupTuple
=
groupMap
.
get
(
pushMessage
.
host
)
val
groupTuple
=
groupMap
.
get
(
pushMessage
.
host
)
for
(
msg
in
messageStack
[
singleNotId
])
{
messageStack
[
userNotId
]
?.
let
{
manager
.
cancel
(
singleNotId
)
for
(
msg
in
messageStack
[
userNotId
])
{
groupTuple
?.
second
?.
decrementAndGet
()
manager
.
cancel
(
userNotId
)
println
(
"Decremented"
)
groupTuple
?.
second
?.
decrementAndGet
()
}
}
clearMessageBundle
(
singleNotId
)
clearMessageBundle
(
userNotId
)
if
(
groupTuple
!=
null
)
{
groupTuple
?.
let
{
val
groupNotId
=
groupTuple
.
first
val
groupNotId
=
groupTuple
.
first
val
totalNot
=
groupTuple
.
second
.
get
()
val
totalNot
=
groupTuple
.
second
.
get
()
if
(
totalNot
==
0
)
{
if
(
totalNot
==
0
)
{
manager
.
cancel
(
groupNotId
)
manager
.
cancel
(
groupNotId
)
}
}
message
?.
let
{
sendMessage
(
context
,
message
,
pushMessage
.
rid
)
}
}
}
if
(
message
!=
null
)
{
sendMessage
(
context
,
message
,
pushMessage
.
rid
)
}
}
}
}
}
}
...
...
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