Merge pull request #5951 from element-hq/fix/crash-on-nightly-incorrect-di-cast

Fix crash when changing the push provider in nightlies

app/proguard-rules.pro

@@ -70,3 +70,6 @@
 -keep class uniffi.** { *;}
 -keep class io.element.android.x.di.** { *; }
 -keepclasseswithmembernames,allowoptimization,allowshrinking class io.element.android.** { *; }
+
+# Keep Metro classes
+-keep class dev.zacsweers.metro.** { *; }

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/json/JsonProvider.kt

@@ -17,7 +17,7 @@ import kotlinx.serialization.json.Json
 /**
  * Provides a Json instance configured to ignore unknown keys.
  */
-fun interface JsonProvider : Provider<Json>
+typealias JsonProvider = Provider<Json>
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)

libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverBindings.kt

@@ -9,14 +9,9 @@
 package io.element.android.libraries.pushproviders.unifiedpush
 
 import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.Binds
 import dev.zacsweers.metro.ContributesTo
-import org.unifiedpush.android.connector.MessagingReceiver
 
 @ContributesTo(AppScope::class)
 interface VectorUnifiedPushMessagingReceiverBindings {
     fun inject(receiver: VectorUnifiedPushMessagingReceiver)
-
-    @Binds
-    fun bindsMessagingReceiver(vectorUnifiedPushMessagingReceiver: VectorUnifiedPushMessagingReceiver): MessagingReceiver
 }