chore: Migrate SettingsController and NotificationsController

NextcloudTalk.xcodeproj/project.pbxproj

@@ -939,28 +939,28 @@
 		1F9629C42E8E709D00EC9BEE /* Exceptions for "Notifications" folder in "NotificationServiceExtension" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
-				NCNotificationController.m,
+				NCNotificationController.swift,
 			);
 			target = 2CC0014E24A1F0E900A20167 /* NotificationServiceExtension */;
 		};
 		1F9629C52E8E709D00EC9BEE /* Exceptions for "Notifications" folder in "ShareExtension" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
-				NCNotificationController.m,
+				NCNotificationController.swift,
 			);
 			target = 2C62AFA224C08845007E460A /* ShareExtension */;
 		};
 		1F9629C62E8E709D00EC9BEE /* Exceptions for "Notifications" folder in "BroadcastUploadExtension" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
-				NCNotificationController.m,
+				NCNotificationController.swift,
 			);
 			target = 1FF2FD5A2AB99CCB000C9905 /* BroadcastUploadExtension */;
 		};
 		1F9629C72E8E709D00EC9BEE /* Exceptions for "Notifications" folder in "TalkIntents" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
-				NCNotificationController.m,
+				NCNotificationController.swift,
 			);
 			target = 1FA93D9B2D70FCC200DF6CDF /* TalkIntents */;
 		};

NextcloudTalk/AppDelegate.m

@@ -20,9 +20,7 @@
 #import "NCAppBranding.h"
 #import "NCDatabaseManager.h"
 #import "NCKeyChainController.h"
-#import "NCNotificationController.h"
 #import "NCPushNotification.h"
-#import "NCSettingsController.h"
 #import "NCUserInterfaceController.h"
 
 #import "NextcloudTalk-Swift.h"
@@ -295,7 +293,7 @@ - (void)application:(UIApplication *)application didRegisterForRemoteNotificatio
 - (void)registerInteractivePushNotification
 {
     // Reply directly to a chat notification action/category
-    UNTextInputNotificationAction *replyAction = [UNTextInputNotificationAction actionWithIdentifier:NCNotificationActionReplyToChat
+    UNTextInputNotificationAction *replyAction = [UNTextInputNotificationAction actionWithIdentifier:NCNotificationController.actionReplyToChat
                                                                                           title:NSLocalizedString(@"Reply", nil)
                                                                                         options:UNNotificationActionOptionAuthenticationRequired];
 
@@ -305,11 +303,11 @@ - (void)registerInteractivePushNotification
                                                                               options:UNNotificationCategoryOptionNone];
 
     // Recording actions/category
-    UNNotificationAction *recordingShareAction = [UNNotificationAction actionWithIdentifier:NCNotificationActionShareRecording
+    UNNotificationAction *recordingShareAction = [UNNotificationAction actionWithIdentifier:NCNotificationController.actionShareRecording
                                                                                       title:NSLocalizedString(@"Share to chat", nil)
                                                                                     options:UNNotificationActionOptionAuthenticationRequired];
 
-    UNNotificationAction *recordingDismissAction = [UNNotificationAction actionWithIdentifier:NCNotificationActionDismissRecordingNotification
+    UNNotificationAction *recordingDismissAction = [UNNotificationAction actionWithIdentifier:NCNotificationController.actionDismissRecordingNotification
                                                                                       title:NSLocalizedString(@"Dismiss notification", nil)
                                                                                     options:UNNotificationActionOptionAuthenticationRequired | UNNotificationActionOptionDestructive];
 
@@ -319,11 +317,11 @@ - (void)registerInteractivePushNotification
                                                                                        options:UNNotificationCategoryOptionNone];
 
     // Federation invitation
-    UNNotificationAction *federationAccept = [UNNotificationAction actionWithIdentifier:NCNotificationActionFederationInvitationAccept
+    UNNotificationAction *federationAccept = [UNNotificationAction actionWithIdentifier:NCNotificationController.actionFederationInvitationAccept
                                                                                   title:NSLocalizedString(@"Accept", nil)
                                                                                 options:UNNotificationActionOptionAuthenticationRequired];
 
-    UNNotificationAction *federationReject = [UNNotificationAction actionWithIdentifier:NCNotificationActionFederationInvitationReject
+    UNNotificationAction *federationReject = [UNNotificationAction actionWithIdentifier:NCNotificationController.actionFederationInvitationReject
                                                                                   title:NSLocalizedString(@"Reject", nil)
                                                                                 options:UNNotificationActionOptionAuthenticationRequired | UNNotificationActionOptionDestructive];
 

NextcloudTalk/Calls/NCCameraController.swift

@@ -122,8 +122,8 @@ class NCCameraController: NSObject, AVCaptureVideoDataOutputSampleBufferDelegate
         let settings = NCSettingsController.sharedInstance().videoSettingsModel
         let formats = RTCCameraVideoCapturer.supportedFormats(for: device)
 
-        let targetWidth = settings?.currentVideoResolutionWidthFromStore() ?? 0
-        let targetHeight = settings?.currentVideoResolutionHeightFromStore() ?? 0
+        let targetWidth = settings.currentVideoResolutionWidthFromStore()
+        let targetHeight = settings.currentVideoResolutionHeightFromStore()
         var selectedFormat: AVCaptureDevice.Format?
         var currentDiff = INT_MAX
 

NextcloudTalk/Contacts/NCContactsManager.m

@@ -8,7 +8,6 @@
 #import <Contacts/Contacts.h>
 
 #import "NCDatabaseManager.h"
-#import "NCSettingsController.h"
 #import "ABContact.h"
 #import "NCContact.h"
 

NextcloudTalk/File sharing/DirectoryTableViewController.m

@@ -11,7 +11,6 @@
 
 #import "NCDatabaseManager.h"
 #import "NCAppBranding.h"
-#import "NCSettingsController.h"
 #import "PlaceholderView.h"
 
 #import "NextcloudTalk-Swift.h"

NextcloudTalk/Login/AuthenticationViewController.m

@@ -11,7 +11,6 @@
 #import "CCCertificate.h"
 #import "NCAppBranding.h"
 #import "NCDatabaseManager.h"
-#import "NCSettingsController.h"
 
 NSString * const kNCAuthTokenFlowEndpoint               = @"/index.php/login/flow";
 

NextcloudTalk/NCTypes.h

@@ -176,7 +176,7 @@ typedef NS_ENUM(NSInteger, NCPushNotificationType) {
     NCPushNotificationTypeDeleteMultiple,
     NCPushNotificationTypeAdminNotification,
     NCPushNotificationTypeRecording,
-    NCPUshNotificationTypeFederation,
+    NCPushNotificationTypeFederation,
     NCPushNotificationTypeReminder
 };
 

NextcloudTalk/Network/NCConnectionController.swift

@@ -86,7 +86,7 @@ class NCConnectionController: NSObject {
         }
 
         let activeAccount = NCDatabaseManager.sharedInstance().activeAccount()
-        let signalingConfig = NCSettingsController.sharedInstance().signalingConfigurations.object(forKey: activeAccount.accountId)
+        let signalingConfig = NCSettingsController.sharedInstance().signalingConfiguration(forAccountId: activeAccount.accountId)
 
         if activeAccount.user.isEmpty || activeAccount.userDisplayName.isEmpty {
             self.appState = .missingUserProfile

NextcloudTalk/Network/OcsError.swift

@@ -55,4 +55,9 @@ import Foundation
         self.underlyingError = error
         self.task = task
     }
+
+    // Convenience factory for a generic error without an underlying network request
+    public static func genericError() -> OcsError {
+        return OcsError(withError: NSError(domain: NSCocoaErrorDomain, code: 0, userInfo: nil), withTask: nil)
+    }
 }

NextcloudTalk/NextcloudTalk-Bridging-Header-Extensions.h

@@ -18,7 +18,6 @@
 #import "SLKTextViewController.h"
 #import "NCMessageTextView.h"
 #import "ReplyMessageView.h"
-#import "NCSettingsController.h"
 #import "NCKeyChainController.h"
 #import "CCCertificate.h"
 

NextcloudTalk/NextcloudTalk-Bridging-Header.h

@@ -18,7 +18,6 @@
 #import "NCDatabaseManager.h"
 #import "NCChatFileController.h"
 #import "NCSignalingController.h"
-#import "NCSettingsController.h"
 #import "NCUserDefaults.h"
 #import "NCUserInterfaceController.h"
 #import "NCUserStatus.h"