From 07de78e8e7b0e981fc72767f949bd9d201c36cfd Mon Sep 17 00:00:00 2001 From: Phillip Hsu Date: Sat, 6 Aug 2016 03:40:29 -0700 Subject: [PATCH] Implemented timer actions in ringtone activity --- .../com/philliphsu/clock2/timers/TimesUpActivity.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java b/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java index cc03e07..20e153b 100644 --- a/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java +++ b/app/src/main/java/com/philliphsu/clock2/timers/TimesUpActivity.java @@ -8,6 +8,7 @@ import android.os.SystemClock; import android.support.v4.app.NotificationCompat; import android.view.ViewGroup; +import com.philliphsu.clock2.AsyncTimersTableUpdateHandler; import com.philliphsu.clock2.R; import com.philliphsu.clock2.Timer; import com.philliphsu.clock2.ringtone.RingtoneActivity; @@ -16,13 +17,17 @@ import com.philliphsu.clock2.ringtone.RingtoneService; public class TimesUpActivity extends RingtoneActivity { private static final String TAG = "TimesUpActivity"; + private TimerController mController; private NotificationManager mNotificationManager; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); stopService(new Intent(this, TimerNotificationService.class)); + // TODO: Consider calling this in the service's onDestroy() TimerNotificationService.cancelNotification(this, getRingingObject().getId()); + mController = new TimerController(getRingingObject(), + new AsyncTimersTableUpdateHandler(this, null)); mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); } @@ -91,12 +96,14 @@ public class TimesUpActivity extends RingtoneActivity { @Override protected void onLeftButtonClick() { - + mController.addOneMinute(); + stopAndFinish(); } @Override protected void onRightButtonClick() { - + mController.stop(); + stopAndFinish(); } // TODO: Consider changing the return type to Notification, and move the actual