diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-12-17 10:51:28 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-12-17 10:51:28 +0100 |
| commit | c30108eb17eff0e94ad9bbe4392ee193120e8b32 (patch) | |
| tree | 9cd23a56a552d47aba353a39fbaae03ecf85590f /src/main/java/eu/siacs/conversations/services | |
| parent | 741a0c129d3558e9b9a714848a590a1f0a499799 (diff) | |
| parent | 5603440a91e72ac4d5c7043b85ff211425a592b9 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/NotificationService.java | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index 9e21d160..c27ab72a 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -72,20 +72,15 @@ public class NotificationService { if (!mXmppConnectionService.getPreferences().getBoolean("enable_quiet_hours", false)) { return false; } - final Calendar startTime = Calendar.getInstance(); - startTime.setTimeInMillis(mXmppConnectionService.getPreferences().getLong("quiet_hours_start", TimePreference.DEFAULT_VALUE)); - final Calendar endTime = Calendar.getInstance(); - endTime.setTimeInMillis(mXmppConnectionService.getPreferences().getLong("quiet_hours_end", TimePreference.DEFAULT_VALUE)); - final Calendar nowTime = Calendar.getInstance(); + final long startTime = mXmppConnectionService.getPreferences().getLong("quiet_hours_start", TimePreference.DEFAULT_VALUE) % Config.MILLISECONDS_IN_DAY; + final long endTime = mXmppConnectionService.getPreferences().getLong("quiet_hours_end", TimePreference.DEFAULT_VALUE) % Config.MILLISECONDS_IN_DAY; + final long nowTime = Calendar.getInstance().getTimeInMillis() % Config.MILLISECONDS_IN_DAY; - startTime.set(nowTime.get(Calendar.YEAR), nowTime.get(Calendar.MONTH), nowTime.get(Calendar.DATE)); - endTime.set(nowTime.get(Calendar.YEAR), nowTime.get(Calendar.MONTH), nowTime.get(Calendar.DATE)); - - if (endTime.before(startTime)) { - endTime.add(Calendar.DATE, 1); + if (endTime < startTime) { + return nowTime > startTime || nowTime < endTime; + } else { + return nowTime > startTime && nowTime < endTime; } - - return nowTime.after(startTime) && nowTime.before(endTime); } public boolean conferenceNotificationsEnabled() { |