Merge pull request #967 from vector-im/feature/bma/detektConfig
Update detekt config.
This commit is contained in:
Benoit Marty
GitHub
commit
d06f86f79d
90 changed files with 296 additions and 198 deletions
|
|
@ -183,7 +183,7 @@ fun Context.startInstallFromSourceIntent(
|
|||
noActivityFoundMessage: String = getString(R.string.error_no_compatible_app_found),
|
||||
) {
|
||||
val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES)
|
||||
.setData(Uri.parse(String.format("package:%s", packageName)))
|
||||
.setData(Uri.parse("package:$packageName"))
|
||||
try {
|
||||
activityResultLauncher.launch(intent)
|
||||
} catch (activityNotFoundException: ActivityNotFoundException) {
|
||||
|
|
|
|||
|
|
@ -23,5 +23,5 @@ import com.bumble.appyx.core.plugin.plugins
|
|||
interface NodeInputs : Plugin
|
||||
|
||||
inline fun <reified I : NodeInputs> Node.inputs(): I {
|
||||
return plugins<I>().firstOrNull() ?: throw RuntimeException("Make sure to actually pass NodeInputs plugin to your node")
|
||||
return requireNotNull(plugins<I>().firstOrNull()) { "Make sure to actually pass NodeInputs plugin to your node" }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,7 +72,3 @@ fun String.ellipsize(length: Int): String {
|
|||
|
||||
return "${this.take(length)}…"
|
||||
}
|
||||
|
||||
inline fun <reified R> Any?.takeAs(): R? {
|
||||
return takeIf { it is R } as R?
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ class DefaultLastMessageTimestampFormatterTest {
|
|||
* Create DefaultLastMessageFormatter and set current time to the provided date.
|
||||
*/
|
||||
private fun createFormatter(@Suppress("SameParameterValue") currentDate: String): LastMessageTimestampFormatter {
|
||||
val clock = FakeClock().also { it.givenInstant(Instant.parse(currentDate)) }
|
||||
val clock = FakeClock().apply { givenInstant(Instant.parse(currentDate)) }
|
||||
val localDateTimeProvider = LocalDateTimeProvider(clock, TimeZone.UTC)
|
||||
val dateFormatters = DateFormatters(Locale.US, clock, TimeZone.UTC)
|
||||
return DefaultLastMessageTimestampFormatter(localDateTimeProvider, dateFormatters)
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ fun InfoListItemMolecule(
|
|||
|
||||
@DayNightPreviews
|
||||
@Composable
|
||||
fun InfoListItemMoleculePreview() {
|
||||
internal fun InfoListItemMoleculePreview() {
|
||||
ElementPreview {
|
||||
val color = if (isSystemInDarkTheme()) Color.DarkGray else Color.LightGray
|
||||
Column(
|
||||
|
|
|
|||
|
|
@ -68,11 +68,11 @@ fun LabelledTextField(
|
|||
|
||||
@Preview
|
||||
@Composable
|
||||
fun LabelledTextFieldLightPreview() = ElementPreviewLight { ContentToPreview() }
|
||||
internal fun LabelledTextFieldLightPreview() = ElementPreviewLight { ContentToPreview() }
|
||||
|
||||
@Preview
|
||||
@Composable
|
||||
fun LabelledTextFieldDarkPreview() = ElementPreviewDark { ContentToPreview() }
|
||||
internal fun LabelledTextFieldDarkPreview() = ElementPreviewDark { ContentToPreview() }
|
||||
|
||||
@Composable
|
||||
private fun ContentToPreview() {
|
||||
|
|
|
|||
|
|
@ -51,6 +51,6 @@ fun PinIcon(
|
|||
|
||||
@DayNightPreviews
|
||||
@Composable
|
||||
fun PinIconPreview() = ElementPreview {
|
||||
internal fun PinIconPreview() = ElementPreview {
|
||||
PinIcon()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ private fun InitialsAvatar(
|
|||
|
||||
@Preview(group = PreviewGroup.Avatars)
|
||||
@Composable
|
||||
fun AvatarPreview(@PreviewParameter(AvatarDataProvider::class) avatarData: AvatarData) =
|
||||
internal fun AvatarPreview(@PreviewParameter(AvatarDataProvider::class) avatarData: AvatarData) =
|
||||
ElementThemedPreview {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
|
|
|
|||
|
|
@ -20,19 +20,16 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
|
|||
|
||||
open class AvatarDataProvider : PreviewParameterProvider<AvatarData> {
|
||||
override val values: Sequence<AvatarData>
|
||||
get() {
|
||||
AvatarSize.values()
|
||||
.also { it.sortBy { item -> item.name } }
|
||||
.asSequence()
|
||||
return AvatarSize.values().asSequence().map {
|
||||
get() = AvatarSize.values()
|
||||
.asSequence()
|
||||
.map {
|
||||
sequenceOf(
|
||||
anAvatarData(size = it),
|
||||
anAvatarData(size = it).copy(name = null),
|
||||
anAvatarData(size = it).copy(url = "aUrl"),
|
||||
)
|
||||
}
|
||||
.flatten()
|
||||
}
|
||||
.flatten()
|
||||
}
|
||||
|
||||
fun anAvatarData(
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ internal fun DatePickerPreviewDark() {
|
|||
@Composable
|
||||
private fun ContentToPreview() {
|
||||
val state = rememberDatePickerState(
|
||||
initialSelectedDateMillis = 1672578000000L,
|
||||
initialSelectedDateMillis = 1_672_578_000_000L,
|
||||
)
|
||||
AlertDialogContent(
|
||||
buttons = { /*TODO*/ },
|
||||
|
|
|
|||
|
|
@ -28,10 +28,12 @@ import timber.log.Timber
|
|||
@Composable
|
||||
fun LogCompositions(tag: String, msg: String) {
|
||||
if (BuildConfig.DEBUG) {
|
||||
val ref = remember { Ref(0) }
|
||||
val ref = remember { Ref() }
|
||||
SideEffect { ref.value++ }
|
||||
Timber.tag(tag).d("Compositions: $msg ${ref.value}")
|
||||
}
|
||||
}
|
||||
|
||||
class Ref(var value: Int)
|
||||
private class Ref {
|
||||
var value: Int = 0
|
||||
}
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ private fun MapView.lifecycleObserver(previousState: MutableState<Lifecycle.Even
|
|||
Lifecycle.Event.ON_DESTROY -> {
|
||||
//handled in onDispose
|
||||
}
|
||||
else -> throw IllegalStateException()
|
||||
Lifecycle.Event.ON_ANY -> error("ON_ANY should never be used")
|
||||
}
|
||||
previousState.value = event
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,9 +95,9 @@ object PermalinkParser {
|
|||
return if (signUrl.isNullOrEmpty().not() && email.isNullOrEmpty().not()) {
|
||||
try {
|
||||
val signValidUri = Uri.parse(signUrl)
|
||||
val identityServerHost = signValidUri.authority ?: throw IllegalArgumentException()
|
||||
val token = signValidUri.getQueryParameter("token") ?: throw IllegalArgumentException()
|
||||
val privateKey = signValidUri.getQueryParameter("private_key") ?: throw IllegalArgumentException()
|
||||
val identityServerHost = signValidUri.authority ?: throw IllegalArgumentException("missing `authority`")
|
||||
val token = signValidUri.getQueryParameter("token") ?: throw IllegalArgumentException("missing `token`")
|
||||
val privateKey = signValidUri.getQueryParameter("private_key") ?: throw IllegalArgumentException("missing `private_key`")
|
||||
PermalinkData.RoomEmailInviteLink(
|
||||
roomId = identifier,
|
||||
email = email!!,
|
||||
|
|
@ -137,7 +137,8 @@ object PermalinkParser {
|
|||
.parameterList
|
||||
.filter {
|
||||
it.mParameter == "via"
|
||||
}.map {
|
||||
}
|
||||
.map {
|
||||
URLDecoder.decode(it.mValue, "UTF-8")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -147,7 +147,8 @@ class RustMatrixClient constructor(
|
|||
if (syncState == SyncState.Running) {
|
||||
onSlidingSyncUpdate()
|
||||
}
|
||||
}.launchIn(sessionCoroutineScope)
|
||||
}
|
||||
.launchIn(sessionCoroutineScope)
|
||||
}
|
||||
|
||||
override suspend fun getRoom(roomId: RoomId): MatrixRoom? = withContext(sessionDispatcher) {
|
||||
|
|
@ -227,7 +228,8 @@ class RustMatrixClient constructor(
|
|||
roomSummaryDataSource.allRooms()
|
||||
.filter { roomSummaries ->
|
||||
roomSummaries.map { it.identifier() }.contains(roomId.value)
|
||||
}.first()
|
||||
}
|
||||
.first()
|
||||
}
|
||||
roomId
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ class RustMatrixAuthenticationService @Inject constructor(
|
|||
client.restoreSession(sessionData.toSession())
|
||||
createMatrixClient(client)
|
||||
} else {
|
||||
throw IllegalStateException("No session to restore with id $sessionId")
|
||||
error("No session to restore with id $sessionId")
|
||||
}
|
||||
}.mapFailure { failure ->
|
||||
failure.mapClientException()
|
||||
|
|
|
|||
|
|
@ -64,7 +64,8 @@ internal class RustRoomSummaryDataSource(
|
|||
.map { it.toRoomSummaryDataSourceLoadingState() }
|
||||
.onEach {
|
||||
allRoomsLoadingState.value = it
|
||||
}.launchIn(this)
|
||||
}
|
||||
.launchIn(this)
|
||||
|
||||
launch {
|
||||
// Wait until running, as invites is only available after that
|
||||
|
|
|
|||
|
|
@ -118,7 +118,8 @@ class RustMatrixTimeline(
|
|||
innerRoom.backPaginationStatusFlow()
|
||||
.onEach {
|
||||
postPaginationStatus(it)
|
||||
}.launchIn(this)
|
||||
}
|
||||
.launchIn(this)
|
||||
|
||||
taskHandleBag += fetchMembers().getOrNull()
|
||||
}.invokeOnCompletion {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ import java.util.Date
|
|||
|
||||
class TimelineEncryptedHistoryPostProcessorTest {
|
||||
|
||||
private val defaultLastLoginTimestamp = Date(1689061264L)
|
||||
private val defaultLastLoginTimestamp = Date(1_689_061_264L)
|
||||
|
||||
@Test
|
||||
fun `given an unencrypted room, nothing is done`() {
|
||||
|
|
|
|||
|
|
@ -111,12 +111,12 @@ private fun AvatarActionBottomSheetContent(
|
|||
|
||||
@Preview
|
||||
@Composable
|
||||
fun AvatarActionBottomSheetLightPreview() =
|
||||
internal fun AvatarActionBottomSheetLightPreview() =
|
||||
ElementPreviewLight { ContentToPreview() }
|
||||
|
||||
@Preview
|
||||
@Composable
|
||||
fun AvatarActionBottomSheetDarkPreview() =
|
||||
internal fun AvatarActionBottomSheetDarkPreview() =
|
||||
ElementPreviewDark { ContentToPreview() }
|
||||
|
||||
@Composable
|
||||
|
|
|
|||
|
|
@ -103,12 +103,12 @@ private fun MatrixUserHeaderContent(
|
|||
|
||||
@Preview
|
||||
@Composable
|
||||
fun MatrixUserHeaderLightPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
|
||||
internal fun MatrixUserHeaderLightPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
|
||||
ElementPreviewLight { ContentToPreview(matrixUser) }
|
||||
|
||||
@Preview
|
||||
@Composable
|
||||
fun MatrixUserHeaderDarkPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
|
||||
internal fun MatrixUserHeaderDarkPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
|
||||
ElementPreviewDark { ContentToPreview(matrixUser) }
|
||||
|
||||
@Composable
|
||||
|
|
|
|||
|
|
@ -68,12 +68,12 @@ fun MatrixUserHeaderPlaceholder(
|
|||
|
||||
@Preview
|
||||
@Composable
|
||||
fun MatrixUserHeaderPlaceholderLightPreview() =
|
||||
internal fun MatrixUserHeaderPlaceholderLightPreview() =
|
||||
ElementPreviewLight { ContentToPreview() }
|
||||
|
||||
@Preview
|
||||
@Composable
|
||||
fun MatrixUserHeaderPlaceholderDarkPreview() =
|
||||
internal fun MatrixUserHeaderPlaceholderDarkPreview() =
|
||||
ElementPreviewDark { ContentToPreview() }
|
||||
|
||||
@Composable
|
||||
|
|
|
|||
|
|
@ -85,11 +85,11 @@ fun UnsavedAvatar(
|
|||
|
||||
@Preview
|
||||
@Composable
|
||||
fun UnsavedAvatarLightPreview() = ElementPreviewLight { ContentToPreview() }
|
||||
internal fun UnsavedAvatarLightPreview() = ElementPreviewLight { ContentToPreview() }
|
||||
|
||||
@Preview
|
||||
@Composable
|
||||
fun UnsavedAvatarDarkPreview() = ElementPreviewDark { ContentToPreview() }
|
||||
internal fun UnsavedAvatarDarkPreview() = ElementPreviewDark { ContentToPreview() }
|
||||
|
||||
@Composable
|
||||
private fun ContentToPreview() {
|
||||
|
|
|
|||
|
|
@ -57,14 +57,9 @@ fun MatrixRoom.getDirectRoomMember(roomMembersState: MatrixRoomMembersState): St
|
|||
val roomMembers = roomMembersState.roomMembers()
|
||||
return remember(roomMembersState) {
|
||||
derivedStateOf {
|
||||
if (roomMembers == null) {
|
||||
null
|
||||
} else if (roomMembers.size == 2 && isDirect && isEncrypted) {
|
||||
roomMembers.find { it.userId != this.sessionId }
|
||||
} else {
|
||||
null
|
||||
}
|
||||
roomMembers
|
||||
?.takeIf { it.size == 2 && isDirect && isEncrypted }
|
||||
?.find { it.userId != sessionId }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -83,12 +83,12 @@ fun PermissionsView(
|
|||
|
||||
@Preview
|
||||
@Composable
|
||||
fun PermissionsViewLightPreview(@PreviewParameter(PermissionsViewStateProvider::class) state: PermissionsState) =
|
||||
internal fun PermissionsViewLightPreview(@PreviewParameter(PermissionsViewStateProvider::class) state: PermissionsState) =
|
||||
ElementPreviewLight { ContentToPreview(state) }
|
||||
|
||||
@Preview
|
||||
@Composable
|
||||
fun PermissionsViewDarkPreview(@PreviewParameter(PermissionsViewStateProvider::class) state: PermissionsState) =
|
||||
internal fun PermissionsViewDarkPreview(@PreviewParameter(PermissionsViewStateProvider::class) state: PermissionsState) =
|
||||
ElementPreviewDark { ContentToPreview(state) }
|
||||
|
||||
@Composable
|
||||
|
|
|
|||
|
|
@ -23,17 +23,15 @@ import io.element.android.libraries.matrix.api.core.SessionId
|
|||
* Data class to hold information about a group of notifications for a room.
|
||||
*/
|
||||
data class RoomEventGroupInfo(
|
||||
val sessionId: SessionId,
|
||||
val roomId: RoomId,
|
||||
val roomDisplayName: String,
|
||||
val isDirect: Boolean = false
|
||||
) {
|
||||
val sessionId: SessionId,
|
||||
val roomId: RoomId,
|
||||
val roomDisplayName: String,
|
||||
val isDirect: Boolean = false,
|
||||
// An event in the list has not yet been display
|
||||
var hasNewEvent: Boolean = false
|
||||
|
||||
val hasNewEvent: Boolean = false,
|
||||
// true if at least one on the not yet displayed event is noisy
|
||||
var shouldBing: Boolean = false
|
||||
var customSound: String? = null
|
||||
var hasSmartReplyError: Boolean = false
|
||||
var isUpdated: Boolean = false
|
||||
}
|
||||
val shouldBing: Boolean = false,
|
||||
val customSound: String? = null,
|
||||
val hasSmartReplyError: Boolean = false,
|
||||
val isUpdated: Boolean = false,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -85,12 +85,11 @@ class RoomGroupMessageCreator @Inject constructor(
|
|||
roomId = roomId,
|
||||
roomDisplayName = roomName,
|
||||
isDirect = !roomIsGroup,
|
||||
).also {
|
||||
it.hasSmartReplyError = smartReplyErrors.isNotEmpty()
|
||||
it.shouldBing = meta.shouldBing
|
||||
it.customSound = events.last().soundName
|
||||
it.isUpdated = events.last().isUpdated
|
||||
},
|
||||
hasSmartReplyError = smartReplyErrors.isNotEmpty(),
|
||||
shouldBing = meta.shouldBing,
|
||||
customSound = events.last().soundName,
|
||||
isUpdated = events.last().isUpdated,
|
||||
),
|
||||
threadId = lastKnownRoomEvent.threadId,
|
||||
largeIcon = largeBitmap,
|
||||
lastMessageTimestamp,
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ data class SimpleNotifiableEvent(
|
|||
val type: String?,
|
||||
val timestamp: Long,
|
||||
val soundName: String?,
|
||||
override var canBeReplaced: Boolean,
|
||||
override val canBeReplaced: Boolean,
|
||||
override val isRedacted: Boolean = false,
|
||||
override val isUpdated: Boolean = false
|
||||
) : NotifiableEvent
|
||||
|
|
|
|||
|
|
@ -100,15 +100,15 @@ class DefaultPushHandler @Inject constructor(
|
|||
}
|
||||
|
||||
val clientSecret = pushData.clientSecret
|
||||
val userId = if (clientSecret == null) {
|
||||
// Should not happen. In this case, restore default session
|
||||
null
|
||||
} else {
|
||||
// Get userId from client secret
|
||||
pushClientSecret.getUserIdFromSecret(clientSecret)
|
||||
} ?: run {
|
||||
matrixAuthenticationService.getLatestSessionId()
|
||||
}
|
||||
// clientSecret should not be null. If this happens, restore default session
|
||||
val userId = clientSecret
|
||||
?.let {
|
||||
// Get userId from client secret
|
||||
pushClientSecret.getUserIdFromSecret(clientSecret)
|
||||
}
|
||||
?: run {
|
||||
matrixAuthenticationService.getLatestSessionId()
|
||||
}
|
||||
|
||||
if (userId == null) {
|
||||
Timber.w("Unable to get a session")
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ class NotificationIdProviderTest {
|
|||
@Test
|
||||
fun `test notification id provider`() {
|
||||
val sut = NotificationIdProvider()
|
||||
val offsetForASessionId = 305410
|
||||
val offsetForASessionId = 305_410
|
||||
assertThat(sut.getSummaryNotificationId(A_SESSION_ID)).isEqualTo(offsetForASessionId + 0)
|
||||
assertThat(sut.getRoomMessagesNotificationId(A_SESSION_ID)).isEqualTo(offsetForASessionId + 1)
|
||||
assertThat(sut.getRoomEventNotificationId(A_SESSION_ID)).isEqualTo(offsetForASessionId + 2)
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ import io.element.android.libraries.pushproviders.api.PushData
|
|||
data class PushDataFirebase(
|
||||
val eventId: String?,
|
||||
val roomId: String?,
|
||||
var unread: Int?,
|
||||
val unread: Int?,
|
||||
val clientSecret: String?
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ data class PushDataUnifiedPush(
|
|||
data class PushDataUnifiedPushNotification(
|
||||
@SerialName("event_id") val eventId: String? = null,
|
||||
@SerialName("room_id") val roomId: String? = null,
|
||||
@SerialName("counts") var counts: PushDataUnifiedPushCounts? = null,
|
||||
@SerialName("counts") val counts: PushDataUnifiedPushCounts? = null,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ private fun BoxScope.SendButton(
|
|||
|
||||
@DayNightPreviews
|
||||
@Composable
|
||||
fun TextComposerSimplePreview() = ElementPreview {
|
||||
internal fun TextComposerSimplePreview() = ElementPreview {
|
||||
Column {
|
||||
TextComposer(
|
||||
onSendMessage = {},
|
||||
|
|
@ -451,7 +451,7 @@ fun TextComposerSimplePreview() = ElementPreview {
|
|||
|
||||
@DayNightPreviews
|
||||
@Composable
|
||||
fun TextComposerEditPreview() = ElementPreview {
|
||||
internal fun TextComposerEditPreview() = ElementPreview {
|
||||
TextComposer(
|
||||
onSendMessage = {},
|
||||
onComposerTextChange = {},
|
||||
|
|
@ -464,7 +464,7 @@ fun TextComposerEditPreview() = ElementPreview {
|
|||
|
||||
@DayNightPreviews
|
||||
@Composable
|
||||
fun TextComposerReplyPreview() = ElementPreview {
|
||||
internal fun TextComposerReplyPreview() = ElementPreview {
|
||||
Column {
|
||||
TextComposer(
|
||||
onSendMessage = {},
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ internal val materialColorSchemeDark = darkColorScheme(
|
|||
|
||||
@Preview
|
||||
@Composable
|
||||
fun ColorsSchemePreviewLight() = ColorsSchemePreview(
|
||||
internal fun ColorsSchemePreviewLight() = ColorsSchemePreview(
|
||||
Color.Black,
|
||||
Color.White,
|
||||
materialColorSchemeLight,
|
||||
|
|
@ -99,7 +99,7 @@ fun ColorsSchemePreviewLight() = ColorsSchemePreview(
|
|||
|
||||
@Preview
|
||||
@Composable
|
||||
fun ColorsSchemePreviewDark() = ColorsSchemePreview(
|
||||
internal fun ColorsSchemePreviewDark() = ColorsSchemePreview(
|
||||
Color.White,
|
||||
Color.Black,
|
||||
materialColorSchemeDark,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue