Fix for AST-137

astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java

@@ -38,6 +38,7 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
+import com.todoroo.astrid.utility.Preferences;
 
 /**
  * This activity is launched when a user opens up a notification from the
@@ -95,7 +96,13 @@ public class NotificationActivity extends TaskListActivity implements OnTimeSetL
         getLayoutInflater().inflate(R.layout.notification_control, parent, true);
 
         String reminder = Notifications.getRandomReminder(getResources().getStringArray(R.array.reminder_responses));
-        ((TextView)findViewById(R.id.reminderLabel)).setText(reminder);
+
+        if(Preferences.getBoolean(R.string.p_rmd_nagging, true))
+            ((TextView)findViewById(R.id.reminderLabel)).setText(reminder);
+        else {
+            findViewById(R.id.reminderLabel).setVisibility(View.GONE);
+            findViewById(R.id.astridIcon).setVisibility(View.GONE);
+        }
 
         // set up listeners
         ((Button)findViewById(R.id.goAway)).setOnClickListener(new OnClickListener() {

astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java

@@ -76,8 +76,10 @@ public class Notifications extends BroadcastReceiver {
             reminder = getRandomReminder(r.getStringArray(R.array.reminders_due));
         else if(type == ReminderService.TYPE_SNOOZE)
             reminder = getRandomReminder(r.getStringArray(R.array.reminders_snooze));
-        else
+        else if(Preferences.getBoolean(R.string.p_rmd_nagging, true))
             reminder = getRandomReminder(r.getStringArray(R.array.reminders));
+        else
+            reminder = ""; //$NON-NLS-1$
 
         if(!showTaskNotification(id, type, reminder)) {
             notificationManager.cancel((int)id);