Enable identity pinning violation notifications unconditionally (#3457)

(Remove the feature flag we added when this feature seemed unstable.)
element-hq · Oct 28, 2024 · 4e812f7 · 4e812f7
1 parent ed8aed6
commit 4e812f7
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 12 deletions.
diff --git a/ElementX/Sources/Application/AppSettings.swift b/ElementX/Sources/Application/AppSettings.swift
@@ -46,7 +46,6 @@ final class AppSettings {
         case publicSearchEnabled
         case fuzzyRoomListSearchEnabled
         case enableOnlySignedDeviceIsolationMode
-        case identityPinningViolationNotificationsEnabled
         case knockingEnabled
         case frequentEmojisEnabled
     }
@@ -284,9 +283,6 @@ final class AppSettings {
 
     @UserPreference(key: UserDefaultsKeys.optimizeMediaUploads, defaultValue: false, storageType: .userDefaults(store))
     var optimizeMediaUploads
-
-    @UserPreference(key: UserDefaultsKeys.identityPinningViolationNotificationsEnabled, defaultValue: isDevelopmentBuild, storageType: .userDefaults(store))
-    var identityPinningViolationNotificationsEnabled
 
     @UserPreference(key: UserDefaultsKeys.knockingEnabled, defaultValue: false, storageType: .userDefaults(store))
     var knockingEnabled

diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
@@ -142,9 +142,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
         }
         .store(in: &cancellables)
 
-        let identityStatusChangesPublisher = roomProxy.identityStatusChangesPublisher
-            .receive(on: DispatchQueue.main)
-            .filter { [weak self] _ in self?.appSettings.identityPinningViolationNotificationsEnabled ?? false }
+        let identityStatusChangesPublisher = roomProxy.identityStatusChangesPublisher.receive(on: DispatchQueue.main)
 
         Task { [weak self] in
             for await changes in identityStatusChangesPublisher.values {

diff --git a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift
@@ -49,7 +49,6 @@ protocol DeveloperOptionsProtocol: AnyObject {
     var optimizeMediaUploads: Bool { get set }
     var enableOnlySignedDeviceIsolationMode: Bool { get set }
     var elementCallBaseURLOverride: URL? { get set }
-    var identityPinningViolationNotificationsEnabled: Bool { get set }
     var knockingEnabled: Bool { get set }
     var frequentEmojisEnabled: Bool { get set }
 }

diff --git a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift
@@ -50,10 +50,6 @@ struct DeveloperOptionsScreen: View {
                     Text("Hide image & video previews")
                 }
 
-                Toggle(isOn: $context.identityPinningViolationNotificationsEnabled) {
-                    Text("Identity pinning violation notifications")
-                }
-
                 Toggle(isOn: $context.frequentEmojisEnabled) {
                     Text("Show frequently used emojis")
                 }