From c3b5ba5639bc88d154da99f3a17c9cadb20cda5c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 12 May 2022 17:44:44 +0200
Subject: [PATCH] Detekt: fix MatchingDeclarationName
---
.../internal/session/room/state/SafePowerLevelContent.kt | 7 +++++--
.../sdk/internal/util/{MathUtils.kt => BestChunkSize.kt} | 0
.../{ExternalIntentAnalyser.kt => ExternalIntentData.kt} | 0
.../app/core/resources/{ResourceUtils.kt => Resource.kt} | 0
.../{CallSessionDependencies.kt => VectorCallService.kt} | 0
5 files changed, 5 insertions(+), 2 deletions(-)
rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/{MathUtils.kt => BestChunkSize.kt} (100%)
rename vector/src/main/java/im/vector/app/core/intent/{ExternalIntentAnalyser.kt => ExternalIntentData.kt} (100%)
rename vector/src/main/java/im/vector/app/core/resources/{ResourceUtils.kt => Resource.kt} (100%)
rename vector/src/main/java/im/vector/app/features/call/{CallSessionDependencies.kt => VectorCallService.kt} (100%)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
index 1f2ec09367..683dd30b80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
@@ -23,8 +23,11 @@ import org.matrix.android.sdk.api.session.events.model.toModel
import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
import org.matrix.android.sdk.api.util.JsonDict
+/**
+ * Serializable object
+ */
@JsonClass(generateAdapter = true)
-internal data class SerializablePowerLevelsContent(
+internal data class SafePowerLevelContent(
@Json(name = "ban") val ban: Int?,
@Json(name = "kick") val kick: Int?,
@Json(name = "invite") val invite: Int?,
@@ -41,7 +44,7 @@ internal data class SerializablePowerLevelsContent(
internal fun JsonDict.toSafePowerLevelsContentDict(): JsonDict {
return toModel<PowerLevelsContent>()
?.let { content ->
- SerializablePowerLevelsContent(
+ SafePowerLevelContent(
ban = content.ban,
kick = content.kick,
invite = content.invite,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BestChunkSize.kt
similarity index 100%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BestChunkSize.kt
diff --git a/vector/src/main/java/im/vector/app/core/intent/ExternalIntentAnalyser.kt b/vector/src/main/java/im/vector/app/core/intent/ExternalIntentData.kt
similarity index 100%
rename from vector/src/main/java/im/vector/app/core/intent/ExternalIntentAnalyser.kt
rename to vector/src/main/java/im/vector/app/core/intent/ExternalIntentData.kt
diff --git a/vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt b/vector/src/main/java/im/vector/app/core/resources/Resource.kt
similarity index 100%
rename from vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt
rename to vector/src/main/java/im/vector/app/core/resources/Resource.kt
diff --git a/vector/src/main/java/im/vector/app/features/call/CallSessionDependencies.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallService.kt
similarity index 100%
rename from vector/src/main/java/im/vector/app/features/call/CallSessionDependencies.kt
rename to vector/src/main/java/im/vector/app/features/call/VectorCallService.kt