crypto: Configure decryption trustRequirement based on config flag (#…

…3358) * crypto: Configure decryption trustRequirement based on config flag * quick review
element-hq · Oct 8, 2024 · cf81072 · cf81072
1 parent c087ece
commit cf81072
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ElementX/Sources/Other/Extensions/ClientBuilder.swift b/ElementX/Sources/Other/Extensions/ClientBuilder.swift
@@ -35,9 +35,13 @@ extension ClientBuilder {
                 .autoEnableBackups(autoEnableBackups: true)
 
             if enableOnlySignedDeviceIsolationMode {
-                builder = builder.roomKeyRecipientStrategy(strategy: CollectStrategy.identityBasedStrategy)
+                builder = builder
+                    .roomKeyRecipientStrategy(strategy: .identityBasedStrategy)
+                    .roomDecryptionTrustRequirement(trustRequirement: .crossSignedOrLegacy)
             } else {
-                builder = builder.roomKeyRecipientStrategy(strategy: .deviceBasedStrategy(onlyAllowTrustedDevices: false, errorOnVerifiedUserProblem: true))
+                builder = builder
+                    .roomKeyRecipientStrategy(strategy: .deviceBasedStrategy(onlyAllowTrustedDevices: false, errorOnVerifiedUserProblem: true))
+                    .roomDecryptionTrustRequirement(trustRequirement: .untrusted)
             }
         }
 

diff --git a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift
@@ -53,7 +53,7 @@ struct DeveloperOptionsScreen: View {
 
             Section {
                 Toggle(isOn: $context.enableOnlySignedDeviceIsolationMode) {
-                    Text("Exclude not secure devices when sending/receiving messages")
+                    Text("Exclude insecure devices when sending/receiving messages")
                     Text("Requires app reboot")
                 }
             } header: {