diff --git a/NativeAppTemplate/Logging/Logger.swift b/NativeAppTemplate/Logging/Logger.swift index 873e051..a7c4124 100644 --- a/NativeAppTemplate/Logging/Logger.swift +++ b/NativeAppTemplate/Logging/Logger.swift @@ -5,7 +5,7 @@ import os -private let appLogger = os.Logger(subsystem: "com.nativeapptemplate", category: "app") +let appLogger = os.Logger(subsystem: "com.nativeapptemplate", category: "app") struct Failure { static func signUp(from source: (some Any).Type, reason: String) -> Self { diff --git a/NativeAppTemplate/Login/LoginRepository.swift b/NativeAppTemplate/Login/LoginRepository.swift index e5f45e1..dcf711f 100644 --- a/NativeAppTemplate/Login/LoginRepository.swift +++ b/NativeAppTemplate/Login/LoginRepository.swift @@ -4,6 +4,7 @@ // import Foundation +import os @MainActor @Observable public class LoginRepository: LoginRepositoryProtocol { // MARK: - Properties @@ -18,9 +19,7 @@ import Foundation let loggedInShopkeeper = try keychainStore.retrieve() _currentShopkeeper = Shopkeeper(from: loggedInShopkeeper) } catch { - #if DEBUG - print(error) - #endif + appLogger.debug("LoginRepository retrieve error: \(error, privacy: .private)") } } return _currentShopkeeper @@ -88,9 +87,7 @@ import Foundation do { try keychainStore.remove() } catch { - #if DEBUG - print(error) - #endif + appLogger.debug("LoginRepository remove error: \(error, privacy: .private)") } } } diff --git a/NativeAppTemplate/Login/SignUpRepository.swift b/NativeAppTemplate/Login/SignUpRepository.swift index 0e65b48..666770f 100644 --- a/NativeAppTemplate/Login/SignUpRepository.swift +++ b/NativeAppTemplate/Login/SignUpRepository.swift @@ -4,6 +4,7 @@ // import Foundation +import os @MainActor class SignUpRepository: SignUpRepositoryProtocol { func signUp(signUp: SignUp) async throws -> Shopkeeper { @@ -100,9 +101,7 @@ import Foundation do { try keychainStore.remove() } catch { - #if DEBUG - print(error) - #endif + appLogger.debug("SignUpRepository remove error: \(error, privacy: .private)") } } } diff --git a/NativeAppTemplate/NFCManager.swift b/NativeAppTemplate/NFCManager.swift index 602638b..a3ecc81 100644 --- a/NativeAppTemplate/NFCManager.swift +++ b/NativeAppTemplate/NFCManager.swift @@ -5,6 +5,7 @@ @preconcurrency import CoreNFC import Foundation +import os protocol NFCManagerProtocol: Sendable { @MainActor var scanResult: Result? { get } @@ -205,9 +206,7 @@ extension NFCManager: NFCNDEFReaderSessionDelegate { isLock: isLock ) { error in guard error == nil else { return } - #if DEBUG - print(">>> Write: \(userNdefMessage)") - #endif + appLogger.debug("NFC Write: \(userNdefMessage, privacy: .private)") } } @@ -265,8 +264,6 @@ extension NFCManager: NFCNDEFReaderSessionDelegate { func readerSessionDidBecomeActive(_ session: NFCNDEFReaderSession) {} func readerSession(_ session: NFCNDEFReaderSession, didInvalidateWithError error: Error) { - #if DEBUG - print("readerSession error: \(error.localizedDescription)") - #endif + appLogger.debug("readerSession error: \(error.localizedDescription, privacy: .private)") } } diff --git a/NativeAppTemplate/Persistence/KeychainStore/KeychainStore.swift b/NativeAppTemplate/Persistence/KeychainStore/KeychainStore.swift index 3ac03ed..0352553 100644 --- a/NativeAppTemplate/Persistence/KeychainStore/KeychainStore.swift +++ b/NativeAppTemplate/Persistence/KeychainStore/KeychainStore.swift @@ -5,6 +5,7 @@ import Foundation import KeychainAccess +import os enum KeychainStoreError: Error { case secCallFailed(Error) @@ -60,9 +61,7 @@ extension KeychainStore { func store(_ data: DataType) throws { let archived: Data - #if DEBUG - print("data: \(data)") - #endif + appLogger.debug("KeychainStore data: \(data, privacy: .private)") do { archived = try NSKeyedArchiver.archivedData(withRootObject: data, requiringSecureCoding: true) } catch { diff --git a/NativeAppTemplate/Utilities/Utility.swift b/NativeAppTemplate/Utilities/Utility.swift index 0257a80..3f20488 100644 --- a/NativeAppTemplate/Utilities/Utility.swift +++ b/NativeAppTemplate/Utilities/Utility.swift @@ -5,6 +5,7 @@ import CoreNFC import Foundation +import os enum Utility { static func scanUrl(itemTagId: String, itemTagType: String) -> URL { @@ -75,16 +76,12 @@ enum Utility { if let itemTagId = item.value { itemTagInfo.id = itemTagId } - #if DEBUG - print("item_tag_id: \(String(describing: itemTagInfo.id))") - #endif + appLogger.debug("item_tag_id: \(String(describing: itemTagInfo.id), privacy: .private)") case "type": if let type = item.value { itemTagInfo.type = type } - #if DEBUG - print("type: \(String(describing: itemTagInfo.type))") - #endif + appLogger.debug("type: \(String(describing: itemTagInfo.type), privacy: .private)") default: break }