crypto: Configure decryption trustRequirement based on config flag

element-hq · Oct 7, 2024 · a3ff9ac · a3ff9ac
1 parent e6f4dd3
commit a3ff9ac
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: CollectStrategy.identityBasedStrategy)
+ .roomDecryptionTrustRequirement(trustRequirement: TrustRequirement.crossSignedOrLegacy)
  } else {
- builder = builder.roomKeyRecipientStrategy(strategy: .deviceBasedStrategy(onlyAllowTrustedDevices: false, errorOnVerifiedUserProblem: true))
+ builder = builder
+ .roomKeyRecipientStrategy(strategy: .deviceBasedStrategy(onlyAllowTrustedDevices: false, errorOnVerifiedUserProblem: true))
+ .roomDecryptionTrustRequirement(trustRequirement: 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: {