From fb2613c28b5191758f96a3ba90b3cd4a388ec6df Mon Sep 17 00:00:00 2001
From: Bruno Muniz Azevedo Filho <bruno@elixxir.io>
Date: Tue, 29 Nov 2022 21:14:17 -0300
Subject: [PATCH] fix account deleting
---
.../Resources/en.lproj/Localizable.strings | 4 ++++
Sources/AppResources/Strings.swift | 6 ++++++
.../ViewModels/SettingsDeleteViewModel.swift | 19 +++++--------------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Sources/AppResources/Resources/en.lproj/Localizable.strings b/Sources/AppResources/Resources/en.lproj/Localizable.strings
index 3dfbb4a6..4bf92d9d 100644
--- a/Sources/AppResources/Resources/en.lproj/Localizable.strings
+++ b/Sources/AppResources/Resources/en.lproj/Localizable.strings
@@ -710,6 +710,10 @@
= "Deleting Your Account";
"settings.delete.info.subtitle"
= "On deletion, all keys for your account are purged from your phone. This action will not notify your contacts. Your keys and any registered emails or phone numbers are removed from the user discovery system.";
+"settings.delete.success.title"
+= "Account deleted";
+"settings.delete.success.subtitle"
+= "Now, kill the app and re-open.";
"settings.infoDrawer.notifications.title"
= "Notifications";
diff --git a/Sources/AppResources/Strings.swift b/Sources/AppResources/Strings.swift
index 4ced950d..09255828 100644
--- a/Sources/AppResources/Strings.swift
+++ b/Sources/AppResources/Strings.swift
@@ -1172,6 +1172,12 @@ public enum Localized {
/// Deleting Your Account
public static let title = Localized.tr("Localizable", "settings.delete.info.title")
}
+ public enum Success {
+ /// Now, kill the app and re-open.
+ public static let subtitle = Localized.tr("Localizable", "settings.delete.success.subtitle")
+ /// Account deleted
+ public static let title = Localized.tr("Localizable", "settings.delete.success.title")
+ }
}
public enum Drawer {
/// %@ will be opened using your default browser
diff --git a/Sources/SettingsFeature/ViewModels/SettingsDeleteViewModel.swift b/Sources/SettingsFeature/ViewModels/SettingsDeleteViewModel.swift
index 87dadb95..1eeb1c33 100644
--- a/Sources/SettingsFeature/ViewModels/SettingsDeleteViewModel.swift
+++ b/Sources/SettingsFeature/ViewModels/SettingsDeleteViewModel.swift
@@ -3,6 +3,7 @@ import Defaults
import Keychain
import Foundation
import Dependencies
+import AppResources
import XXMessengerClient
final class SettingsDeleteViewModel {
@@ -25,15 +26,14 @@ final class SettingsDeleteViewModel {
try messenger.destroy()
try keychain.destroy()
try dbManager.removeDB()
- try deleteDatabase()
-
+
UserDefaults.resetStandardUserDefaults()
UserDefaults.standard.removePersistentDomain(forName: Bundle.main.bundleIdentifier!)
UserDefaults.standard.synchronize()
-
+
hudManager.show(.init(
- title: "Account deleted",
- content: "Now kill the app and re-open"
+ title: Localized.Settings.Delete.Success.title,
+ content: Localized.Settings.Delete.Success.subtitle
))
} catch {
DispatchQueue.main.async { [weak self] in
@@ -48,13 +48,4 @@ final class SettingsDeleteViewModel {
username: .init(type: .username, value: username!)
)
}
-
- private func deleteDatabase() throws {
- let dbPath = FileManager.default
- .containerURL(forSecurityApplicationGroupIdentifier: "group.elixxir.messenger")!
- .appendingPathComponent("xxm_database")
- .appendingPathExtension("sqlite").path
-
- try FileManager.default.removeItem(atPath: dbPath)
- }
}
--
GitLab