From b1c0fd24b64f502b3f73c96d0474e91c795b6115 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 14 Jun 2014 20:51:34 -0500 Subject: [PATCH] Fix invalid injection --- .../todoroo/astrid/activity/TaskEditFragment.java | 2 +- .../todoroo/astrid/timers/TimerActionControlSet.java | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index a27e3832e..41168bf18 100755 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -358,7 +358,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { controls.add(editTitle); titleControls.addView(editTitle.getDisplayView(), 0, new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 1.0f)); - timerAction = new TimerActionControlSet(taskService, getActivity(), getView()); + timerAction = new TimerActionControlSet(notificationManager, taskService, getActivity(), getView()); controls.add(timerAction); TagsControlSet tagsControlSet = new TagsControlSet(preferences, tagService, getActivity(), diff --git a/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java b/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java index 3b7db94d4..942246605 100644 --- a/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java @@ -26,18 +26,14 @@ import org.tasks.notifications.NotificationManager; import java.util.LinkedList; import java.util.List; -import javax.inject.Inject; - public class TimerActionControlSet extends TaskEditControlSet { - @Inject NotificationManager notificationManager; - private final ImageView timerButton; private final Chronometer chronometer; private boolean timerActive; private final List listeners = new LinkedList<>(); - public TimerActionControlSet(final TaskService taskService, final Activity activity, View parent) { + public TimerActionControlSet(final NotificationManager notificationManager, final TaskService taskService, final Activity activity, View parent) { super(activity, -1); LinearLayout timerContainer = (LinearLayout) parent.findViewById(R.id.timer_container); @@ -69,11 +65,7 @@ public class TimerActionControlSet extends TaskEditControlSet { @Override protected void readFromTaskOnInitialize() { - if (model.getTimerStart() == 0) { - timerActive = false; - } else { - timerActive = true; - } + timerActive = model.getTimerStart() != 0; updateDisplay(); }