X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FFonBotMainService.java;h=38e0a29d0cbb8b4fd8a850ba28474b3e5ea54ccb;hb=079ea30606f31a88786a70feacff3184336a96b8;hp=e0bc6c0cf5452b7a76868843a167be08a9d372b6;hpb=5b5c357e7016b028883e03f7a38f0efd9bbfb7b9;p=fonbot.git

diff --git a/src/ro/ieval/fonbot/FonBotMainService.java b/src/ro/ieval/fonbot/FonBotMainService.java
index e0bc6c0..38e0a29 100644
--- a/src/ro/ieval/fonbot/FonBotMainService.java
+++ b/src/ro/ieval/fonbot/FonBotMainService.java
@@ -160,13 +160,14 @@ public final class FonBotMainService extends Service {
 
 	@Override
 	public int onStartCommand(final @Nullable Intent intent, final int flags, final int startId) {
+		final boolean showOngoing=PreferenceManager.getDefaultSharedPreferences(this).getBoolean("ongoing", false);
 		boolean updateNotification = false;
-		if(intent!=null && intent.getAction()==ACTION_PUT_ONGOING && intent.hasExtra(EXTRA_ONGOING_ID)){
+		if(intent!=null && intent.getAction()==ACTION_PUT_ONGOING && intent.hasExtra(EXTRA_ONGOING_ID) && showOngoing){
 			ongoing.add(OngoingEvent.values()[intent.getIntExtra(EXTRA_ONGOING_ID, 0)]);
 			LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent(ACTION_ONGOING_UPDATE));
 			updateNotification=true;
 		}
-		if(intent!=null && intent.getAction()==ACTION_DELETE_ONGOING && intent.hasExtra(EXTRA_ONGOING_ID)){
+		if(intent!=null && intent.getAction()==ACTION_DELETE_ONGOING && intent.hasExtra(EXTRA_ONGOING_ID) && showOngoing){
 			ongoing.remove(OngoingEvent.values()[intent.getIntExtra(EXTRA_ONGOING_ID, 0)]);
 			LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent(ACTION_ONGOING_UPDATE));
 			updateNotification=true;
@@ -194,7 +195,7 @@ public final class FonBotMainService extends Service {
 					setContentIntent(PendingIntent.getActivity(this, 0, mainIntent, 0)).
 					setOngoing(true);
 
-			if(!ongoing.isEmpty()) {
+			if(showOngoing && !ongoing.isEmpty()) {
 				final NotificationCompat.InboxStyle inboxBuilder=new NotificationCompat.InboxStyle(builder);
 
 				for(final OngoingEvent event : ongoing)