From e23e468c2b83576306b7e3d6b042c75f7c7e4a80 Mon Sep 17 00:00:00 2001 From: dab246 Date: Wed, 10 Jan 2024 10:20:50 +0700 Subject: [PATCH] Fix: Rename values enum TypeName Signed-off-by: dab246 (cherry picked from commit 34b77f26a71f5fcc23c44145decef991600a6c1e) --- ios/TwakeMailNSE/Model/TypeName.swift | 2 +- ios/TwakeMailNSE/NotificationService.swift | 4 +--- ios/TwakeMailNSE/Utils/PayloadParser.swift | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ios/TwakeMailNSE/Model/TypeName.swift b/ios/TwakeMailNSE/Model/TypeName.swift index a276e6cd7..0c0a6be25 100644 --- a/ios/TwakeMailNSE/Model/TypeName.swift +++ b/ios/TwakeMailNSE/Model/TypeName.swift @@ -3,5 +3,5 @@ import Foundation enum TypeName: String { case mailbox = "Mailbox" case email = "Email" - case EmailDelivery = "EmailDelivery" + case emailDelivery = "EmailDelivery" } diff --git a/ios/TwakeMailNSE/NotificationService.swift b/ios/TwakeMailNSE/NotificationService.swift index 417c680e5..d3f54065c 100644 --- a/ios/TwakeMailNSE/NotificationService.swift +++ b/ios/TwakeMailNSE/NotificationService.swift @@ -45,7 +45,7 @@ class NotificationService: UNNotificationServiceExtension { guard let currentAccountId = mapStateChanges.keys.first, let keychainSharingSession = keychainController.retrieveSharingSessionFromKeychain(accountId: currentAccountId), let listStateOfAccount = mapStateChanges[currentAccountId], - let newEmailState = listStateOfAccount[TypeName.EmailDelivery], + let newEmailState = listStateOfAccount[TypeName.emailDelivery], let oldEmailState = keychainSharingSession.emailState, newEmailState != oldEmailState, keychainSharingSession.tokenOIDC != nil || keychainSharingSession.basicAuth != nil else { @@ -96,8 +96,6 @@ class NotificationService: UNNotificationServiceExtension { return self.notify() } } - - } ) } diff --git a/ios/TwakeMailNSE/Utils/PayloadParser.swift b/ios/TwakeMailNSE/Utils/PayloadParser.swift index 7256020cd..6e1de8af6 100644 --- a/ios/TwakeMailNSE/Utils/PayloadParser.swift +++ b/ios/TwakeMailNSE/Utils/PayloadParser.swift @@ -9,7 +9,7 @@ class PayloadParser { return state.contains(prefixState) && (state.contains(TypeName.mailbox.rawValue) || state.contains(TypeName.email.rawValue) || - state.contains(TypeName.EmailDelivery.rawValue)) + state.contains(TypeName.emailDelivery.rawValue)) } func parsingPayloadNotification(payloadData: [String: Any]) -> [String: [TypeName: String]]{