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
b3483561
Commit
b3483561
authored
Nov 01, 2017
by
Leonardo Aramaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show full content (almost) of a message if just one message is received on Nougat
parent
30ab9216
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
8 deletions
+15
-8
PushManager.kt
app/src/main/java/chat/rocket/android/push/PushManager.kt
+15
-8
No files found.
app/src/main/java/chat/rocket/android/push/PushManager.kt
View file @
b3483561
...
@@ -361,8 +361,6 @@ object PushManager {
...
@@ -361,8 +361,6 @@ object PushManager {
val
pushMessageList
=
hostToPushMessageList
.
get
(
host
)
val
pushMessageList
=
hostToPushMessageList
.
get
(
host
)
pushMessageList
?.
let
{
pushMessageList
?.
let
{
val
inbox
=
Notification
.
InboxStyle
()
val
userMessages
=
pushMessageList
.
filter
{
val
userMessages
=
pushMessageList
.
filter
{
it
.
notificationId
==
lastPushMessage
.
notificationId
it
.
notificationId
==
lastPushMessage
.
notificationId
}
}
...
@@ -372,16 +370,25 @@ object PushManager {
...
@@ -372,16 +370,25 @@ object PushManager {
}.
size
}.
size
builder
.
setContentTitle
(
getTitle
(
count
,
title
))
builder
.
setContentTitle
(
getTitle
(
count
,
title
))
inbox
.
setBigContentTitle
(
getTitle
(
count
,
title
))
for
(
push
in
userMessages
)
{
if
(
count
>
1
)
{
inbox
.
addLine
(
push
.
message
)
val
inbox
=
Notification
.
InboxStyle
()
}
inbox
.
setBigContentTitle
(
getTitle
(
count
,
title
))
for
(
push
in
userMessages
)
{
inbox
.
addLine
(
push
.
message
)
}
builder
.
setStyle
(
inbox
)
builder
.
setStyle
(
inbox
)
}
else
{
val
bigTextStyle
=
Notification
.
BigTextStyle
()
.
bigText
(
message
.
fromHtml
())
builder
.
setStyle
(
bigTextStyle
)
}
}
}
}
else
{
}
else
{
builder
.
setContentText
(
message
.
fromHtml
())
val
bigTextStyle
=
Notification
.
BigTextStyle
()
.
bigText
(
message
.
fromHtml
())
builder
.
setStyle
(
bigTextStyle
)
}
}
return
builder
.
build
()
return
builder
.
build
()
...
...
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