Merge pull request #8541 from abaker/fix_fallback_key_sharing_strategy

Fix fallbackKeySharingStrategy
element-hq · Jun 16, 2023 · 4af2f70 · 4af2f70
2 parents 710d21f + 572bdb6
commit 4af2f70
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
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 @@
		Fix crypto config fallback key sharing strategy