Skip to content

Commit b9202d2

Browse files
committed
Fix lint issues
1 parent 2c20f17 commit b9202d2

File tree

10 files changed

+12
-11
lines changed

10 files changed

+12
-11
lines changed

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import io.element.android.features.login.impl.DefaultLoginUserStory
2020
import io.element.android.libraries.architecture.AsyncAction
2121
import io.element.android.libraries.architecture.Presenter
2222
import io.element.android.libraries.core.data.tryOrNull
23-
import io.element.android.libraries.core.extensions.runCatchingExceptions
2423
import io.element.android.libraries.core.extensions.flatMap
24+
import io.element.android.libraries.core.extensions.runCatchingExceptions
2525
import io.element.android.libraries.core.meta.BuildMeta
2626
import io.element.android.libraries.matrix.api.MatrixClientProvider
2727
import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import io.element.android.libraries.core.bool.orFalse
1212
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
1313
import io.element.android.libraries.core.coroutine.childScope
1414
import io.element.android.libraries.core.data.tryOrNull
15-
import io.element.android.libraries.core.extensions.runCatchingExceptions
1615
import io.element.android.libraries.core.extensions.mapFailure
16+
import io.element.android.libraries.core.extensions.runCatchingExceptions
1717
import io.element.android.libraries.featureflag.api.FeatureFlagService
1818
import io.element.android.libraries.matrix.api.MatrixClient
1919
import io.element.android.libraries.matrix.api.core.DeviceId

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ package io.element.android.libraries.matrix.impl.auth
99

1010
import com.squareup.anvil.annotations.ContributesBinding
1111
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
12-
import io.element.android.libraries.core.extensions.runCatchingExceptions
1312
import io.element.android.libraries.core.extensions.mapFailure
13+
import io.element.android.libraries.core.extensions.runCatchingExceptions
1414
import io.element.android.libraries.di.AppScope
1515
import io.element.android.libraries.di.SingleIn
1616
import io.element.android.libraries.matrix.api.MatrixClient

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
package io.element.android.libraries.matrix.impl.encryption
99

1010
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
11-
import io.element.android.libraries.core.extensions.runCatchingExceptions
1211
import io.element.android.libraries.core.extensions.flatMap
1312
import io.element.android.libraries.core.extensions.mapFailure
13+
import io.element.android.libraries.core.extensions.runCatchingExceptions
1414
import io.element.android.libraries.matrix.api.core.SessionId
1515
import io.element.android.libraries.matrix.api.core.UserId
1616
import io.element.android.libraries.matrix.api.encryption.BackupState

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/pushers/RustPushersService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
package io.element.android.libraries.matrix.impl.pushers
99

1010
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
11-
import io.element.android.libraries.core.extensions.runCatchingExceptions
1211
import io.element.android.libraries.core.extensions.mapFailure
12+
import io.element.android.libraries.core.extensions.runCatchingExceptions
1313
import io.element.android.libraries.matrix.api.pusher.PushersService
1414
import io.element.android.libraries.matrix.api.pusher.SetHttpPusherData
1515
import io.element.android.libraries.matrix.api.pusher.UnsetHttpPusherData

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ package io.element.android.libraries.matrix.impl.room
99

1010
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
1111
import io.element.android.libraries.core.coroutine.childScope
12-
import io.element.android.libraries.core.extensions.runCatchingExceptions
1312
import io.element.android.libraries.core.extensions.mapFailure
13+
import io.element.android.libraries.core.extensions.runCatchingExceptions
1414
import io.element.android.libraries.featureflag.api.FeatureFlagService
1515
import io.element.android.libraries.matrix.api.core.DeviceId
1616
import io.element.android.libraries.matrix.api.core.EventId

libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import io.element.android.libraries.androidutils.file.safeRenameTo
2020
import io.element.android.libraries.androidutils.media.runAndRelease
2121
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
2222
import io.element.android.libraries.core.data.tryOrNull
23-
import io.element.android.libraries.core.extensions.runCatchingExceptions
2423
import io.element.android.libraries.core.extensions.mapFailure
24+
import io.element.android.libraries.core.extensions.runCatchingExceptions
2525
import io.element.android.libraries.core.mimetype.MimeTypes
2626
import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeAudio
2727
import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import android.content.Context
1111
import android.net.Uri
1212
import androidx.core.content.FileProvider
1313
import com.squareup.anvil.annotations.ContributesBinding
14-
import io.element.android.libraries.core.extensions.runCatchingExceptions
1514
import io.element.android.libraries.core.extensions.mapCatchingExceptions
15+
import io.element.android.libraries.core.extensions.runCatchingExceptions
1616
import io.element.android.libraries.core.log.logger.LoggerTag
1717
import io.element.android.libraries.di.AppScope
1818
import io.element.android.libraries.di.ApplicationContext

libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePresenter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import androidx.compose.runtime.remember
1616
import io.element.android.libraries.architecture.AsyncData
1717
import io.element.android.libraries.architecture.Presenter
1818
import io.element.android.libraries.architecture.runUpdatingState
19-
import io.element.android.libraries.core.extensions.runCatchingExceptions
2019
import io.element.android.libraries.core.extensions.flatMap
20+
import io.element.android.libraries.core.extensions.runCatchingExceptions
2121
import io.element.android.libraries.matrix.api.core.EventId
2222
import io.element.android.libraries.ui.utils.time.formatShort
2323
import io.element.android.libraries.voiceplayer.api.VoiceMessageEvents

tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/RunCatchingRule.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ class RunCatchingRule(config: Config) : Rule(config) {
2121
override val issue: Issue = Issue(
2222
id = "RunCatchingNotAllowed",
2323
severity = Severity.Style,
24-
description = "Avoid using runCatching, use `runCatchingExceptions` or `tryOrNull` instead. Avoid `mapCatching`, use `maprunCatchingExceptions` instead.",
24+
description = "Avoid using `runCatching`, use `runCatchingExceptions` or `tryOrNull` instead. " +
25+
"Avoid `mapCatching`, use `mapCatchingExceptions` instead.",
2526
debt = Debt.FIVE_MINS,
2627
)
2728

@@ -35,7 +36,7 @@ class RunCatchingRule(config: Config) : Rule(config) {
3536
report(CodeSmell(
3637
issue = issue,
3738
entity = Entity.from(expression),
38-
message = "Use `runCatchingExceptions` or `tryOrNull` instead of `runCatching`. Avoid `mapCatching`, use `maprunCatchingExceptions` instead."
39+
message = "Use `runCatchingExceptions` or `tryOrNull` instead of `runCatching`. Avoid `mapCatching`, use `mapCatchingExceptions` instead."
3940
))
4041
}
4142
}

0 commit comments

Comments
 (0)