rename DcAccounts.get() to DcAccounts.getSelected()

DcCore/DcCore/DC/Wrapper.swift

@@ -36,7 +36,7 @@ public class DcAccounts {
         return DcUtils.copyAndFreeArray(inputArray: cAccounts)
     }
 
-    public func get() -> DcContext {
+    public func getSelected() -> DcContext {
         let cPtr = dc_accounts_get_selected_account(accountsPointer)
         return DcContext(contextPointer: cPtr)
     }
@@ -47,7 +47,7 @@ public class DcAccounts {
     }
 
     public func maybeStartIo() {
-        if get().isConfigured() {
+        if getSelected().isConfigured() {
             dc_accounts_start_io(accountsPointer)
         }
     }

DcCore/DcCore/DC/events.swift

@@ -86,7 +86,7 @@ public class DcEventHandler {
             dcContext.logger?.warning("network: \(event.data2String)")
 
         case DC_EVENT_MSGS_CHANGED, DC_EVENT_MSG_READ, DC_EVENT_MSG_DELIVERED, DC_EVENT_MSG_FAILED:
-            if dcContext.id != dcAccounts.get().id {
+            if dcContext.id != dcAccounts.getSelected().id {
                 return
             }
             dcContext.logger?.info("change: \(id)")
@@ -106,7 +106,7 @@ public class DcEventHandler {
             }
 
         case DC_EVENT_MSGS_NOTICED:
-            if dcContext.id != dcAccounts.get().id {
+            if dcContext.id != dcAccounts.getSelected().id {
                 return
             }
             let nc = NotificationCenter.default
@@ -121,7 +121,7 @@ public class DcEventHandler {
             }
 
         case DC_EVENT_CHAT_MODIFIED:
-            if dcContext.id != dcAccounts.get().id {
+            if dcContext.id != dcAccounts.getSelected().id {
                 return
             }
             dcContext.logger?.info("chat modified: \(id)")
@@ -136,7 +136,7 @@ public class DcEventHandler {
                 )
             }
         case DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED:
-            if dcContext.id != dcAccounts.get().id {
+            if dcContext.id != dcAccounts.getSelected().id {
                 return
             }
             dcContext.logger?.info("chat ephemeral timer modified: \(id)")
@@ -150,7 +150,7 @@ public class DcEventHandler {
             }
 
         case DC_EVENT_INCOMING_MSG:
-            if dcContext.id != dcAccounts.get().id {
+            if dcContext.id != dcAccounts.getSelected().id {
                 return
             }
             let nc = NotificationCenter.default
@@ -173,7 +173,7 @@ public class DcEventHandler {
             dcContext.logger?.info("message delivered: \(data1)-\(data2)")
 
         case DC_EVENT_SECUREJOIN_INVITER_PROGRESS:
-            if dcContext.id != dcAccounts.get().id {
+            if dcContext.id != dcAccounts.getSelected().id {
                 return
             }
             dcContext.logger?.info("securejoin inviter progress \(data1)")
@@ -192,7 +192,7 @@ public class DcEventHandler {
             }
 
         case DC_EVENT_SECUREJOIN_JOINER_PROGRESS:
-            if dcContext.id != dcAccounts.get().id {
+            if dcContext.id != dcAccounts.getSelected().id {
                 return
             }
             dcContext.logger?.info("securejoin joiner progress \(data1)")
@@ -210,7 +210,7 @@ public class DcEventHandler {
                 )
             }
         case DC_EVENT_CONTACTS_CHANGED:
-            if dcContext.id != dcAccounts.get().id {
+            if dcContext.id != dcAccounts.getSelected().id {
                 return
             }
             dcContext.logger?.info("contact changed: \(data1)")

DcShare/Controller/ShareViewController.swift

@@ -34,7 +34,7 @@ class ShareViewController: SLComposeServiceViewController {
     let logger = SimpleLogger()
     let dcAccounts: DcAccounts = DcAccounts()
     lazy var dcContext: DcContext = {
-        return dcAccounts.get()
+        return dcAccounts.getSelected()
     }()
 
     var selectedChatId: Int?
@@ -95,7 +95,7 @@ class ShareViewController: SLComposeServiceViewController {
             }
             DispatchQueue.global(qos: .userInitiated).async { [weak self] in
                 guard let self = self else { return }
-                self.shareAttachment = ShareAttachment(dcContext: self.dcAccounts.get(), inputItems: self.extensionContext?.inputItems, delegate: self)
+                self.shareAttachment = ShareAttachment(dcContext: self.dcAccounts.getSelected(), inputItems: self.extensionContext?.inputItems, delegate: self)
             }
             reloadConfigurationItems()
             validateContent()
@@ -132,12 +132,12 @@ class ShareViewController: SLComposeServiceViewController {
                 if messages.count == 1 {
                     messages[0].text?.append(self.contentText)
                 } else {
-                    let message = dcAccounts.get().newMessage(viewType: DC_MSG_TEXT)
+                    let message = dcAccounts.getSelected().newMessage(viewType: DC_MSG_TEXT)
                     message.text = self.contentText
                     messages.insert(message, at: 0)
                 }
             }
-            let chatListController = SendingController(chatId: chatId, dcMsgs: messages, dcContext: dcAccounts.get())
+            let chatListController = SendingController(chatId: chatId, dcMsgs: messages, dcContext: dcAccounts.getSelected())
             chatListController.delegate = self
             self.pushConfigurationViewController(chatListController)
         }
@@ -161,7 +161,7 @@ class ShareViewController: SLComposeServiceViewController {
             item?.value = selectedChat?.name
             logger.debug("configurationItems chat name: \(String(describing: selectedChat?.name))")
             item?.tapHandler = {
-                let chatListController = ChatListController(dcContext: self.dcAccounts.get(), chatListDelegate: self)
+                let chatListController = ChatListController(dcContext: self.dcAccounts.getSelected(), chatListDelegate: self)
                 self.pushConfigurationViewController(chatListController)
             }
         } else {

deltachat-ios/AppDelegate.swift

@@ -61,7 +61,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         if dcAccounts.getAll().isEmpty {
             dcAccounts.addAccount()
         }
-        dcAccounts.get().logger = DcLogger()
+        dcAccounts.getSelected().logger = DcLogger()
         logger.info("➡️ didFinishLaunchingWithOptions")
 
         window = UIWindow(frame: UIScreen.main.bounds)
@@ -107,7 +107,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             increaseDebugCounter("notify-remote-launch")
         }
 
-        if dcAccounts.get().isConfigured() && !UserDefaults.standard.bool(forKey: "notifications_disabled") {
+        if dcAccounts.getSelected().isConfigured() && !UserDefaults.standard.bool(forKey: "notifications_disabled") {
             registerForNotifications()
         }
 
@@ -473,7 +473,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     func reloadDcContext() {
         locationManager.reloadDcContext()
         notificationManager.reloadDcContext()
-        if dcAccounts.get().isConfigured() {
+        if dcAccounts.getSelected().isConfigured() {
             appCoordinator.presentTabBarController()
         } else {
             appCoordinator.presentWelcomeController()
@@ -489,7 +489,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     }
 
     func deleteCurrentAccount() {
-        _ = dcAccounts.removeAccount(id: dcAccounts.get().id)
+        _ = dcAccounts.removeAccount(id: dcAccounts.getSelected().id)
     }
 
     func installEventHandler() {
@@ -523,7 +523,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     }
 
     private func setStockTranslations() {
-        let dcContext = dcAccounts.get()
+        let dcContext = dcAccounts.getSelected()
         dcContext.setStockTranslation(id: DC_STR_NOMESSAGES, localizationKey: "chat_no_messages")
         dcContext.setStockTranslation(id: DC_STR_SELF, localizationKey: "self")
         dcContext.setStockTranslation(id: DC_STR_DRAFT, localizationKey: "draft")

deltachat-ios/Controller/AccountSetupController.swift

@@ -339,7 +339,7 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler {
     init(dcAccounts: DcAccounts, editView: Bool) {
         self.editView = editView
         self.dcAccounts = dcAccounts
-        self.dcContext = dcAccounts.get()
+        self.dcContext = dcAccounts.getSelected()
 
         self.sections.append(basicSection)
         self.sections.append(advancedSection)
@@ -778,7 +778,7 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler {
             guard let self = self else { return }
             appDelegate.locationManager.disableLocationStreamingInAllChats()
             self.dcAccounts.stopIo()
-            self.dcAccounts.removeAccount(id: self.dcAccounts.get().id)
+            self.dcAccounts.removeAccount(id: self.dcAccounts.getSelected().id)
             if let firstAccountId = self.dcAccounts.getAll().first {
                 _ = self.dcAccounts.selectAccount(id: firstAccountId)
             } else {

deltachat-ios/Controller/EditSettingsController.swift

@@ -54,7 +54,7 @@ class EditSettingsController: UITableViewController, MediaPickerDelegate {
 
     init(dcAccounts: DcAccounts) {
         self.dcAccounts = dcAccounts
-        self.dcContext = dcAccounts.get()
+        self.dcContext = dcAccounts.getSelected()
         super.init(style: .grouped)
         hidesBottomBarWhenPushed = true
     }

deltachat-ios/Controller/SettingsController.swift

@@ -208,7 +208,7 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
     }()
 
     init(dcAccounts: DcAccounts) {
-        self.dcContext = dcAccounts.get()
+        self.dcContext = dcAccounts.getSelected()
         self.dcAccounts = dcAccounts
         super.init(style: .grouped)
     }

deltachat-ios/Controller/WelcomeViewController.swift

@@ -43,7 +43,7 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
 
     init(dcAccounts: DcAccounts) {
         self.dcAccounts = dcAccounts
-        self.dcContext = dcAccounts.get()
+        self.dcContext = dcAccounts.getSelected()
         super.init(nibName: nil, bundle: nil)
         self.navigationItem.title = String.localized("welcome_desktop")
         onProgressSuccess = { [weak self] in

deltachat-ios/Coordinator/AppCoordinator.swift

@@ -37,7 +37,7 @@ class AppCoordinator {
     }
 
     private func createQrNavigationController() -> UINavigationController {
-        let root = QrPageController(dcContext: dcAccounts.get())
+        let root = QrPageController(dcContext: dcAccounts.getSelected())
         let nav = UINavigationController(rootViewController: root)
         let settingsImage = UIImage(named: "qr_code")
         nav.tabBarItem = UITabBarItem(title: String.localized("qr_code"), image: settingsImage, tag: qrTab)
@@ -45,8 +45,8 @@ class AppCoordinator {
     }
 
     private func createChatsNavigationController() -> UINavigationController {
-        let viewModel = ChatListViewModel(dcContext: dcAccounts.get(), isArchive: false)
-        let root = ChatListController(dcContext: dcAccounts.get(), viewModel: viewModel)
+        let viewModel = ChatListViewModel(dcContext: dcAccounts.getSelected(), isArchive: false)
+        let root = ChatListController(dcContext: dcAccounts.getSelected(), viewModel: viewModel)
         let nav = UINavigationController(rootViewController: root)
         let settingsImage = UIImage(named: "ic_chat")
         nav.tabBarItem = UITabBarItem(title: String.localized("pref_chats"), image: settingsImage, tag: chatsTab)
@@ -65,7 +65,7 @@ class AppCoordinator {
     init(window: UIWindow, dcAccounts: DcAccounts) {
         self.window = window
         self.dcAccounts = dcAccounts
-        let dcContext = dcAccounts.get()
+        let dcContext = dcAccounts.getSelected()
         initializeRootController()
 
         let lastActiveTab = appStateRestorer.restoreLastActiveTab()
@@ -107,7 +107,7 @@ class AppCoordinator {
     }
 
     func initializeRootController() {
-        if dcAccounts.get().isConfigured() {
+        if dcAccounts.getSelected().isConfigured() {
             presentTabBarController()
         } else {
             presentWelcomeController()
@@ -122,7 +122,7 @@ class AppCoordinator {
         // the applicationIconBadgeNumber is remembered by the system even on reinstalls (just tested on ios 13.3.1),
         // to avoid appearing an old number of a previous installation, we reset the counter manually.
         // but even when this changes in ios, we need the reset as we allow account-deletion also in-app.
-        NotificationManager.updateApplicationIconBadge(dcContext: dcAccounts.get(), reset: true)
+        NotificationManager.updateApplicationIconBadge(dcContext: dcAccounts.getSelected(), reset: true)
     }
 
     func presentTabBarController() {

deltachat-ios/Helper/LocationManager.swift

@@ -13,7 +13,7 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
 
     init(dcAccounts: DcAccounts) {
         self.dcAccounts = dcAccounts
-        self.dcContext = dcAccounts.get()
+        self.dcContext = dcAccounts.getSelected()
         locationManager = CLLocationManager()
         locationManager.distanceFilter = 25
         locationManager.desiredAccuracy = kCLLocationAccuracyNearestTenMeters
@@ -26,7 +26,7 @@ class LocationManager: NSObject, CLLocationManagerDelegate {
     }
 
     public func reloadDcContext() {
-        dcContext = dcAccounts.get()
+        dcContext = dcAccounts.getSelected()
     }
 
     func shareLocation(chatId: Int, duration: Int) {

deltachat-ios/Helper/NotificationManager.swift

@@ -13,14 +13,14 @@ public class NotificationManager {
 
     init(dcAccounts: DcAccounts) {
         self.dcAccounts = dcAccounts
-        self.dcContext = dcAccounts.get()
+        self.dcContext = dcAccounts.getSelected()
         initIncomingMsgsObserver()
         initMsgsNoticedObserver()
     }
 
     public func reloadDcContext() {
         NotificationManager.removeAllNotifications()
-        dcContext = dcAccounts.get()
+        dcContext = dcAccounts.getSelected()
     }
 
     public static func updateApplicationIconBadge(dcContext: DcContext, reset: Bool) {

deltachat-ios/Helper/RelayHelper.swift

@@ -30,7 +30,7 @@ class RelayHelper {
 
     func forward(to chat: Int) {
         if let messageIds = self.messageIds {
-            RelayHelper.dcAccounts?.get().forwardMessages(with: messageIds, to: chat)
+            RelayHelper.dcAccounts?.getSelected().forwardMessages(with: messageIds, to: chat)
         }
         self.messageIds = nil
     }