hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Current alarm cancelled and service unbinds when deleting it or saving changes to it

Browse Source
This commit is contained in:
Phillip Hsu
2016-06-08 15:02:40 -07:00
parent 514bf41475
commit b0cc8e3557
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/philliphsu/clock2/editalarm/EditAlarmPresenter.java
+6 -3
View File
@@ -75,7 +75,10 @@ public class EditAlarmPresenter implements EditAlarmContract.Presenter {
.build();
a.setEnabled(mView.isEnabled());
if (mAlarm != null) {
mAlarmUtilsHelper.cancelAlarm(mAlarm, false);
if (mAlarm.isEnabled()) {
Log.d(TAG, "Cancelling old alarm first");
mAlarmUtilsHelper.cancelAlarm(mAlarm, false);
}
mRepository.updateItem(mAlarm, a);
} else {
mRepository.addItem(a);
@@ -92,9 +95,9 @@ public class EditAlarmPresenter implements EditAlarmContract.Presenter {
public void delete() {
if (mAlarm != null) {
if (mAlarm.isEnabled()) {
mAlarmUtilsHelper.cancelAlarm(mAlarm, false); // (1)
mAlarmUtilsHelper.cancelAlarm(mAlarm, false);
}
mRepository.deleteItem(mAlarm); // TOneverDO: before (1)
mRepository.deleteItem(mAlarm);
}
mView.showEditorClosed();
}