Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fix crash when changing the push provider in nightlies
This commit is contained in:
ganfra 2025-12-23 10:24:29 +01:00 • committed by GitHub
commit 5303e81fa3
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/proguard-rules.pro vendored
View file

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

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

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

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

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