ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 06:55:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #330 from vector-im/feature/bma/ktlint

Browse Source 
Upgrade of ktlint (not the plugin but the tool itself)
This commit is contained in:
Benoit Marty
2023-04-18 14:03:59 +02:00
committed by GitHub
parent deb14865c6 1cff85ddfa
commit ed8f867e1c
6 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt → libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ParallelMap.kt
View File
libraries/statemachine/src/main/kotlin/io/element/android/libraries/statemachine/StateMachine.kt
+2 -2
View File
@@ -64,7 +64,7 @@ class StateMachine<Event : Any, State : Any>(
val routesForEvent = routes.filter { it.eventType.isInstance(event) }
return (routesForEvent.firstOrNull { it.fromState?.isInstance(currentState) == true }
?: routesForEvent.firstOrNull { it.fromState == null }) as? StateMachineRoute<E, State, State>
?: routesForEvent.firstOrNull { it.fromState == null }) as? StateMachineRoute<E, State, State>
}
fun restart() {
@@ -129,7 +129,7 @@ class StateMachineBuilder<Event : Any, State : Any>(
newRoutes: List<StateMachineRoute<*, *, *>>,
) {
val oldEvents = oldRoutes.filter { it.fromState == state }.map { it.eventType }
val newEvents = newRoutes.filter { it.fromState == state }.map { it.eventType }
val newEvents = newRoutes.filter { it.fromState == state }.map { it.eventType }
val intersection = oldEvents.intersect(newEvents)
if (intersection.isNotEmpty()) {
val duplicates = intersection.joinToString(", ") { it.name }