Erase preferences of removed modules

passepartoutvpn · Dec 10, 2024 · 62707c6 · 62707c6
1 parent da87c16
commit 62707c6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/Library/Sources/AppUIMain/Views/Profile/ProfileCoordinator.swift b/Library/Sources/AppUIMain/Views/Profile/ProfileCoordinator.swift
@@ -43,6 +43,9 @@ struct ProfileCoordinator: View {
     @EnvironmentObject
     private var iapManager: IAPManager
 
+    @EnvironmentObject
+    private var preferencesManager: PreferencesManager
+
     let profileManager: ProfileManager
 
     let profileEditor: ProfileEditor
@@ -133,7 +136,7 @@ private extension ProfileCoordinator {
 
     // standard: always save, warn if purchase required
     func onCommitEditingStandard() async throws {
-        let savedProfile = try await profileEditor.save(to: profileManager)
+        let savedProfile = try await profileEditor.save(to: profileManager, preferencesManager: preferencesManager)
         do {
             try iapManager.verify(savedProfile)
         } catch AppError.ineligibleProfile(let requiredFeatures) {
@@ -151,7 +154,7 @@ private extension ProfileCoordinator {
             paywallReason = .init(requiredFeatures)
             return
         }
-        try await profileEditor.save(to: profileManager)
+        try await profileEditor.save(to: profileManager, preferencesManager: preferencesManager)
         onDismiss()
     }
 

diff --git a/Library/Sources/UILibrary/Business/ProfileEditor.swift b/Library/Sources/UILibrary/Business/ProfileEditor.swift
@@ -204,10 +204,23 @@ extension ProfileEditor {
     }
 
     @discardableResult
-    public func save(to profileManager: ProfileManager) async throws -> Profile {
+    public func save(to profileManager: ProfileManager, preferencesManager: PreferencesManager) async throws -> Profile {
         do {
             let newProfile = try build()
             try await profileManager.save(newProfile, isLocal: true, remotelyShared: isShared)
+
+            removedModules.keys.forEach {
+                do {
+                    pp_log(.App.profiles, .info, "Erase preferences for removed module \($0)")
+                    let repository = try preferencesManager.preferencesRepository(forModuleWithId: $0)
+                    repository.erase()
+                    try repository.save()
+                } catch {
+                    pp_log(.App.profiles, .error, "Unable to erase preferences for removed module \($0): \(error)")
+                }
+            }
+            removedModules.removeAll()
+
             return newProfile
         } catch {
             pp_log(.App.profiles, .fault, "Unable to save edited profile: \(error)")