From 4984ba4ddeedac9b313fc0fd4d0a2a1884fdab65 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 24 Feb 2022 23:08:40 +0100 Subject: [PATCH] avoid linebreaks for "clear at" calculation because: - can lead to wrong calculations! - avoid klint complaining about indentation Signed-off-by: Marcel Hibbe --- .../talk/ui/dialog/SetStatusDialogFragment.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt index 1fd747a32..0985f3545 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt @@ -235,6 +235,9 @@ class SetStatusDialogFragment : @Suppress("ComplexMethod") private fun setClearStatusAfterValue(item: Int) { + + val currentTime = System.currentTimeMillis() / ONE_SECOND_IN_MILLIS + when (item) { POS_DONT_CLEAR -> { // don't clear @@ -243,20 +246,17 @@ class SetStatusDialogFragment : POS_HALF_AN_HOUR -> { // 30 minutes - clearAt = System.currentTimeMillis() / ONE_SECOND_IN_MILLIS + THIRTY_MINUTES * ONE_MINUTE_IN_SECONDS + clearAt = currentTime + THIRTY_MINUTES * ONE_MINUTE_IN_SECONDS } POS_AN_HOUR -> { // one hour - clearAt = - System.currentTimeMillis() / ONE_SECOND_IN_MILLIS + ONE_MINUTE_IN_SECONDS * ONE_MINUTE_IN_SECONDS + clearAt = currentTime + ONE_MINUTE_IN_SECONDS * ONE_MINUTE_IN_SECONDS } POS_FOUR_HOURS -> { // four hours - clearAt = - System.currentTimeMillis() / ONE_SECOND_IN_MILLIS + FOUR_HOURS * ONE_MINUTE_IN_SECONDS * - ONE_MINUTE_IN_SECONDS + clearAt = currentTime + FOUR_HOURS * ONE_MINUTE_IN_SECONDS * ONE_MINUTE_IN_SECONDS } POS_TODAY -> {