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
180d7eea
Commit
180d7eea
authored
Aug 25, 2013
by
Alexander Ivanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Invalid timestamp for persistent notification (see #123)"
This reverts commit
70021300
.
parent
e7e52c09
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
NotificationManager.java
...xabber/android/data/notification/NotificationManager.java
+4
-3
No files found.
src/com/xabber/android/data/notification/NotificationManager.java
View file @
180d7eea
...
@@ -394,7 +394,7 @@ public class NotificationManager implements OnInitializedListener,
...
@@ -394,7 +394,7 @@ public class NotificationManager implements OnInitializedListener,
if
(
Application
.
SDK_INT
>=
14
&&
SettingsManager
.
eventsPersistent
())
{
if
(
Application
.
SDK_INT
>=
14
&&
SettingsManager
.
eventsPersistent
())
{
// Ongoing icons are in the left side, so hide this one.
// Ongoing icons are in the left side, so hide this one.
notification
.
icon
=
R
.
drawable
.
ic_placeholder
;
notification
.
icon
=
R
.
drawable
.
ic_placeholder
;
notification
.
when
=
0
;
notification
.
when
=
Long
.
MIN_VALUE
;
}
else
{
}
else
{
// Ongoing icons are in the right side, so show this one.
// Ongoing icons are in the right side, so show this one.
updateNotification
(
notification
,
ticker
);
updateNotification
(
notification
,
ticker
);
...
@@ -450,7 +450,8 @@ public class NotificationManager implements OnInitializedListener,
...
@@ -450,7 +450,8 @@ public class NotificationManager implements OnInitializedListener,
updateNotification
(
persistentNotification
,
ticker
);
updateNotification
(
persistentNotification
,
ticker
);
}
else
{
}
else
{
persistentNotification
.
icon
=
R
.
drawable
.
ic_placeholder
;
persistentNotification
.
icon
=
R
.
drawable
.
ic_placeholder
;
persistentNotification
.
when
=
0
;
persistentNotification
.
when
=
Application
.
SDK_INT
>=
9
?
-
Long
.
MAX_VALUE
:
Long
.
MAX_VALUE
;
}
}
}
}
...
...
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