Merge pull request #8541 from abaker/fix_fallback_key_sharing_strategy

bmarty · web-flow · commit 4af2f700f7a6 · 2023-06-16T13:05:30.000+02:00
Fix fallbackKeySharingStrategy
diff --git a/changelog.d/8541.bugfix b/changelog.d/8541.bugfix
@@ -0,0 +1 @@
+Fix crypto config fallback key sharing strategy
diff --git a/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt b/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
@@ -77,8 +77,8 @@ object ConfigurationModule {
     fun providesCryptoConfig() = CryptoConfig(
             fallbackKeySharingStrategy = when (Config.KEY_SHARING_STRATEGY) {
                 KeySharingStrategy.WhenSendingEvent -> OutboundSessionKeySharingStrategy.WhenSendingEvent
-                KeySharingStrategy.WhenEnteringRoom -> OutboundSessionKeySharingStrategy.WhenSendingEvent
-                KeySharingStrategy.WhenTyping -> OutboundSessionKeySharingStrategy.WhenSendingEvent
+                KeySharingStrategy.WhenEnteringRoom -> OutboundSessionKeySharingStrategy.WhenEnteringRoom
+                KeySharingStrategy.WhenTyping -> OutboundSessionKeySharingStrategy.WhenTyping
             }
     )
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix crypto config fallback key sharing strategy`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ object ConfigurationModule {`
`77`	`77`	`fun providesCryptoConfig() = CryptoConfig(`
`78`	`78`	`fallbackKeySharingStrategy = when (Config.KEY_SHARING_STRATEGY) {`
`79`	`79`	`KeySharingStrategy.WhenSendingEvent -> OutboundSessionKeySharingStrategy.WhenSendingEvent`
`80`		`- KeySharingStrategy.WhenEnteringRoom -> OutboundSessionKeySharingStrategy.WhenSendingEvent`
`81`		`- KeySharingStrategy.WhenTyping -> OutboundSessionKeySharingStrategy.WhenSendingEvent`
	`80`	`+ KeySharingStrategy.WhenEnteringRoom -> OutboundSessionKeySharingStrategy.WhenEnteringRoom`
	`81`	`+ KeySharingStrategy.WhenTyping -> OutboundSessionKeySharingStrategy.WhenTyping`
`82`	`82`	`}`
`83`	`83`	`)`
`84`	`84`