Browse Source

Cleanup after PR review.

test/jme/compound-poc
Benoit Marty 2 years ago
parent
commit
ec6004a9a8
  1. 14
      libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottler.kt
  2. 4
      services/analytics/api/build.gradle.kts
  3. 20
      services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/strings/AndroidStringProvider.kt

14
libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottler.kt

@ -24,9 +24,9 @@ import android.os.SystemClock @@ -24,9 +24,9 @@ import android.os.SystemClock
class FirstThrottler(private val minimumInterval: Long = 800) {
private var lastDate = 0L
sealed class CanHandlerResult {
object Yes : CanHandlerResult()
data class No(val shouldWaitMillis: Long) : CanHandlerResult()
sealed class CanHandleResult {
object Yes : CanHandleResult()
data class No(val shouldWaitMillis: Long) : CanHandleResult()
fun waitMillis(): Long {
return when (this) {
@ -36,15 +36,15 @@ class FirstThrottler(private val minimumInterval: Long = 800) { @@ -36,15 +36,15 @@ class FirstThrottler(private val minimumInterval: Long = 800) {
}
}
fun canHandle(): CanHandlerResult {
fun canHandle(): CanHandleResult {
val now = SystemClock.elapsedRealtime()
val delaySinceLast = now - lastDate
if (delaySinceLast > minimumInterval) {
lastDate = now
return CanHandlerResult.Yes
return CanHandleResult.Yes
}
// Too soon
return CanHandlerResult.No(minimumInterval - delaySinceLast)
// Too early
return CanHandleResult.No(minimumInterval - delaySinceLast)
}
}

4
services/analytics/api/build.gradle.kts

@ -21,7 +21,3 @@ plugins { @@ -21,7 +21,3 @@ plugins {
android {
namespace = "io.element.android.services.analytics.api"
}
dependencies {
// implementation(libs.coroutines.core)
}

20
services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/strings/AndroidStringProvider.kt

@ -26,30 +26,10 @@ import javax.inject.Inject @@ -26,30 +26,10 @@ import javax.inject.Inject
@ContributesBinding(AppScope::class)
class AndroidStringProvider @Inject constructor(private val resources: Resources) : StringProvider {
/**
* Returns a localized string from the application's package's
* default string table.
*
* @param resId Resource id for the string
* @return The string data associated with the resource, stripped of styled
* text information.
*/
override fun getString(@StringRes resId: Int): String {
return resources.getString(resId)
}
/**
* Returns a localized formatted string from the application's package's
* default string table, substituting the format arguments as defined in
* [java.util.Formatter] and [java.lang.String.format].
*
* @param resId Resource id for the format string
* @param formatArgs The format arguments that will be used for
* substitution.
* @return The string data associated with the resource, formatted and
* stripped of styled text information.
*/
override fun getString(@StringRes resId: Int, vararg formatArgs: Any?): String {
return resources.getString(resId, *formatArgs)
}

Loading…
Cancel
Save