From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 29 Jul 2013 08:40:31 +0000 (+0300)
Subject: Let user disable showing ongoing events
X-Git-Tag: 0.000_001~16
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=079ea30606f31a88786a70feacff3184336a96b8;p=fonbot.git

Let user disable showing ongoing events
---

diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index cc881fe..6d90c6a 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -3,6 +3,7 @@
     <EditTextPreference android:title="Username" android:key="username" android:dialogTitle="Username" android:dialogMessage="Enter your username"/>
     <EditTextPreference android:dialogTitle="Password" android:dialogMessage="Enter your password" android:inputType="textPassword" android:title="Password" android:key="password"/>
     <EditTextPreference android:dialogTitle="SMS Password" android:dialogMessage="Enter the password required to send SMS commands. Leave empty to disable SMS commands" android:title="SMS Password" android:key="smspassword"/>
+	<CheckBoxPreference android:title="Show ongoing events" android:summaryOn="Ongoing events are shown" android:summaryOff="Ongoing events are not shown" android:key="ongoing"/>
     <CheckBoxPreference android:title="Device administration" android:summaryOn="Device administration is enabled." android:key="admin" android:summaryOff="Device administration is disabled. Some commands require device administration."/>
 	<CheckBoxPreference android:key="foreground" android:title="Run service in foreground" android:summaryOn="The FonBot service is kept in foreground. " android:summaryOff="The FonBot service is not kept in foreground."/>
     <CheckBoxPreference android:key="system" android:summaryOff="FonBot is not a system app. Changing this requires root and busybox" android:title="System App" android:summaryOn="FonBot is a system app. Changing this requires root and busybox"/>
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)