From 03094ec2988386195b321ee61041c05a888d3616 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 19 Nov 2025 09:34:17 +0100
Subject: [PATCH] Fix crash at startup

---
 .../main/kotlin/io/element/android/x/ElementXApplication.kt | 6 +++---
 .../android/x/initializer}/CacheCleanerInitializer.kt       | 3 ++-
 .../features/cachecleaner/impl}/CacheCleanerBindings.kt     | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename {features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api => app/src/main/kotlin/io/element/android/x/initializer}/CacheCleanerInitializer.kt (84%)
 rename features/cachecleaner/{api/src/main/kotlin/io/element/android/features/cachecleaner/api => impl/src/main/kotlin/io/element/android/features/cachecleaner/impl}/CacheCleanerBindings.kt (78%)

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 9586062619..e29ff82d55 100644
--- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
+++ b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
@@ -12,11 +12,11 @@ import android.app.Application
 import androidx.startup.AppInitializer
 import androidx.work.Configuration
 import dev.zacsweers.metro.createGraphFactory
-import io.element.android.features.cachecleaner.api.CacheCleanerInitializer
 import io.element.android.libraries.di.DependencyInjectionGraphOwner
 import io.element.android.libraries.workmanager.api.di.MetroWorkerFactory
 import io.element.android.x.di.AppGraph
 import io.element.android.x.info.logApplicationInfo
+import io.element.android.x.initializer.CacheCleanerInitializer
 import io.element.android.x.initializer.CrashInitializer
 import io.element.android.x.initializer.PlatformInitializer
 
@@ -24,8 +24,8 @@ class ElementXApplication : Application(), DependencyInjectionGraphOwner, Config
     override val graph: AppGraph = createGraphFactory<AppGraph.Factory>().create(this)
 
     override val workManagerConfiguration: Configuration = Configuration.Builder()
-            .setWorkerFactory(MetroWorkerFactory(graph.workerProviders))
-            .build()
+        .setWorkerFactory(MetroWorkerFactory(graph.workerProviders))
+        .build()
 
     override fun onCreate() {
         super.onCreate()
diff --git a/features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/CacheCleanerInitializer.kt
similarity index 84%
rename from features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerInitializer.kt
rename to app/src/main/kotlin/io/element/android/x/initializer/CacheCleanerInitializer.kt
index 2d22ef32e8..3e187bcafa 100644
--- a/features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerInitializer.kt
+++ b/app/src/main/kotlin/io/element/android/x/initializer/CacheCleanerInitializer.kt
@@ -6,10 +6,11 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.cachecleaner.api
+package io.element.android.x.initializer
 
 import android.content.Context
 import androidx.startup.Initializer
+import io.element.android.features.cachecleaner.impl.CacheCleanerBindings
 import io.element.android.libraries.architecture.bindings
 
 class CacheCleanerInitializer : Initializer<Unit> {
diff --git a/features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerBindings.kt b/features/cachecleaner/impl/src/main/kotlin/io/element/android/features/cachecleaner/impl/CacheCleanerBindings.kt
similarity index 78%
rename from features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerBindings.kt
rename to features/cachecleaner/impl/src/main/kotlin/io/element/android/features/cachecleaner/impl/CacheCleanerBindings.kt
index a7f2b58a8b..2137b7b905 100644
--- a/features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerBindings.kt
+++ b/features/cachecleaner/impl/src/main/kotlin/io/element/android/features/cachecleaner/impl/CacheCleanerBindings.kt
@@ -6,10 +6,11 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.cachecleaner.api
+package io.element.android.features.cachecleaner.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesTo
+import io.element.android.features.cachecleaner.api.CacheCleaner
 
 @ContributesTo(AppScope::class)
 interface CacheCleanerBindings {