Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ final class CacheManager: CacheManagerType {
@UserDefaultValue("fullName", defaultValue: nil)
var fullName: String?

@UserDefaultValue("gender", defaultValue: 0)
@KeychainValue("gender", defaultValue: 0)
var gender: Int

@UserDefaultValue("favoriteColor", defaultValue: "Red")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ final class RequestManager: RequestManagerType {
init(baseServer: ApiServer) {
LoggingEventMonitor.maxVerboseLogSizeBytes = 1000000
let monitor = LoggingEventMonitor(logger: nil)
#if DEBUG
StandardOutputService.shared.connectCustomLogStreamPublisher(monitor.subscribeToMessages())
#endif
session = NetworkSession(baseUrl: baseServer.rawValue, configuration: .init(urlSessionConfiguration: .default, interceptor: nil, serverTrustManager: nil, eventMonitors: [monitor]))
}

Expand Down
22 changes: 20 additions & 2 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ let package = Package(
targets: ["AppDebugMode"]),
],
dependencies: [
.package(url: "https://github.com/GoodRequest/GoodPersistence.git", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/GoodRequest/GoodPersistence.git", .upToNextMajor(from: "2.1.0")),
.package(url: "https://github.com/siteline/swiftui-introspect", from: "1.0.0"),
],
targets: [
Expand All @@ -25,7 +25,8 @@ let package = Package(
.product(name: "GoodPersistence", package: "GoodPersistence"),
.product(name: "SwiftUIIntrospect", package: "swiftui-introspect"),
],
path: "Sources/AppDebugMode"
path: "Sources",
resources: [.copy("PrivacyInfo.xcprivacy")]
),
.testTarget(
name: "AppDebugModeTests",
Expand Down
15 changes: 4 additions & 11 deletions Sources/AppDebugMode/Providers/CacheProvider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import Foundation
import GoodPersistence
import KeychainAccess

final class CacheProvider {

Expand Down Expand Up @@ -128,30 +129,22 @@ private extension CacheProvider {
keychainValues[key] = receiveKeychainValueFromPropertyList(
key: key,
valueType: decodable.self,
defaultValue: defaultValueChild.value,
accessibility: childMirror.children.first(where: { $0.label == "accessibility" })?.value as? KeychainItemAccessibility
defaultValue: defaultValueChild.value
)
}
}

func receiveKeychainValueFromPropertyList<T: Codable>(
key: String,
valueType: T.Type,
defaultValue: Any,
accessibility: KeychainItemAccessibility?
defaultValue: Any
) -> String {
guard let data = KeychainWrapper.standard.data(
forKey: key,
withAccessibility: accessibility
) else {
guard let value = try? Keychain.default.get(key) else {
let defaultValueCodable = defaultValue as! Codable
// Return default value if data cannot be retrieved from Keychain
return formatValue(value: defaultValueCodable)
}

// Decode the data and get the value, or return default value if decoding fails
let value = (try? PropertyListDecoder().decode(Wrapper<T>.self, from: data))?.value

return formatValue(value: value)
}

Expand Down
31 changes: 31 additions & 0 deletions Sources/PrivacyInfo.xcprivacy
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrivacyTracking</key>
<false/>
<key>NSPrivacyTrackingDomains</key>
<array/>
<key>NSPrivacyCollectedDataTypes</key>
<array/>
<key>NSPrivacyAccessedAPITypes</key>
<array>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>CA92.1</string>
</array>
</dict>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>35F9.1</string>
</array>
</dict>
</array>
</dict>
</plist>