Skip to content

update deprecated archiving apis #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zihejia merged 4 commits into from
Jan 29, 2021
Merged

update deprecated archiving apis #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa51c2f
update deprecated apis
jaredmixpanel Jan 15, 2021
267d06b
fix indentation
jaredmixpanel Jan 15, 2021
be69179
handle old os, also fix carrierName
jaredmixpanel Jan 22, 2021
2bc1d10
add .value
jaredmixpanel Jan 22, 2021
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
14 changes: 9 additions & 5 deletions Sources/MixpanelInstance.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,12 +677,16 @@ open class MixpanelInstance: CustomDebugStringConvertible, FlushDelegate, AEDele
guard self != nil else {
return
}

if let carrierName = MixpanelInstance.telephonyInfo.subscriberCellularProvider?.carrierName {
AutomaticProperties.properties["$carrier"] = carrierName


AutomaticProperties.properties["$carrier"] = ""
if #available(iOS 12.0, *) {
if let carrierName = MixpanelInstance.telephonyInfo.serviceSubscriberCellularProviders?.first?.value.carrierName {
AutomaticProperties.properties["$carrier"] = carrierName
}
} else {
AutomaticProperties.properties["$carrier"] = ""
if let carrierName = MixpanelInstance.telephonyInfo.subscriberCellularProvider?.carrierName {
AutomaticProperties.properties["$carrier"] = carrierName
}
}
}
}
Expand Down
48 changes: 35 additions & 13 deletions Sources/TweakPersistency.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,25 +87,47 @@ private final class TweakDiskPersistency {

func loadFromDisk() -> TweakCache {
var result: TweakCache!

self.queue.sync {
NSKeyedUnarchiver.setClass(Data.self, forClassName: "Data")
result = (try? Foundation.Data(contentsOf: self.fileURL))
.flatMap(NSKeyedUnarchiver.unarchiveObject(with:))
.flatMap { $0 as? Data }
.map { $0.cache }
?? [:]

if #available(iOS 11.0, macOS 10.13, watchOS 4.0, tvOS 11.0, *) {
self.queue.sync {
NSKeyedUnarchiver.setClass(Data.self, forClassName: "Data")
result = try? (try? Foundation.Data(contentsOf: self.fileURL))
.flatMap(NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(_:))
.flatMap { $0 as? Data }
.map { $0.cache }
?? [:]
}
} else {
self.queue.sync {
NSKeyedUnarchiver.setClass(Data.self, forClassName: "Data")
result = (try? Foundation.Data(contentsOf: self.fileURL))
.flatMap(NSKeyedUnarchiver.unarchiveObject(with:))
.flatMap { $0 as? Data }
.map { $0.cache }
?? [:]
}
}

return result
}

func saveToDisk(_ data: TweakCache) {
self.queue.async {
let data = Data(cache: data)
NSKeyedArchiver.setClassName("Data", for: type(of: data))
let nsData = NSKeyedArchiver.archivedData(withRootObject: data)
try? nsData.write(to: self.fileURL, options: [.atomic])
if #available(iOS 11.0, macOS 10.13, watchOS 4.0, tvOS 11.0, *) {
self.queue.async {
let data = Data(cache: data)
NSKeyedArchiver.setClassName("Data", for: type(of: data))
let nsData = try? NSKeyedArchiver.archivedData(withRootObject: data, requiringSecureCoding: false)
if let nsData = nsData {
try? nsData.write(to: self.fileURL, options: [.atomic])
}
}
} else {
self.queue.async {
let data = Data(cache: data)
NSKeyedArchiver.setClassName("Data", for: type(of: data))
let nsData = NSKeyedArchiver.archivedData(withRootObject: data)
try? nsData.write(to: self.fileURL, options: [.atomic])
}
}
}

Expand Down