From 1ab96e2f34753e7c89280025026e846eff004325 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 25 Apr 2023 11:17:05 +0200
Subject: [PATCH] Some clean up

---
 .../main/kotlin/io/element/android/x/ElementXApplication.kt  | 2 +-
 .../libraries/designsystem/components/avatar/AvatarData.kt   | 1 +
 .../android/libraries/matrix/impl/room/RustMatrixRoom.kt     | 4 ++--
 .../element/android/libraries/matrix/ui/media/MediaKeyer.kt  | 5 ++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
index 2b02bf3700..31dab9ad48 100644
--- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
+++ b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
@@ -19,8 +19,8 @@ package io.element.android.x
 import android.app.Application
 import androidx.startup.AppInitializer
 import io.element.android.x.di.AppComponent
-import io.element.android.x.di.DaggerAppComponent
 import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.x.di.DaggerAppComponent
 import io.element.android.x.info.logApplicationInfo
 import io.element.android.x.initializer.CrashInitializer
 import io.element.android.x.initializer.MatrixInitializer
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt
index e46751f15f..2d1e0558f4 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt
@@ -31,6 +31,7 @@ data class AvatarData(
     val size: AvatarSize = AvatarSize.MEDIUM
 ) : Parcelable {
 
+    @IgnoredOnParcel
     val initial by lazy {
         (name?.takeIf { it.isNotBlank() } ?: id)
             .let { dn ->
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
index 11558e86b6..4efe35f6b5 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
@@ -184,13 +184,13 @@ class RustMatrixRoom(
     }
 
     override suspend fun acceptInvitation(): Result<Unit> = withContext(coroutineDispatchers.io) {
-        kotlin.runCatching {
+        runCatching {
             innerRoom.acceptInvitation()
         }
     }
 
     override suspend fun rejectInvitation(): Result<Unit> = withContext(coroutineDispatchers.io) {
-        kotlin.runCatching {
+        runCatching {
             innerRoom.rejectInvitation()
         }
     }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt
index 2d4ab683b1..6a1a5e8bfb 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt
@@ -33,4 +33,7 @@ internal class MediaKeyer : Keyer<MediaResolver.Meta> {
     }
 }
 
-private fun MediaResolver.Meta.toKey() = "${url}_${kind}"
+private fun MediaResolver.Meta.toKey(): String? {
+    if (url.isNullOrBlank()) return null
+    return "${url}_${kind}"
+}