Merge pull request #2618 from element-hq/feature/bma/fixRoomAnalytics

Fix analytics

changelog.d/2612.bugfix

@@ -0,0 +1 @@
+Fix analytics issue around room considered as space by mistake.

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt

@@ -55,6 +55,7 @@ interface MatrixRoom : Closeable {
     val topic: String?
     val avatarUrl: String?
     val isEncrypted: Boolean
+    val isSpace: Boolean
     val isDirect: Boolean
     val isPublic: Boolean
     val activeMemberCount: Long

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

@@ -213,6 +213,9 @@ class RustMatrixRoom(
     override val isPublic: Boolean
         get() = innerRoom.isPublic()
 
+    override val isSpace: Boolean
+        get() = innerRoom.isSpace()
+
     override val isDirect: Boolean
         get() = innerRoom.isDirect()
 

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt

@@ -77,6 +77,7 @@ class FakeMatrixRoom(
     override val alias: String? = null,
     override val alternativeAliases: List<String> = emptyList(),
     override val isPublic: Boolean = true,
+    override val isSpace: Boolean = false,
     override val isDirect: Boolean = false,
     override val isOneToOne: Boolean = false,
     override val joinedMemberCount: Long = 123L,

services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/extensions/JoinedRoomExt.kt

@@ -17,8 +17,6 @@
 package io.element.android.services.analytics.api.extensions
 
 import im.vector.app.features.analytics.plan.JoinedRoom
-import io.element.android.libraries.core.bool.orFalse
-import io.element.android.libraries.matrix.api.core.MatrixPatterns
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 
 fun Long?.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
@@ -34,9 +32,9 @@ fun Long?.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
 
 fun MatrixRoom.toAnalyticsJoinedRoom(trigger: JoinedRoom.Trigger?): JoinedRoom {
     return JoinedRoom(
-        isDM = this.isDirect.orFalse(),
+        isDM = isDirect,
-        isSpace = MatrixPatterns.isSpaceId(this.roomId.value),
+        isSpace = isSpace,
-        roomSize = this.joinedMemberCount.toAnalyticsRoomSize(),
+        roomSize = joinedMemberCount.toAnalyticsRoomSize(),
         trigger = trigger
     )
 }

services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/extensions/ViewRoomExt.kt

@@ -17,16 +17,14 @@
 package io.element.android.services.analytics.api.extensions
 
 import im.vector.app.features.analytics.plan.ViewRoom
-import io.element.android.libraries.core.bool.orFalse
-import io.element.android.libraries.matrix.api.core.MatrixPatterns
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 
 fun MatrixRoom.toAnalyticsViewRoom(trigger: ViewRoom.Trigger? = null, selectedSpace: MatrixRoom? = null, viaKeyboard: Boolean? = null): ViewRoom {
     val activeSpace = selectedSpace?.toActiveSpace() ?: ViewRoom.ActiveSpace.Home
 
     return ViewRoom(
-        isDM = this.isDirect.orFalse(),
+        isDM = isDirect,
-        isSpace = MatrixPatterns.isSpaceId(this.roomId.value),
+        isSpace = isSpace,
         trigger = trigger,
         activeSpace = activeSpace,
         viaKeyboard = viaKeyboard