remove advanced settings from SettingsViewController

deltachat-ios/Controller/Settings/SettingsViewController.swift

@@ -2,7 +2,7 @@ import UIKit
 import DcCore
 import Intents
 
-internal final class SettingsViewController: UITableViewController, ProgressAlertHandler {
+internal final class SettingsViewController: UITableViewController {
 
     private struct SectionConfigs {
         let headerTitle: String?
@@ -16,15 +16,11 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         case blockedContacts
         case notifications
         case receiptConfirmation
-        case autocryptPreferences
-        case sendAutocryptMessage
-        case exportBackup
         case advanced
         case help
         case autodel
         case mediaQuality
         case downloadOnDemand
-        case videoChat
         case connectivity
         case selectBackground
     }
@@ -32,16 +28,8 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
     private var dcContext: DcContext
     internal let dcAccounts: DcAccounts
 
-    private let externalPathDescr = "File Sharing/Delta Chat"
-
-    let documentInteractionController = UIDocumentInteractionController()
-
     private var connectivityChangedObserver: NSObjectProtocol?
 
-    // MARK: - ProgressAlertHandler
-    weak var progressAlert: UIAlertController?
-    var progressObserver: NSObjectProtocol?
-
     // MARK: - cells
     private lazy var profileCell: ContactCell = {
         let cell = ContactCell(style: .default, reuseIdentifier: nil)
@@ -106,14 +94,6 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         return cell
     }()
 
-    private lazy var videoChatInstanceCell: UITableViewCell = {
-        let cell = UITableViewCell(style: .value1, reuseIdentifier: nil)
-        cell.tag = CellTags.videoChat.rawValue
-        cell.textLabel?.text = String.localized("videochat_instance")
-        cell.accessoryType = .disclosureIndicator
-        return cell
-    }()
-
     private lazy var notificationSwitch: UISwitch = {
         let switchControl = UISwitch()
         switchControl.isOn = !UserDefaults.standard.bool(forKey: "notifications_disabled")
@@ -146,40 +126,11 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         return cell
     }()
 
-    private lazy var autocryptSwitch: UISwitch = {
-        let switchControl = UISwitch()
-        switchControl.isOn = dcContext.e2eeEnabled
-        switchControl.addTarget(self, action: #selector(handleAutocryptPreferencesToggle(_:)), for: .valueChanged)
-        return switchControl
-    }()
-
-    private lazy var autocryptPreferencesCell: UITableViewCell = {
-        let cell = UITableViewCell(style: .default, reuseIdentifier: nil)
-        cell.tag = CellTags.autocryptPreferences.rawValue
-        cell.textLabel?.text = String.localized("autocrypt_prefer_e2ee")
-        cell.accessoryView = autocryptSwitch
-        cell.selectionStyle = .none
-        return cell
-    }()
-
-    private lazy var sendAutocryptMessageCell: ActionCell = {
-        let cell = ActionCell()
-        cell.tag = CellTags.sendAutocryptMessage.rawValue
-        cell.actionTitle = String.localized("autocrypt_send_asm_title")
-        return cell
-    }()
-
-    private lazy var exportBackupCell: ActionCell = {
-        let cell = ActionCell()
-        cell.tag = CellTags.exportBackup.rawValue
-        cell.actionTitle = String.localized("export_backup_desktop")
-        return cell
-    }()
-
-    private lazy var advancedCell: ActionCell = {
-        let cell = ActionCell()
+    private lazy var advancedCell: UITableViewCell = {
+        let cell = UITableViewCell(style: .value1, reuseIdentifier: nil)
         cell.tag = CellTags.advanced.rawValue
-        cell.actionTitle = String.localized("menu_advanced")
+        cell.textLabel?.text = String.localized("menu_advanced")
+        cell.accessoryType = .disclosureIndicator
         return cell
     }()
 
@@ -220,29 +171,20 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
             headerTitle: String.localized("pref_chats_and_media"),
             footerTitle: String.localized("pref_read_receipts_explain"),
             cells: [showEmailsCell, blockedContactsCell, mediaQualityCell, downloadOnDemandCell,
-                    autodelCell, videoChatInstanceCell, notificationCell, receiptConfirmationCell]
+                    autodelCell, notificationCell, receiptConfirmationCell]
         )
         let appearanceSection = SectionConfigs(
             headerTitle: String.localized("pref_appearance"),
             footerTitle: nil,
             cells: [selectBackgroundCell]
         )
-        let autocryptSection = SectionConfigs(
-            headerTitle: String.localized("autocrypt"),
-            footerTitle: String.localized("autocrypt_explain"),
-            cells: [autocryptPreferencesCell, sendAutocryptMessageCell]
-        )
-        let backupSection = SectionConfigs(
-            headerTitle: nil,
-            footerTitle: String.localized("pref_backup_explain"),
-            cells: [advancedCell, exportBackupCell])
         let helpSection = SectionConfigs(
             headerTitle: nil,
             footerTitle: appNameAndVersion,
-            cells: [connectivityCell, helpCell]
+            cells: [connectivityCell, advancedCell, helpCell]
         )
 
-        return [profileSection, preferencesSection, appearanceSection, autocryptSection, backupSection, helpSection]
+        return [profileSection, preferencesSection, appearanceSection, helpSection]
     }()
 
     init(dcAccounts: DcAccounts) {
@@ -259,7 +201,6 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
     override func viewDidLoad() {
         super.viewDidLoad()
         title = String.localized("menu_settings")
-        documentInteractionController.delegate = self as? UIDocumentInteractionControllerDelegate
         tableView.rowHeight = UITableView.automaticDimension
     }
 
@@ -279,32 +220,9 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         updateCells()
     }
 
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        addProgressAlertListener(dcAccounts: dcAccounts, progressName: dcNotificationImexProgress) { [weak self] in
-            guard let self = self else { return }
-
-            self.progressAlert?.dismiss(animated: true) {
-                let alert = UIAlertController(
-                    title: String.localized("backup_successful"),
-                    message: String.localizedStringWithFormat(String.localized("backup_successful_explain_ios"), "\(String.localized("Files")) ➔ Delta Chat"),
-                    preferredStyle: .alert)
-                alert.addAction(UIAlertAction(title: String.localized("ok"), style: .default, handler: { _ in
-                    if let appDelegate = UIApplication.shared.delegate as? AppDelegate {
-                        appDelegate.reloadDcContext()
-                    }
-                }))
-                self.present(alert, animated: true, completion: nil)
-            }
-        }
-    }
-
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
         let nc = NotificationCenter.default
-        if let backupProgressObserver = self.progressObserver {
-            nc.removeObserver(backupProgressObserver)
-        }
         if let connectivityChangedObserver = self.connectivityChangedObserver {
             NotificationCenter.default.removeObserver(connectivityChangedObserver)
         }
@@ -347,13 +265,9 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         case .autodel: showAutodelOptions()
         case .mediaQuality: showMediaQuality()
         case .downloadOnDemand: showDownloadOnDemand()
-        case .videoChat: showVideoChatInstance()
         case .notifications: break
         case .receiptConfirmation: break
-        case .autocryptPreferences: break
-        case .sendAutocryptMessage: sendAutocryptSetupMessage()
-        case .exportBackup: createBackup()
-        case .advanced: showAdvancedDialog()
+        case .advanced: showAdvanced()
         case .help: showHelp()
         case .connectivity: showConnectivity()
         case .selectBackground: selectBackground()
@@ -370,16 +284,6 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
 
     // MARK: - actions
 
-    private func createBackup() {
-        let alert = UIAlertController(title: String.localized("pref_backup_export_explain"), message: nil, preferredStyle: .safeActionSheet)
-        alert.addAction(UIAlertAction(title: String.localized("pref_backup_export_start_button"), style: .default, handler: { _ in
-            self.dismiss(animated: true, completion: nil)
-            self.startImex(what: DC_IMEX_EXPORT_BACKUP)
-        }))
-        alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
-        present(alert, animated: true, completion: nil)
-    }
-
     @objc private func handleNotificationToggle(_ sender: UISwitch) {
         UserDefaults.standard.set(!sender.isOn, forKey: "notifications_disabled")
         if sender.isOn {
@@ -397,136 +301,6 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         dcContext.mdnsEnabled = sender.isOn
     }
 
-    @objc private func handleAutocryptPreferencesToggle(_ sender: UISwitch) {
-        dcContext.e2eeEnabled = sender.isOn
-    }
-
-    private func sendAutocryptSetupMessage() {
-        let askAlert = UIAlertController(title: String.localized("autocrypt_send_asm_explain_before"), message: nil, preferredStyle: .safeActionSheet)
-        askAlert.addAction(UIAlertAction(title: String.localized("autocrypt_send_asm_title"), style: .default, handler: { _ in
-                let sc = self.dcContext.initiateKeyTransfer()
-                guard var sc = sc else {
-                    return
-                }
-                if sc.count == 44 {
-                    // format setup code to the typical 3 x 3 numbers
-                    sc = sc.substring(0, 4) + "  -  " + sc.substring(5, 9) + "  -  " + sc.substring(10, 14) + "  -\n\n" +
-                        sc.substring(15, 19) + "  -  " + sc.substring(20, 24) + "  -  " + sc.substring(25, 29) + "  -\n\n" +
-                        sc.substring(30, 34) + "  -  " + sc.substring(35, 39) + "  -  " + sc.substring(40, 44)
-                }
-
-                let text = String.localizedStringWithFormat(String.localized("autocrypt_send_asm_explain_after"), sc)
-                let showAlert = UIAlertController(title: text, message: nil, preferredStyle: .alert)
-                showAlert.addAction(UIAlertAction(title: String.localized("ok"), style: .default, handler: nil))
-                self.present(showAlert, animated: true, completion: nil)
-        }))
-        askAlert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
-        present(askAlert, animated: true, completion: nil)
-    }
-
-    private func showLogViewController() {
-        let controller = LogViewController(dcContext: dcContext)
-        navigationController?.pushViewController(controller, animated: true)
-    }
-
-    private func showExperimentalDialog() {
-        let alert = UIAlertController(title: String.localized("pref_experimental_features"), message: nil, preferredStyle: .safeActionSheet)
-
-        let broadcastLists = UserDefaults.standard.bool(forKey: "broadcast_lists")
-        alert.addAction(UIAlertAction(title: (broadcastLists ? "✔︎ " : "") + String.localized("broadcast_lists"),
-                                      style: .default, handler: { [weak self] _ in
-            guard let self = self else { return }
-            UserDefaults.standard.set(!broadcastLists, forKey: "broadcast_lists")
-            if !broadcastLists {
-                let alert = UIAlertController(title: "Thanks for trying out the experimental feature 🧪 \"Broadcast Lists\"!",
-                                              message: "You can now create new \"Broadcast Lists\" from the \"New Chat\" dialog\n\n"
-                                                + "In case you are using more than one device, broadcast lists are currently not synced between them\n\n"
-                                                + "If you want to quit the experimental feature, you can disable it at \"Settings / Advanced\".",
-                                              preferredStyle: .alert)
-                alert.addAction(UIAlertAction(title: String.localized("ok"), style: .default, handler: nil))
-                self.navigationController?.present(alert, animated: true, completion: nil)
-            }
-        }))
-
-        let locationStreaming = UserDefaults.standard.bool(forKey: "location_streaming")
-        let title = (locationStreaming ? "✔︎ " : "") + String.localized("pref_on_demand_location_streaming")
-        alert.addAction(UIAlertAction(title: title, style: .default, handler: { [weak self] _ in
-            guard let self = self else { return }
-            UserDefaults.standard.set(!locationStreaming, forKey: "location_streaming")
-            if !locationStreaming {
-                let alert = UIAlertController(title: "Thanks for trying out the experimental feature 🧪 \"Location streaming\"",
-                                              message: "You will find a corresponding option in the attach menu (the paper clip) of each chat now.\n\n"
-                                                + "If you want to quit the experimental feature, you can disable it at \"Settings / Advanced\".",
-                                              preferredStyle: .alert)
-                alert.addAction(UIAlertAction(title: String.localized("ok"), style: .default, handler: nil))
-                self.navigationController?.present(alert, animated: true, completion: nil)
-            } else if self.dcContext.isSendingLocationsToChat(chatId: 0) {
-                guard let appDelegate = UIApplication.shared.delegate as? AppDelegate else {
-                    return
-                }
-                appDelegate.locationManager.disableLocationStreamingInAllChats()
-            }
-        }))
-
-        alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
-        present(alert, animated: true, completion: nil)
-    }
-
-    private func showAdvancedDialog() {
-        let alert = UIAlertController(title: String.localized("menu_advanced"), message: nil, preferredStyle: .safeActionSheet)
-
-        alert.addAction(UIAlertAction(title: String.localized("pref_managekeys_export_secret_keys"), style: .default, handler: { _ in
-            let msg = String.localizedStringWithFormat(String.localized("pref_managekeys_export_explain"), self.externalPathDescr)
-            let alert = UIAlertController(title: nil, message: msg, preferredStyle: .alert)
-            alert.addAction(UIAlertAction(title: String.localized("ok"), style: .default, handler: { _ in
-                self.startImex(what: DC_IMEX_EXPORT_SELF_KEYS)
-            }))
-            alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
-            self.present(alert, animated: true, completion: nil)
-        }))
-
-        alert.addAction(UIAlertAction(title: String.localized("pref_managekeys_import_secret_keys"), style: .default, handler: { _ in
-            let msg = String.localizedStringWithFormat(String.localized("pref_managekeys_import_explain"), self.externalPathDescr)
-            let alert = UIAlertController(title: nil, message: msg, preferredStyle: .alert)
-            alert.addAction(UIAlertAction(title: String.localized("ok"), style: .default, handler: { _ in
-                self.startImex(what: DC_IMEX_IMPORT_SELF_KEYS)
-            }))
-            alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
-            self.present(alert, animated: true, completion: nil)
-        }))
-
-        alert.addAction(UIAlertAction(title: String.localized("pref_experimental_features"), style: .default, handler: { [weak self] _ in
-            self?.showExperimentalDialog()
-        }))
-
-        let logAction = UIAlertAction(title: String.localized("pref_view_log"), style: .default, handler: { [weak self] _ in
-            guard let self = self else { return }
-            self.showLogViewController()
-        })
-        alert.addAction(logAction)
-        alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
-        present(alert, animated: true, completion: nil)
-    }
-
-    private func presentError(message: String) {
-        let error = UIAlertController(title: nil, message: message, preferredStyle: .alert)
-        error.addAction(UIAlertAction(title: String.localized("ok"), style: .cancel))
-        present(error, animated: true)
-    }
-
-    private func startImex(what: Int32, passphrase: String? = nil) {
-        let documents = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)
-        if !documents.isEmpty {
-            showProgressAlert(title: String.localized("imex_progress_title_desktop"), dcContext: dcContext)
-            DispatchQueue.main.async {
-                self.dcAccounts.stopIo()
-                self.dcContext.imex(what: what, directory: documents[0], passphrase: passphrase)
-            }
-        } else {
-            logger.error("document directory not found")
-        }
-    }
-
     // MARK: - updates
     private func updateCells() {
         profileCell.updateCell(cellViewModel: ProfileViewModel(context: dcContext))
@@ -534,7 +308,6 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         mediaQualityCell.detailTextLabel?.text = MediaQualityViewController.getValString(val: dcContext.getConfigInt("media_quality"))
         downloadOnDemandCell.detailTextLabel?.text = DownloadOnDemandViewController.getValString(
             val: dcContext.getConfigInt("download_limit"))
-        videoChatInstanceCell.detailTextLabel?.text = VideoChatInstanceViewController.getValString(val: dcContext.getConfig("webrtc_instance") ?? "")
         autodelCell.detailTextLabel?.text = autodelSummary()
         connectivityCell.detailTextLabel?.text = DcUtils.getConnectivityString(dcContext: dcContext,
                                                                                connectedString: String.localized("connectivity_connected"))
@@ -561,11 +334,6 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         navigationController?.pushViewController(downloadOnDemandViewController, animated: true)
     }
 
-    private func showVideoChatInstance() {
-        let videoInstanceController = VideoChatInstanceViewController(dcContext: dcContext)
-        navigationController?.pushViewController(videoInstanceController, animated: true)
-    }
-
     private func showBlockedContacts() {
         let blockedContactsController = BlockedContactsViewController(dcContext: dcContext)
         navigationController?.pushViewController(blockedContactsController, animated: true)
@@ -576,6 +344,10 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         navigationController?.pushViewController(settingsAutodelOverviewController, animated: true)
     }
 
+    private func showAdvanced() {
+        navigationController?.pushViewController(AdvancedViewController(dcAccounts: dcAccounts), animated: true)
+    }
+
     private func showHelp() {
         navigationController?.pushViewController(HelpViewController(dcContext: dcContext), animated: true)
     }