Added a preference option that can prevent notifications from ever appearing

pull/14/head
Sam Bosley 14 years ago
parent 422b5acd2a
commit 99b05143d9

@ -131,6 +131,8 @@ public class Notifications extends BroadcastReceiver {
return false; return false;
} }
if (!Preferences.getBoolean(R.string.p_rmd_enabled, true))
return false;
// you're done, or not yours - don't sound, do delete // you're done, or not yours - don't sound, do delete
if(task.isCompleted() || task.isDeleted() || task.getValue(Task.USER_ID) != 0) if(task.isCompleted() || task.isDeleted() || task.getValue(Task.USER_ID) != 0)
return false; return false;

@ -88,6 +88,11 @@ public class ReminderPreferences extends TodorooPreferenceActivity {
preference.setSummary(r.getString(R.string.rmd_EPr_snooze_dialog_desc_true)); preference.setSummary(r.getString(R.string.rmd_EPr_snooze_dialog_desc_true));
else else
preference.setSummary(r.getString(R.string.rmd_EPr_snooze_dialog_desc_false)); preference.setSummary(r.getString(R.string.rmd_EPr_snooze_dialog_desc_false));
} else if (r.getString(R.string.p_rmd_enabled).equals(preference.getKey())) {
if((Boolean)value)
preference.setSummary(R.string.rmd_EPr_enabled_desc_true);
else
preference.setSummary(R.string.rmd_EPr_enabled_desc_false);
} }
} }

@ -7,6 +7,9 @@
<!-- ======================================================== REMINDERS == --> <!-- ======================================================== REMINDERS == -->
<!-- whether reminders should appear at all -->
<string name="p_rmd_enabled">notif_enabled</string>
<!-- hour to start quiet hours (inclusive) --> <!-- hour to start quiet hours (inclusive) -->
<string name="p_rmd_quietStart">notif_qstart</string> <string name="p_rmd_quietStart">notif_qstart</string>

@ -113,6 +113,9 @@
<!-- Notification Volumne notification--> <!-- Notification Volumne notification-->
<string name="TLA_notification_volume_low">Notifications are muted. You won\'t be able to hear Astrid!</string> <string name="TLA_notification_volume_low">Notifications are muted. You won\'t be able to hear Astrid!</string>
<!-- Notifications disabled warning -->
<string name="TLA_notification_disabled">Astrid reminders are disabled! You will not receive any reminders</string>
<!-- ====================================================== TaskAdapter == --> <!-- ====================================================== TaskAdapter == -->
<!-- Format string to indicate task is hidden (%s => task name) --> <!-- Format string to indicate task is hidden (%s => task name) -->

@ -59,6 +59,13 @@
<!-- Reminder Preference Screen Title --> <!-- Reminder Preference Screen Title -->
<string name="rmd_EPr_alerts_header">Reminder Settings</string> <string name="rmd_EPr_alerts_header">Reminder Settings</string>
<!-- Reminder Preference: Reminders Enabled Title -->
<string name="rmd_EPr_enabled_title">Show Reminders</string>
<!-- Reminder Preference Reminders Enabled Description (true) -->
<string name="rmd_EPr_enabled_desc_true">Astrid reminders are enabled</string>
<!-- Reminder Preference Reminders Enabled Description (false) -->
<string name="rmd_EPr_enabled_desc_false">Astrid reminders will never appear</string>
<!-- Reminder Preference: Quiet Hours Start Title --> <!-- Reminder Preference: Quiet Hours Start Title -->
<string name="rmd_EPr_quiet_hours_start_title">Quiet Hours Start</string> <string name="rmd_EPr_quiet_hours_start_title">Quiet Hours Start</string>
<!-- Reminder Preference: Quiet Hours Start Description (%s => time set) --> <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->

@ -43,5 +43,9 @@
android:ringtoneType="notification" android:ringtoneType="notification"
android:showDefault="true" android:showDefault="true"
android:showSilent="true" /> android:showSilent="true" />
<CheckBoxPreference
android:key="@string/p_rmd_enabled"
android:title="@string/rmd_EPr_enabled_title"
android:defaultValue="true"/>
</PreferenceScreen> </PreferenceScreen>

@ -109,7 +109,9 @@ public class StartupService {
if(context instanceof Activity) { if(context instanceof Activity) {
AudioManager audioManager = (AudioManager)context.getSystemService( AudioManager audioManager = (AudioManager)context.getSystemService(
Context.AUDIO_SERVICE); Context.AUDIO_SERVICE);
if(audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION) == 0) if(!Preferences.getBoolean(R.string.p_rmd_enabled, true))
Toast.makeText(context, R.string.TLA_notification_disabled, Toast.LENGTH_LONG).show();
else if(audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION) == 0)
Toast.makeText(context, R.string.TLA_notification_volume_low, Toast.LENGTH_LONG).show(); Toast.makeText(context, R.string.TLA_notification_volume_low, Toast.LENGTH_LONG).show();
} }

Loading…
Cancel
Save