From 354d454f4a1e96d5b3b84252524e1404a20c549d Mon Sep 17 00:00:00 2001 From: Hellen S Date: Sat, 27 Oct 2018 15:36:14 +0300 Subject: [PATCH] fix getType funcs by adding code for using input parameter instead of getting a new one and leaving input unused --- Source/iOS/Device.swift | 10 ++++------ Source/macOS/DeviceMacOS.swift | 15 +++++++-------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Source/iOS/Device.swift b/Source/iOS/Device.swift index ebb67c2..6f016bc 100644 --- a/Source/iOS/Device.swift +++ b/Source/iOS/Device.swift @@ -74,15 +74,13 @@ open class Device { } static fileprivate func getType(code: String) -> Type { - let versionCode = getVersionCode() - - if versionCode.contains("iPhone") { + if code.contains(Type.iPhone.rawValue) { return .iPhone - } else if versionCode.contains("iPad") { + } else if code.contains(Type.iPad.rawValue) { return .iPad - } else if versionCode.contains("iPod") { + } else if code.contains(Type.iPod.rawValue) { return .iPod - } else if versionCode == "i386" || versionCode == "x86_64" { + } else if code == "i386" || code == "x86_64" { return .simulator } else { return .unknown diff --git a/Source/macOS/DeviceMacOS.swift b/Source/macOS/DeviceMacOS.swift index 3f3cf32..63c8028 100644 --- a/Source/macOS/DeviceMacOS.swift +++ b/Source/macOS/DeviceMacOS.swift @@ -18,20 +18,19 @@ public class Device { } static private func getType(code: String) -> Type { - let versionCode = Device.getVersionCode() - if versionCode.hasPrefix("MacPro") { + if code.hasPrefix("MacPro") { return Type.macPro - } else if versionCode.hasPrefix("iMac") { + } else if code.hasPrefix("iMac") { return Type.iMac - } else if versionCode.hasPrefix("MacBookPro") { + } else if code.hasPrefix("MacBookPro") { return Type.macBookPro - } else if versionCode.hasPrefix("MacBookAir") { + } else if code.hasPrefix("MacBookAir") { return Type.macBookAir - } else if versionCode.hasPrefix("MacBook") { + } else if code.hasPrefix("MacBook") { return Type.macBook - } else if versionCode.hasPrefix("MacMini") { + } else if code.hasPrefix("MacMini") { return Type.macMini - } else if versionCode.hasPrefix("Xserve") { + } else if code.hasPrefix("Xserve") { return Type.xserve } return Type.unknown