Some clean up

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

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 ->

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()
         }
     }

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}"
+}