More Alarm utility methods for cancelling and scheduling

app/src/main/java/com/philliphsu/clock2/editalarm/EditAlarmActivity.java

@@ -29,7 +29,6 @@ import com.philliphsu.clock2.R;
 import com.philliphsu.clock2.SharedPreferencesHelper;
 import com.philliphsu.clock2.model.AlarmsRepository;
 import com.philliphsu.clock2.util.AlarmUtils;
-import com.philliphsu.clock2.util.DurationUtils;
 
 import java.util.Date;
 
@@ -425,9 +424,6 @@ public class EditAlarmActivity extends BaseActivity implements AlarmNumpad.KeyLi
     @Override
     public void scheduleAlarm(Alarm alarm) {
         AlarmUtils.scheduleAlarm(this, alarm);
-        String message = getString(R.string.alarm_set_for,
-                DurationUtils.toString(this, alarm.ringsIn(), false /*abbreviate?*/));
-        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
     }
 
     @Override

app/src/main/java/com/philliphsu/clock2/editalarm/EditAlarmPresenter.java

@@ -91,7 +91,9 @@ public class EditAlarmPresenter implements EditAlarmContract.Presenter {
     @Override
     public void delete() {
         if (mAlarm != null) {
-            mAlarmUtilsHelper.cancelAlarm(mAlarm); // (1)
+            if (mAlarm.isEnabled()) {
+                mAlarmUtilsHelper.cancelAlarm(mAlarm); // (1)
+            }
             mRepository.deleteItem(mAlarm); // TOneverDO: before (1)
         }
         mView.showEditorClosed();
@@ -105,8 +107,12 @@ public class EditAlarmPresenter implements EditAlarmContract.Presenter {
     @Override
     public void stopSnoozing() {
         dismissNow(); // MUST be first, see AlarmUtils.notifyUpcomingAlarmIntent()
+
+        // AlarmUtils.cancelAlarm() does this for you if snoozed
+        /*
         mAlarm.stopSnoozing(); // TOneverDO: before dismissNow()
         mRepository.saveItems();
+        */
     }
 
     @Override