properly clear file adding notification if forground service channel is disabled
This commit is contained in:
parent
39b86de698
commit
ac7f0032af
|
@ -883,6 +883,7 @@ public class NotificationService {
|
||||||
mBuilder.setProgress(100, current, false);
|
mBuilder.setProgress(100, current, false);
|
||||||
mBuilder.setSmallIcon(R.drawable.ic_hourglass_empty_white_24dp);
|
mBuilder.setSmallIcon(R.drawable.ic_hourglass_empty_white_24dp);
|
||||||
mBuilder.setContentIntent(createContentIntent(message.getConversation()));
|
mBuilder.setContentIntent(createContentIntent(message.getConversation()));
|
||||||
|
mBuilder.setOngoing(true);
|
||||||
if (Compatibility.twentySix()) {
|
if (Compatibility.twentySix()) {
|
||||||
mBuilder.setChannelId("compression");
|
mBuilder.setChannelId("compression");
|
||||||
}
|
}
|
||||||
|
@ -890,6 +891,10 @@ public class NotificationService {
|
||||||
notify(FOREGROUND_NOTIFICATION_ID, notification);
|
notify(FOREGROUND_NOTIFICATION_ID, notification);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void dismissForcedForegroundNotification() {
|
||||||
|
cancel(FOREGROUND_NOTIFICATION_ID);
|
||||||
|
}
|
||||||
|
|
||||||
private void notify(String tag, int id, Notification notification) {
|
private void notify(String tag, int id, Notification notification) {
|
||||||
final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(mXmppConnectionService);
|
final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(mXmppConnectionService);
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -407,6 +407,7 @@ public class XmppConnectionService extends Service {
|
||||||
public void stopForcingForegroundNotification() {
|
public void stopForcingForegroundNotification() {
|
||||||
mForceForegroundService.set(false);
|
mForceForegroundService.set(false);
|
||||||
toggleForegroundService();
|
toggleForegroundService();
|
||||||
|
mNotificationService.dismissForcedForegroundNotification();
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean areMessagesInitialized() {
|
public boolean areMessagesInitialized() {
|
||||||
|
|
Loading…
Reference in New Issue