diff --git a/SwiftyInsta/Local/Devices/Brand.swift b/SwiftyInsta/Local/Devices/Brand.swift index d7e4cc0..ea3c373 100644 --- a/SwiftyInsta/Local/Devices/Brand.swift +++ b/SwiftyInsta/Local/Devices/Brand.swift @@ -22,8 +22,8 @@ public enum HTC: DeviceCollection, DeviceGenerating, CaseIterable { case .ten: return .init(brand: "HTC", model: "HTC 10", - phoneGuid: UUID.init(uuidString: "3e90b5f5-23c3-4fd1-b9ba-8e090a1fa397")!, - deviceGuid: UUID.init(uuidString: "a91cd29b-2070-4c4e-b4cb-35335b2a38dc")!, + phoneGuid: UUID(), + deviceGuid: UUID(), googleAdId: .init(), rankToken: .init(), androidBoardName: "msm8996", @@ -54,8 +54,8 @@ public enum LG: CaseIterable, DeviceCollection, DeviceGenerating { case .optimusF6: return .init(brand: "LGE", model: "LG-D500", - phoneGuid: UUID.init(uuidString: "17c27d7a-788d-4430-bcb0-6ae605ef0b01")!, - deviceGuid: UUID.init(uuidString: "5ccdd80f-389e-4156-b070-fddab5fb7ed9")!, + phoneGuid: UUID(), + deviceGuid: UUID(), googleAdId: .init(), rankToken: .init(), androidBoardName: "f6t", @@ -71,8 +71,8 @@ public enum LG: CaseIterable, DeviceCollection, DeviceGenerating { case .optimusG: return .init(brand: "LGE", model: "LG-LS970", - phoneGuid: UUID.init(uuidString: "5b971484-ad0f-41fa-8886-313e9e91f5b9")!, - deviceGuid: UUID.init(uuidString: "202d7022-3533-4450-91bd-0344112e0deb")!, + phoneGuid: UUID(), + deviceGuid: UUID(), googleAdId: .init(), rankToken: .init(), androidBoardName: "geehrc", @@ -107,8 +107,8 @@ public enum Samsung: CaseIterable, DeviceCollection, DeviceGenerating { case .galaxyNote3: return .init(brand: "samsung", model: "SM-N900P", - phoneGuid: UUID.init(uuidString: "28484284-e646-4a29-88fc-76c2666d5ab3")!, - deviceGuid: UUID.init(uuidString: "7f585e77-becf-4137-bf1f-84ab72e35eb4")!, + phoneGuid: UUID(), + deviceGuid: UUID(), googleAdId: .init(), rankToken: .init(), androidBoardName: "MSM8974", @@ -124,8 +124,8 @@ public enum Samsung: CaseIterable, DeviceCollection, DeviceGenerating { case .galaxyS5: return .init(brand: "samsung", model: "zeroflte", - phoneGuid: UUID.init(uuidString: "9ade42fb-09de-4931-8526-8f7c1bd3ce2a")!, - deviceGuid: UUID.init(uuidString: "505cbe9d-487c-49d4-8f2c-b1cc166d1094")!, + phoneGuid: UUID(), + deviceGuid: UUID(), googleAdId: .init(), rankToken: .init(), androidBoardName: "universal7420", @@ -141,8 +141,8 @@ public enum Samsung: CaseIterable, DeviceCollection, DeviceGenerating { case .galaxyS6: return .init(brand: "samsung", model: "SM-G900F", - phoneGuid: UUID.init(uuidString: "141023a2-153b-4e92-ae64-893553eaa9db")!, - deviceGuid: UUID.init(uuidString: "d13d1596-0983-4e59-825f-bd7cd559106b")!, + phoneGuid: UUID(), + deviceGuid: UUID(), googleAdId: .init(), rankToken: .init(), androidBoardName: "MSM8974", @@ -158,8 +158,8 @@ public enum Samsung: CaseIterable, DeviceCollection, DeviceGenerating { case .galaxyTab: return .init(brand: "samsung", model: "Samsung Galaxy Tab S 8.4 LTE", - phoneGuid: UUID.init(uuidString: "849a7ae1-cf94-4dd5-a977-a2f3e8363e66")!, - deviceGuid: UUID.init(uuidString: "c319490f-6f09-467b-b2a5-6f1db13348e9")!, + phoneGuid: UUID(), + deviceGuid: UUID(), googleAdId: .init(), rankToken: .init(), androidBoardName: "universal5420", @@ -190,8 +190,8 @@ public enum Sony: CaseIterable, DeviceCollection, DeviceGenerating { case .xperiaZ5: return .init(brand: "Sony", model: "E6653", - phoneGuid: UUID.init(uuidString: "aaeb4dfb-a93d-4bd6-9147-1a3aaee60510")!, - deviceGuid: UUID.init(uuidString: "78178fef-aa0c-4691-9c00-16482c25ce24")!, + phoneGuid: UUID(), + deviceGuid: UUID(), googleAdId: .init(), rankToken: .init(), androidBoardName: "MSM8974", @@ -207,8 +207,8 @@ public enum Sony: CaseIterable, DeviceCollection, DeviceGenerating { case .z3Compact: return .init(brand: "docomo", model: "SO-02G", - phoneGuid: UUID.init(uuidString: "8afad275-4fca-49e6-a5e0-3b2bbfe6e9f2")!, - deviceGuid: UUID.init(uuidString: "bccfcc1c-8188-42fa-a14e-e238c847c358")!, + phoneGuid: UUID(), + deviceGuid: UUID(), googleAdId: .init(), rankToken: .init(), androidBoardName: "MSM8974", diff --git a/SwiftyInsta/Local/Devices/Device.swift b/SwiftyInsta/Local/Devices/Device.swift index 4472e4e..108ef56 100644 --- a/SwiftyInsta/Local/Devices/Device.swift +++ b/SwiftyInsta/Local/Devices/Device.swift @@ -57,8 +57,8 @@ public struct Device: Codable { init(brand: String, model: String, - phoneGuid: UUID, - deviceGuid: UUID, + phoneGuid: UUID = .init(), + deviceGuid: UUID = .init(), googleAdId: UUID, rankToken: UUID, androidBoardName: String, @@ -74,8 +74,8 @@ public struct Device: Codable { self.brand = brand self.id = "android-\(deviceGuid.uuidString.md5().prefix(16))" self.model = model - self.phoneGuid = .init()// phoneGuid - self.deviceGuid = .init()// deviceGuid + self.phoneGuid = phoneGuid + self.deviceGuid = deviceGuid self.googleAdId = googleAdId self.rankToken = rankToken self.androidBoardName = androidBoardName