mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-23 18:05:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue on timer when recording/playing voice message or voice broadcast. All the seconds were not properly displayed.

Browse source
This commit is contained in:
Benoit Marty 2023-02-15 12:23:12 +01:00
parent 671435c7f7
commit f6711a3d16
3 changed files with 81 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt
View file

@ -33,13 +33,15 @@ class CountUpTimer(
private val lastTime: AtomicLong = AtomicLong(clock.epochMillis())
private val elapsedTime: AtomicLong = AtomicLong(0)
// To ensure that the regular tick value is an exact multiple of `intervalInMs`
private val specialRound = SpecialRound(intervalInMs)
private fun startCounter() {
counterJob?.cancel()
counterJob = coroutineScope.launch {
while (true) {
delay(intervalInMs - elapsedTime() % intervalInMs)
tickListener?.onTick(elapsedTime())
tickListener?.onTick(specialRound.round(elapsedTime()))
}
}
}

28
library/core-utils/src/main/java/im/vector/lib/core/utils/timer/SpecialRound.kt Normal file
View file

@ -0,0 +1,28 @@
/*
* Copyright (c) 2023 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.lib.core.utils.timer
import kotlin.math.round
class SpecialRound(private val step: Long) {
/**
* Round the provided value to the nearest multiple of `step`.
*/
fun round(value: Long): Long {
return round(value.toDouble() / step).toLong() * step
}
}

50
library/core-utils/src/test/java/im/vector/lib/core/utils/timer/SpecialRoundTest.kt Normal file
View file

@ -0,0 +1,50 @@
/*
* Copyright (c) 2023 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.lib.core.utils.timer
import org.amshove.kluent.shouldBeEqualTo
import org.junit.Test
class SpecialRoundTest {
@Test
fun `test special round 500`() {
val sut = SpecialRound(500)
sut.round(1) shouldBeEqualTo 0
sut.round(499) shouldBeEqualTo 500
sut.round(500) shouldBeEqualTo 500
sut.round(501) shouldBeEqualTo 500
sut.round(999) shouldBeEqualTo 1_000
sut.round(1000) shouldBeEqualTo 1_000
sut.round(1001) shouldBeEqualTo 1_000
sut.round(1499) shouldBeEqualTo 1_500
sut.round(1501) shouldBeEqualTo 1_500
}
@Test
fun `test special round 1_000`() {
val sut = SpecialRound(1_000)
sut.round(1) shouldBeEqualTo 0
sut.round(499) shouldBeEqualTo 0
sut.round(500) shouldBeEqualTo 0
sut.round(501) shouldBeEqualTo 1_000
sut.round(999) shouldBeEqualTo 1_000
sut.round(1000) shouldBeEqualTo 1_000
sut.round(1001) shouldBeEqualTo 1_000
sut.round(1499) shouldBeEqualTo 1_000
sut.round(1501) shouldBeEqualTo 2_000
}
}