Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
da9ba0e7
Commit
da9ba0e7
authored
3 years ago
by
Amirhossein Naghshzan
Committed by
Amirhossein Naghshzan
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
notification: set history style for all notifications
Change-Id: I81b25fda6d281899e441859a0123fcaac038e0fe
parent
b71c58f8
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
ring-android/app/src/main/java/cx/ring/services/NotificationServiceImpl.kt
+23
-27
23 additions, 27 deletions
...src/main/java/cx/ring/services/NotificationServiceImpl.kt
with
23 additions
and
27 deletions
ring-android/app/src/main/java/cx/ring/services/NotificationServiceImpl.kt
+
23
−
27
View file @
da9ba0e7
...
@@ -428,9 +428,6 @@ class NotificationServiceImpl(
...
@@ -428,9 +428,6 @@ class NotificationServiceImpl(
.
build
())
.
build
())
.
addPerson
(
conversationPerson
)
.
addPerson
(
conversationPerson
)
.
setShortcutId
(
key
)
.
setShortcutId
(
key
)
if
(
texts
.
size
==
1
)
{
messageNotificationBuilder
.
setStyle
(
null
)
}
else
{
val
account
=
mAccountService
.
getAccount
(
accountId
)
val
account
=
mAccountService
.
getAccount
(
accountId
)
val
profile
=
if
(
account
==
null
)
null
else
VCardServiceImpl
.
loadProfile
(
mContext
,
account
).
blockingFirst
()
val
profile
=
if
(
account
==
null
)
null
else
VCardServiceImpl
.
loadProfile
(
mContext
,
account
).
blockingFirst
()
val
myPic
=
account
?.
let
{
getContactPicture
(
it
)
}
val
myPic
=
account
?.
let
{
getContactPicture
(
it
)
}
...
@@ -456,7 +453,6 @@ class NotificationServiceImpl(
...
@@ -456,7 +453,6 @@ class NotificationServiceImpl(
))
))
}
}
messageNotificationBuilder
.
setStyle
(
history
)
messageNotificationBuilder
.
setStyle
(
history
)
}
val
notificationId
=
getTextNotificationId
(
conversation
.
accountId
,
conversation
.
uri
)
val
notificationId
=
getTextNotificationId
(
conversation
.
accountId
,
conversation
.
uri
)
val
replyId
=
notificationId
+
1
val
replyId
=
notificationId
+
1
val
markAsReadId
=
notificationId
+
2
val
markAsReadId
=
notificationId
+
2
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment